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 AB61D5A0277 for ; Wed, 6 Mar 2024 06:34:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1709703270; bh=kmpKcAl51NT3cUXJ3sbTXKeSiKa4TzL9QizPy9cCqZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=my7xoTAx9nhrbMJbvpuTnBjqhG6g/+LJJkjBxQQC3tTgkniBeYupmkoG1x0D4eCsV eo25ZCbRykO+dAjxfZiSrMHcuZ55bzj6Jd9kIkTQXPOaG1dZnsWNL//Lt+I4RtDoL5 YuwoPq6eVaLiyw0F3l4iNkeeByqaA5hTSwadRSiBBPT8jKYGNMiUzb9nDgLpMFQcCF K8Y3ItK5F0tCDAQd60lyvhu7bma4fd6mKb39uVR4JD5g2jS1Uu3uUuoA16ZPksltwJ 1LKQ5Jpmnx+XQvv1SRKnsXvqt63y1kkeNXP0m1ZsZSP1XGbaiVdA/WPlT9p1QrSVyu BVRHkYLzoGacw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TqLj2468vz4wcK; Wed, 6 Mar 2024 16:34:30 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 3/6] udp: Pass data length explicitly to to udp_update_hdr[46] Date: Wed, 6 Mar 2024 16:34:25 +1100 Message-ID: <20240306053428.1176129-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240306053428.1176129-1-david@gibson.dropbear.id.au> References: <20240306053428.1176129-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: BQ3AUTCZYESVD2BQDB2OXHSQYHPJ54LT X-Message-ID-Hash: BQ3AUTCZYESVD2BQDB2OXHSQYHPJ54LT 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: These functions take an index to the L2 buffer whose header information to update. They use that for two things: to locate the buffer pointer itself, and to retrieve the length of the received message from the paralllel udp[46]_l2_mh_sock array. The latter is arguably a failure to separate concerns. Change these functions to explicitly take a buffer pointer and payload length as parameters. Signed-off-by: David Gibson --- udp.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/udp.c b/udp.c index 79f0a63c..e20f537a 100644 --- a/udp.c +++ b/udp.c @@ -563,21 +563,22 @@ static void udp_splice_sendfrom(const struct ctx *c, unsigned start, unsigned n, /** * udp_update_hdr4() - Update headers for one IPv4 datagram * @c: Execution context - * @n: Index of buffer in udp4_l2_buf pool + * @b: Pointer to udp4_l2_buf to update * @dstport: Destination port number + * @datalen: Length of UDP payload * @now: Current timestamp * * Return: size of tap frame with headers */ -static size_t udp_update_hdr4(const struct ctx *c, int n, in_port_t dstport, +static size_t udp_update_hdr4(const struct ctx *c, struct udp4_l2_buf_t *b, + in_port_t dstport, size_t datalen, const struct timespec *now) { - struct udp4_l2_buf_t *b = &udp4_l2_buf[n]; const struct in_addr *src; in_port_t srcport; size_t ip_len; - ip_len = udp4_l2_mh_sock[n].msg_len + sizeof(b->iph) + sizeof(b->uh); + ip_len = datalen + sizeof(b->iph) + sizeof(b->uh); b->iph.tot_len = htons(ip_len); b->iph.daddr = c->ip4.addr_seen.s_addr; @@ -608,7 +609,7 @@ static size_t udp_update_hdr4(const struct ctx *c, int n, in_port_t dstport, *src, c->ip4.addr_seen); b->uh.source = b->s_in.sin_port; b->uh.dest = htons(dstport); - b->uh.len = htons(udp4_l2_mh_sock[n].msg_len + sizeof(b->uh)); + b->uh.len = htons(datalen + sizeof(b->uh)); return tap_iov_len(c, &b->taph, ip_len); } @@ -616,16 +617,17 @@ static size_t udp_update_hdr4(const struct ctx *c, int n, in_port_t dstport, /** * udp_update_hdr6() - Update headers for one IPv6 datagram * @c: Execution context - * @n: Index of buffer in udp6_l2_buf pool + * @b: Pointer to udp6_l2_buf to update * @dstport: Destination port number + * @datalen: Length of UDP payload * @now: Current timestamp * * Return: size of tap frame with headers */ -static size_t udp_update_hdr6(const struct ctx *c, int n, in_port_t dstport, +static size_t udp_update_hdr6(const struct ctx *c, struct udp6_l2_buf_t *b, + in_port_t dstport, size_t datalen, const struct timespec *now) { - struct udp6_l2_buf_t *b = &udp6_l2_buf[n]; const struct in6_addr *src, *dst; uint16_t payload_len; in_port_t srcport; @@ -635,9 +637,9 @@ static size_t udp_update_hdr6(const struct ctx *c, int n, in_port_t dstport, src = &b->s_in6.sin6_addr; srcport = ntohs(b->s_in6.sin6_port); - ip_len = udp6_l2_mh_sock[n].msg_len + sizeof(b->ip6h) + sizeof(b->uh); + ip_len = datalen + sizeof(b->ip6h) + sizeof(b->uh); - payload_len = udp6_l2_mh_sock[n].msg_len + sizeof(b->uh); + payload_len = datalen + sizeof(b->uh); b->ip6h.payload_len = htons(payload_len); if (IN6_IS_ADDR_LINKLOCAL(src)) { @@ -716,9 +718,11 @@ static void udp_tap_send(const struct ctx *c, size_t buf_len; if (v6) - buf_len = udp_update_hdr6(c, i, dstport, now); + buf_len = udp_update_hdr6(c, &udp6_l2_buf[i], dstport, + udp6_l2_mh_sock[i].msg_len, now); else - buf_len = udp_update_hdr4(c, i, dstport, now); + buf_len = udp_update_hdr4(c, &udp4_l2_buf[i], dstport, + udp4_l2_mh_sock[i].msg_len, now); tap_iov[i].iov_len = buf_len; } -- 2.44.0