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=202502 header.b=gF/J+KDG; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id D47D55A0629 for ; Wed, 12 Feb 2025 08:07:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1739344044; bh=L0EXEfy1KxgDgOwLdZ7BgEAze2MhxVMnldlFqZ8pjxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gF/J+KDGwLQt1QYCpZ4Jk70Tc7Dvc5sIE1Hz4LTS+g4RFbG8M1PdfZ6zUH2JYjmDV 9aFH7AKdQEhayzqnYfJHJqX2qhMRL8ukOG/dUgVF2JMq5D+Bh1gDLSlyXj1yP4JaM0 +ReJ6K1FgA6NzJESHM9BO5duBgodUgB6PAcCxul36z30IzvPTKqINBZOJ16KjNMWDJ 09nbrqh74aVd7cylY5gjrYcu+vc7s45PndUiuMPe1PU8jqzJh2KUV+a0Ykij5w2AFi doDNkw/8nWMUmRnKU8NknRVP3HvfP2lRZ1RvaHFIUg0c0J/3eB5s8exNrBDxMXeo3R B6yKtz2ZBDbTQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Yt8Ww3lBwz4x2J; Wed, 12 Feb 2025 18:07:24 +1100 (AEDT) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v18 5/9] tcp: Get bound address for connected inbound sockets too Date: Wed, 12 Feb 2025 18:07:17 +1100 Message-ID: <20250212070721.1746128-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250212070721.1746128-1-david@gibson.dropbear.id.au> References: <20250212070721.1746128-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: M4NGQTNDPL5DOFQ5KLFBMSFR2SIZBUNI X-Message-ID-Hash: M4NGQTNDPL5DOFQ5KLFBMSFR2SIZBUNI 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: From: Stefano Brivio So that we can bind inbound sockets to specific addresses, like we already do for outbound sockets. While at it, change the error message in tcp_conn_from_tap() to match this one. Signed-off-by: Stefano Brivio Reviewed-by: David Gibson Signed-off-by: David Gibson --- flow.c | 6 +++--- flow_table.h | 6 +++--- tcp.c | 22 ++++++++++++++-------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/flow.c b/flow.c index a6fe6d1f..3ac551bd 100644 --- a/flow.c +++ b/flow.c @@ -390,9 +390,9 @@ const struct flowside *flow_initiate_af(union flow *flow, uint8_t pif, * * Return: pointer to the initiating flowside information */ -const struct flowside *flow_initiate_sa(union flow *flow, uint8_t pif, - const union sockaddr_inany *ssa, - in_port_t dport) +struct flowside *flow_initiate_sa(union flow *flow, uint8_t pif, + const union sockaddr_inany *ssa, + in_port_t dport) { struct flowside *ini = &flow->f.side[INISIDE]; diff --git a/flow_table.h b/flow_table.h index eeb6f411..9a2ff24a 100644 --- a/flow_table.h +++ b/flow_table.h @@ -161,9 +161,9 @@ const struct flowside *flow_initiate_af(union flow *flow, uint8_t pif, sa_family_t af, const void *saddr, in_port_t sport, const void *daddr, in_port_t dport); -const struct flowside *flow_initiate_sa(union flow *flow, uint8_t pif, - const union sockaddr_inany *ssa, - in_port_t dport); +struct flowside *flow_initiate_sa(union flow *flow, uint8_t pif, + const union sockaddr_inany *ssa, + in_port_t dport); const struct flowside *flow_target_af(union flow *flow, uint8_t pif, sa_family_t af, const void *saddr, in_port_t sport, diff --git a/tcp.c b/tcp.c index b87478f3..a1d6c53b 100644 --- a/tcp.c +++ b/tcp.c @@ -1536,12 +1536,10 @@ static void tcp_conn_from_tap(const struct ctx *c, sa_family_t af, if (c->mode == MODE_VU) { /* To rebind to same oport after migration */ sl = sizeof(sa); - if (!getsockname(s, &sa.sa, &sl)) { + if (!getsockname(s, &sa.sa, &sl)) inany_from_sockaddr(&tgt->oaddr, &tgt->oport, &sa); - } else { - err("Failed to get local address for socket: %s", - strerror_(errno)); - } + else + err_perror("Can't get local address for socket %i", s); } FLOW_ACTIVATE(conn); @@ -2075,9 +2073,9 @@ static void tcp_tap_conn_from_sock(const struct ctx *c, union flow *flow, void tcp_listen_handler(const struct ctx *c, union epoll_ref ref, const struct timespec *now) { - const struct flowside *ini; union sockaddr_inany sa; socklen_t sl = sizeof(sa); + struct flowside *ini; union flow *flow; int s; @@ -2093,12 +2091,20 @@ void tcp_listen_handler(const struct ctx *c, union epoll_ref ref, tcp_sock_set_bufsize(c, s); tcp_sock_set_nodelay(s); - /* FIXME: When listening port has a specific bound address, record that - * as our address + /* FIXME: If useful: when the listening port has a specific bound + * address, record that as our address, as implemented for vhost-user + * mode only, below. */ ini = flow_initiate_sa(flow, ref.tcp_listen.pif, &sa, ref.tcp_listen.port); + if (c->mode == MODE_VU) { /* Rebind to same address after migration */ + if (!getsockname(s, &sa.sa, &sl)) + inany_from_sockaddr(&ini->oaddr, &ini->oport, &sa); + else + err_perror("Can't get local address for socket %i", s); + } + if (!inany_is_unicast(&ini->eaddr) || ini->eport == 0) { char sastr[SOCKADDR_STRLEN]; -- 2.48.1