From nobody Thu Nov 6 19:45:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542838500028320.5384671935892; Wed, 21 Nov 2018 14:15:00 -0800 (PST) Received: from localhost ([::1]:42592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPale-0002J0-4a for importer@patchew.org; Wed, 21 Nov 2018 17:14:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPaeq-0003vH-33 for qemu-devel@nongnu.org; Wed, 21 Nov 2018 17:07:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPaeo-0001iq-9j for qemu-devel@nongnu.org; Wed, 21 Nov 2018 17:07:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48336) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPaeo-0001iU-4x for qemu-devel@nongnu.org; Wed, 21 Nov 2018 17:07:38 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 613E23082AFC; Wed, 21 Nov 2018 22:07:37 +0000 (UTC) Received: from localhost (ovpn-112-60.ams2.redhat.com [10.36.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDACF6A51B; Wed, 21 Nov 2018 22:07:33 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 22 Nov 2018 02:06:23 +0400 Message-Id: <20181121220647.18844-7-marcandre.lureau@redhat.com> In-Reply-To: <20181121220647.18844-1-marcandre.lureau@redhat.com> References: <20181121220647.18844-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 21 Nov 2018 22:07:37 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 for-3.2 v2 06/30] slirp: factor out guestfwd addition checks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , Jan Kiszka , Jason Wang , Zhang Chen , Samuel Thibault , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This will allow reusing the function in a following patch. Signed-off-by: Marc-Andr=C3=A9 Lureau --- slirp/misc.c | 7 ------- slirp/slirp.c | 23 +++++++++++++++++++++-- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/slirp/misc.c b/slirp/misc.c index cf7cc3a787..03bfa31f20 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -41,13 +41,6 @@ int add_exec(struct gfwd_list **ex_ptr, void *chardev, c= onst char *cmdline, { struct gfwd_list *tmp_ptr; =20 - /* First, check if the port is "bound" */ - for (tmp_ptr =3D *ex_ptr; tmp_ptr; tmp_ptr =3D tmp_ptr->ex_next) { - if (port =3D=3D tmp_ptr->ex_fport && - addr.s_addr =3D=3D tmp_ptr->ex_addr.s_addr) - return -1; - } - tmp_ptr =3D *ex_ptr; *ex_ptr =3D g_new0(struct gfwd_list, 1); (*ex_ptr)->ex_fport =3D port; diff --git a/slirp/slirp.c b/slirp/slirp.c index 4949d17c73..e7256ec05c 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -1038,9 +1038,11 @@ int slirp_add_hostfwd(Slirp *slirp, int is_udp, stru= ct in_addr host_addr, return 0; } =20 -int slirp_add_exec(Slirp *slirp, void *chardev, const char *cmdline, - struct in_addr *guest_addr, int guest_port) +static bool +check_guestfwd(Slirp *slirp, struct in_addr *guest_addr, int guest_port) { + struct gfwd_list *tmp_ptr; + if (!guest_addr->s_addr) { guest_addr->s_addr =3D slirp->vnetwork_addr.s_addr | (htonl(0x0204) & ~slirp->vnetwork_mask.s_addr); @@ -1049,6 +1051,23 @@ int slirp_add_exec(Slirp *slirp, void *chardev, cons= t char *cmdline, slirp->vnetwork_addr.s_addr || guest_addr->s_addr =3D=3D slirp->vhost_addr.s_addr || guest_addr->s_addr =3D=3D slirp->vnameserver_addr.s_addr) { + return false; + } + + /* check if the port is "bound" */ + for (tmp_ptr =3D slirp->guestfwd_list; tmp_ptr; tmp_ptr =3D tmp_ptr->e= x_next) { + if (guest_port =3D=3D tmp_ptr->ex_fport && + guest_addr->s_addr =3D=3D tmp_ptr->ex_addr.s_addr) + return false; + } + + return true; +} + +int slirp_add_exec(Slirp *slirp, void *chardev, const char *cmdline, + struct in_addr *guest_addr, int guest_port) +{ + if (!check_guestfwd(slirp, guest_addr, guest_port)) { return -1; } =20 --=20 2.20.0.rc1