From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 5F64C5A0280 for ; Wed, 6 Mar 2024 06:34:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1709703270; bh=wlm8vLejT92j1lCo9b+gTegg/Srn/K5RvBxjFyJqamI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=onlU5mTd1vZOvhF0r9/P9c3OnJA5sMiV3vSB3RR1PyTF56RnsXXULWkky0d4z024S kmPz1sSmY5M0dIFC21zrjF/lowCmte4I7/9lj85bXfQspQ3JYvcgj/UrChg9HmJ2Wr GfaJHbWGzq/P1RoE/ieuY4PCoTLZRINgv6NDaxP62CHMYK6GnGLhBYDW6ombunK2Ns csghhoaULr2M4MZ9VK6MAREo+rZGxNBopF496cvpufVFI0+v4x2joMWTY9h++zPBbR oFE/Q47iR7nAPGN6YSLiI1Z64JgePpYllqd4fCW0u+oqtf0KFyf//YUH69o1ExYlgF j7ovR9oDJjSGw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TqLj24R1Yz4wxY; Wed, 6 Mar 2024 16:34:30 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 5/6] udp: Avoid unnecessary pointer in udp_update_hdr4() Date: Wed, 6 Mar 2024 16:34:27 +1100 Message-ID: <20240306053428.1176129-6-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: UDTPUWCBXMBLOKXUNV7VV7DJFJ4NSOER X-Message-ID-Hash: UDTPUWCBXMBLOKXUNV7VV7DJFJ4NSOER 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: We carry around the source address as a pointer to a constant struct in_addr. But it's silly to carry around a 4 or 8 byte pointer to a 4 byte IPv4 address. Just copy the IPv4 address around by value. Signed-off-by: David Gibson --- udp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/udp.c b/udp.c index d3b9f5f9..fe3a6cd8 100644 --- a/udp.c +++ b/udp.c @@ -575,32 +575,32 @@ static size_t udp_update_hdr4(const struct ctx *c, struct udp4_l2_buf_t *b, const struct timespec *now) { size_t ip_len = datalen + sizeof(b->iph) + sizeof(b->uh); - const struct in_addr *src = &b->s_in.sin_addr; in_port_t srcport = ntohs(b->s_in.sin_port); + struct in_addr src = b->s_in.sin_addr; if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_match) && - IN4_ARE_ADDR_EQUAL(src, &c->ip4.dns_host) && srcport == 53) { - src = &c->ip4.dns_match; - } else if (IN4_IS_ADDR_LOOPBACK(src) || - IN4_ARE_ADDR_EQUAL(src, &c->ip4.addr_seen)) { + IN4_ARE_ADDR_EQUAL(&src, &c->ip4.dns_host) && srcport == 53) { + src = c->ip4.dns_match; + } else if (IN4_IS_ADDR_LOOPBACK(&src) || + IN4_ARE_ADDR_EQUAL(&src, &c->ip4.addr_seen)) { udp_tap_map[V4][srcport].ts = now->tv_sec; udp_tap_map[V4][srcport].flags |= PORT_LOCAL; - if (IN4_IS_ADDR_LOOPBACK(src)) + if (IN4_IS_ADDR_LOOPBACK(&src)) udp_tap_map[V4][srcport].flags |= PORT_LOOPBACK; else udp_tap_map[V4][srcport].flags &= ~PORT_LOOPBACK; bitmap_set(udp_act[V4][UDP_ACT_TAP], srcport); - src = &c->ip4.gw; + src = c->ip4.gw; } b->iph.tot_len = htons(ip_len); b->iph.daddr = c->ip4.addr_seen.s_addr; - b->iph.saddr = src->s_addr; + b->iph.saddr = src.s_addr; b->iph.check = csum_ip4_header(b->iph.tot_len, IPPROTO_UDP, - *src, c->ip4.addr_seen); + src, c->ip4.addr_seen); b->uh.source = b->s_in.sin_port; b->uh.dest = htons(dstport); -- 2.44.0