From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 4A6795A0271 for ; Thu, 24 Nov 2022 02:17:09 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4NHg7y2bB4z4xP9; Thu, 24 Nov 2022 12:17:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1669252622; bh=tcvXExjpuSVs5hEnz38nx4GwZwMTTY+ScrL1Nt65yEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVmU0UC0ywy0WOA1IcqUoE04bKCPXehouy4WO25AoK5h++IVxDvdiGKb7zhfjO4sj yIdh4IydJdGWBc4AstoJrgKoJ7rAUj8IY2FwM1Afj+QY76eOeoYy2g39pNQ9zD/ucu /jt5KisVvKDiCnXGxqePTMTPXOkGn9hP/diFBWC8= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH v2 13/16] udp: Add helper to extract port from a sockaddr_in or sockaddr_in6 Date: Thu, 24 Nov 2022 12:16:56 +1100 Message-Id: <20221124011659.1024901-14-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221124011659.1024901-1-david@gibson.dropbear.id.au> References: <20221124011659.1024901-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: TS4WUHT7XJNLIJBCRSRFJJCUIIMELDQ2 X-Message-ID-Hash: TS4WUHT7XJNLIJBCRSRFJJCUIIMELDQ2 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.3 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: udp_sock_handler_splice() has a somewhat clunky if to extract the port from a socket address which could be either IPv4 or IPv6. Future changes are going to make this even more clunky, so introduce a helper function to do this extraction. Signed-off-by: David Gibson --- udp.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/udp.c b/udp.c index 1db55e5..a79e5ca 100644 --- a/udp.c +++ b/udp.c @@ -498,6 +498,19 @@ static int udp_splice_new_ns(void *arg) return 0; } +/** + * sa_port() - Determine port from a sockaddr_in or sockaddr_in6 + * @v6: Is @sa a sockaddr_in6 (otherwise sockaddr_in) + * @sa: Pointer to either sockaddr_in or sockaddr_in6 + */ +static in_port_t sa_port(bool v6, const void *sa) +{ + const struct sockaddr_in6 *sa6 = sa; + const struct sockaddr_in *sa4 = sa; + + return v6 ? ntohs(sa6->sin6_port) : ntohs(sa4->sin_port); +} + /** * udp_sock_handler_splice() - Handler for socket mapped to "spliced" connection * @c: Execution context @@ -509,8 +522,6 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref, uint32_t events, const struct timespec *now) { in_port_t src, dst = ref.r.p.udp.udp.port; - struct msghdr *mh = &udp_mmh_recv[0].msg_hdr; - struct sockaddr_storage *sa_s = mh->msg_name; int s, v6 = ref.r.p.udp.udp.v6, n, i; if (!(events & EPOLLIN)) @@ -521,16 +532,7 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref, if (n <= 0) return; - if (v6) { - struct sockaddr_in6 *sa = (struct sockaddr_in6 *)sa_s; - - src = htons(sa->sin6_port); - } else { - struct sockaddr_in *sa = (struct sockaddr_in *)sa_s; - - src = ntohs(sa->sin_port); - } - + src = sa_port(v6, udp_mmh_recv[0].msg_hdr.msg_name); if (ref.r.p.udp.udp.ns) { src += c->udp.fwd_in.rdelta[src]; -- 2.38.1