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=m9y9egVo; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 311B35A0272 for ; Wed, 19 Nov 2025 06:23:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202510; t=1763529779; bh=ZPrXGRxRcvtNSQRFN2YnB/wTPY4yRTiUKL6SaQvx00M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m9y9egVotMEnCUeh2Q3TJJy8eeAYUZtBhk2+WMyMbhuJ9nqkg+KQQhdK3gMgonkwu miGxw5lOYNlGvOGO2k5Thw+jEy0w7CqUYkyHlv3l/r8a9j7h2Dkprqov4TJ9Wn7MwN hR+JOkxyhANT91ixCHOdI+KVat9plTqolEPjrBFjtIWzw6Mz0vvsjk7TMlYMdMVuGR G3/PM5hjH3CdjD3B1sFPgkFARS+dRZVOyKa+Sa4zz1SlpMUTurLDXKUrQ0QB3vtj9c wU9EaisziQhWbZankunpzJswuM/llXWXDZvCXr8voza8DCH3SBkMQthDrR553Wo901 /3ZRh5SZ3LdJQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4dB8yC4Grkz4wGy; Wed, 19 Nov 2025 16:22:59 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v4 6/9] udp: Move udp_sock_init() special case to its caller Date: Wed, 19 Nov 2025 16:22:54 +1100 Message-ID: <20251119052257.3004500-7-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251119052257.3004500-1-david@gibson.dropbear.id.au> References: <20251119052257.3004500-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: NYCI2PZ4CXXRPHR5YW6RL3TFVJL343RC X-Message-ID-Hash: NYCI2PZ4CXXRPHR5YW6RL3TFVJL343RC 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 3b43f136..b3ce9c7f 100644 --- a/udp.c +++ b/udp.c @@ -1130,7 +1130,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 */ @@ -1145,9 +1145,6 @@ int udp_sock_init(const struct ctx *c, uint8_t pif, if ((!addr || inany_v4(addr)) && c->ifi4) { 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); @@ -1157,9 +1154,6 @@ int udp_sock_init(const struct ctx *c, uint8_t pif, if ((!addr || !inany_v4(addr)) && c->ifi6) { 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); @@ -1222,9 +1216,16 @@ static void udp_port_rebind(struct ctx *c, bool outbound) } 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.1