From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202510 header.b=GH7Ij7as; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 93E0C5A0620 for ; Wed, 29 Oct 2025 07:26:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202510; t=1761719195; bh=AFYsKDOa6y2Cwtci+P7GpnLVvDDiyv3SUEYL/hepAAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GH7Ij7asMqTf97Yps0LuiS+kP+jT/1AgfYU8zW+2I/7x0nRxIn2ELDYhbbciodnIc JEdHxrVXjJL6UrRhFTwo0Egte666Ugn7pSEkBq5ck07QofXDuU5FAWwbNLzdTjTNXC uzqgG5VATt/jo4/oBEMYY3drdJbJyesAvztI1+En6vIUOtmwbS6aRCJmswTbz5gtAJ 9VxBTgi/R1b2ObWWyO7A0apnPaZ6MW131VH89J1lQ9R167NsGkDiWvY+hBTFeH+cd4 O4yiqgaeJf/xDnUO0QCBkfQfETy4+VYiiWeaFhYUrAcEk/EIP/FAFjt9ne6OUagaY6 RHfstVTV0TDOg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4cxHMH1qgZz4wMB; Wed, 29 Oct 2025 17:26:35 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v3 5/8] udp: Move udp_sock_init() special case to its caller Date: Wed, 29 Oct 2025 17:26:25 +1100 Message-ID: <20251029062628.1647051-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251029062628.1647051-1-david@gibson.dropbear.id.au> References: <20251029062628.1647051-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 32C32X7QQQM3OWU5N33TZ4SKPHS2YZVB X-Message-ID-Hash: 32C32X7QQQM3OWU5N33TZ4SKPHS2YZVB X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Inbound sockets are bound to the unspecified address by default, whereas outbound sockets are bound to the loopback address. This is currently handled in udp_sock_init() which ignores its addr argument in the outbound case. Move the handling of this special case to the caller, udp_port_rebind(). This makes the semantics of the 'addr' argument more consistent, and will make future changes easier. Signed-off-by: David Gibson --- udp.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/udp.c b/udp.c index f3237436..ee8334fc 100644 --- a/udp.c +++ b/udp.c @@ -1117,7 +1117,7 @@ int udp_sock_init(const struct ctx *c, uint8_t pif, else socks = udp_splice_ns; - if (!addr && c->ifi4 && c->ifi6 && pif == PIF_HOST) { + if (!addr && c->ifi4 && c->ifi6) { int s; /* Attempt to get a dual stack socket */ @@ -1133,9 +1133,6 @@ int udp_sock_init(const struct ctx *c, uint8_t pif, const union inany_addr *a = addr ? addr : &inany_any4; - if (pif == PIF_SPLICE) - a = &inany_loopback4; - r4 = pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, pif, a, ifname, port, uref.u32); @@ -1146,9 +1143,6 @@ int udp_sock_init(const struct ctx *c, uint8_t pif, const union inany_addr *a = addr ? addr : &inany_any6; - if (pif == PIF_SPLICE) - a = &inany_loopback6; - r6 = pif_sock_l4(c, EPOLL_TYPE_UDP_LISTEN, pif, a, ifname, port, uref.u32); @@ -1217,9 +1211,16 @@ static void udp_port_rebind(struct ctx *c, bool outbound) continue; if ((c->ifi4 && socks[V4][port] == -1) || - (c->ifi6 && socks[V6][port] == -1)) - udp_sock_init(c, outbound ? PIF_SPLICE : PIF_HOST, - NULL, NULL, port); + (c->ifi6 && socks[V6][port] == -1)) { + if (outbound) { + udp_sock_init(c, PIF_SPLICE, + &inany_loopback4, NULL, port); + udp_sock_init(c, PIF_SPLICE, + &inany_loopback6, NULL, port); + } else { + udp_sock_init(c, PIF_HOST, NULL, NULL, port); + } + } } } -- 2.51.0