From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=jPZfRMwO; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id B37AA5A0275 for ; Tue, 04 Feb 2025 08:50:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738655441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aodZNcp/+pA0YuqI7C9Tep6rwW4qPfde9w5JQ22dcv0=; b=jPZfRMwOp9HjMN6pqE3cX9yuFqw5awjDXO+WCdyPOuKRM+q2iwYrgOW060L1fPvzWe8JBX xwyeHQ9wjj0ADwJX13dZg2kPFaxAVoGd4zX6v9RtZ4yTCy0Uhprnoq38EXwotfnugj6G8O d0K2Cse0tFMvVjdg++9b0Ycbx6l+9g4= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-FZn0EXiePz6Ysm9XsdMSoA-1; Tue, 04 Feb 2025 02:50:40 -0500 X-MC-Unique: FZn0EXiePz6Ysm9XsdMSoA-1 X-Mimecast-MFC-AGG-ID: FZn0EXiePz6Ysm9XsdMSoA Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43646b453bcso25757775e9.3 for ; Mon, 03 Feb 2025 23:50:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738655438; x=1739260238; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aodZNcp/+pA0YuqI7C9Tep6rwW4qPfde9w5JQ22dcv0=; b=hE1Jnwj72jbJjB2FOEGosGZfr5/AviFWxi60BkbHhUn9TZhwhngYrxV0ST31/R3z2D khV0mN08RGCAWlhUqCRvPfaISpxl0XoNCrdHKpCjtQnqPd7WwXVj0DDMNq7xN+ZzII+5 g/rBLizP8PhApAKes1iKxwuCY4foH76n5vYQ62gZSOEU3qyWWuEt4RX/Lnu+pjvBc9T8 B7UjV0aCcCoSrb/lt2xK5vvtpOosrVSHOnglrWtNF5LBAhzg4r6/ZllvdatEpj10qiQz dUJ/nG6SziB1ZSgZZPPkFTHPCquTMB4pChybMVpRtzMXhOcCNGcDFant2HS6NWM7FjRF XTAw== X-Gm-Message-State: AOJu0Yxg07Cd3q8CZVyLFZbE+5VvzJIx8P0NVluMoY65wtjXMWf3zLVf LSkHBgVWBMi28WKSU/Ks3CI3pULCk8q9PsuRBlz2eXnt1Q1GYSvG5NxGbcG9U9Mo7GkBmQxjqkk FCtKY1/97x0KAjPfOOeaIuPxF5PA/D9cuGSTHKcU/hN2dAcZ4m77K+dczvw== X-Gm-Gg: ASbGncvgWRfVqKb6JBD0sJUOkJ1q33fzKVg6jQoHkAQPum/aer7Vn/nBOchYjiUzLFs 7YSz9j3CsdK4rV7MCgTvRA1tpOGH/Xn9cREp2XAp1Z6zO3LB1O/pWWwKBm2czY+X8rF8VFPHbzG 5EwXOu2uaLWoYnrkelSW6Y7KMtVUINue7VWvkmAvnPw4LI22pEIxOUwnaX8LZqOQKp55kBxHwat c0kgxL6EozxXeXnUUNvnQmwei5TSt5q7FPhfm55JvLwfhu5hpF3/3zbj1FeQJcZhwm1nqU++ZtM RBSajj1TFndqOmyL3Os35vrWGbFysIb+DQ== X-Received: by 2002:a05:600c:468d:b0:434:f270:a513 with SMTP id 5b1f17b1804b1-438dc429eb0mr223566525e9.29.1738655438607; Mon, 03 Feb 2025 23:50:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IH+DIGwv/jQpXDjdY5ftQ1F2qOmb9kOLwxP0ub/eT0X4Xorafi8DfnSt1EuZzKGj11XuzvqzQ== X-Received: by 2002:a05:600c:468d:b0:434:f270:a513 with SMTP id 5b1f17b1804b1-438dc429eb0mr223566305e9.29.1738655438149; Mon, 03 Feb 2025 23:50:38 -0800 (PST) Received: from maya.myfinge.rs (ifcgrfdd.trafficplex.cloud. [176.103.220.4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c1017besm14651175f8f.26.2025.02.03.23.50.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 23:50:37 -0800 (PST) Date: Tue, 4 Feb 2025 08:50:35 +0100 From: Stefano Brivio To: David Gibson Subject: Re: [PATCH v2 3/3] tcp: Simplify handling of getsockname() Message-ID: <20250204085035.62bca3a8@elisabeth> In-Reply-To: <20250204054215.644811-4-david@gibson.dropbear.id.au> References: <20250204054215.644811-1-david@gibson.dropbear.id.au> <20250204054215.644811-4-david@gibson.dropbear.id.au> Organization: Red Hat X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: TilsJ_djphObXhBNOjSBgdILr7ycd1ADENKEFle68oE_1738655439 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: KAEPBXCWY5AHCCXRAZKD4XUCWGQSHASE X-Message-ID-Hash: KAEPBXCWY5AHCCXRAZKD4XUCWGQSHASE X-MailFrom: sbrivio@redhat.com 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: passt-dev@passt.top 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: On Tue, 4 Feb 2025 16:42:15 +1100 David Gibson wrote: > For migration we need to get the specific local address and port for > connected sockets with getsockname(). We currently open code marshalling > the results into the flow entry. > > However, we already have inany_from_sockaddr() which handles the fiddly > parts of this, so use it. Also report failures, which may make debugging > problems easier. > > Signed-off-by: David Gibson > --- > tcp.c | 24 +++++++----------------- > 1 file changed, 7 insertions(+), 17 deletions(-) > > diff --git a/tcp.c b/tcp.c > index 7ce0f4cb..dbdaa9d9 100644 > --- a/tcp.c > +++ b/tcp.c > @@ -1712,24 +1712,14 @@ static void tcp_conn_from_tap(const struct ctx *c, sa_family_t af, > tcp_epoll_ctl(c, conn); > > if (c->mode == MODE_VU) { /* To rebind to same oport after migration */ > - if (af == AF_INET) { > - struct sockaddr_in s_in; > - > - sl = sizeof(s_in); > - if (!getsockname(s, (struct sockaddr *)&s_in, &sl)) { > - /* NOLINTNEXTLINE(clang-analyzer-core.CallAndMessage) */ > - tgt->oport = ntohs(s_in.sin_port); > - tgt->oaddr = inany_from_v4(s_in.sin_addr); > - } > - } else { > - struct sockaddr_in6 s_in6; > + union sockaddr_inany sa; > + socklen_t sl = sizeof(sa); This shadows the previous declaration of 'sl'. Turning into an assignment. > - sl = sizeof(s_in6); > - if (!getsockname(s, (struct sockaddr *)&s_in6, &sl)) { > - /* NOLINTNEXTLINE(clang-analyzer-core.CallAndMessage) */ > - tgt->oport = ntohs(s_in6.sin6_port); > - tgt->oaddr.a6 = s_in6.sin6_addr; > - } > + 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)); > } > } -- Stefano