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 A897C5A0274 for ; Wed, 28 Feb 2024 06:39:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1709098773; bh=+OlsxmezBUwp78uKKUm7EsJsEu7TMODVTsS4qu5zmn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=apTaeKGUc1CQCrtUdadyR8w3pSlnG3ETEboV2g/qIq2Sa6FRxY2PgSeZeyHTnuc6T SL9V7Su+g24JoDKT4k2OrqMWghqfcCDDCVoS0Q/PgkQtn6AXdSVsTItv2iLbslj/lI tHoj/JCCQHZXS9hC2p4jh+ySEuyo8RPr0CEMeQGs9PqNHFj95hkge7kAX7l/ODkeKZ IbEt5xg89APx8pza+CkfoNHdA2Ieye1s8eZqjXjDsqK8QaKVqVwe7/KM49akUORNxK yOaRD2eE/RJt8TcULQT2+p9Wy2grDGpMgNKfiFDVoXBCCBRtAaDsQ5cPRzikVYIQ+X aldbnKkP/yBXw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Tl3853HLJz4wxs; Wed, 28 Feb 2024 16:39:33 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top, Laurent Vivier Subject: [PATCH v2 3/5] udp: Small streamline to udp_update_hdr4() Date: Wed, 28 Feb 2024 16:39:27 +1100 Message-ID: <20240228053929.1570254-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240228053929.1570254-1-david@gibson.dropbear.id.au> References: <20240228053929.1570254-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: BJCKG6ZT5R4DKJI274CSKIVXQV5JFWPY X-Message-ID-Hash: BJCKG6ZT5R4DKJI274CSKIVXQV5JFWPY 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: Streamline the logic here slightly, by introducing a 'src' temporary for brevity. We also transform the logic for setting/clearing PORT_LOOPBACK. This makes udp_update_hdr4() more closely match the corresponding logic from udp_update_udp6(). Signed-off-by: David Gibson --- udp.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/udp.c b/udp.c index d992acd0..561ba604 100644 --- a/udp.c +++ b/udp.c @@ -584,6 +584,7 @@ static size_t udp_update_hdr4(const struct ctx *c, int n, in_port_t dstport, const struct timespec *now) { struct udp4_l2_buf_t *b = &udp4_l2_buf[n]; + struct in_addr *src; in_port_t src_port; size_t ip_len; @@ -592,26 +593,26 @@ static size_t udp_update_hdr4(const struct ctx *c, int n, in_port_t dstport, b->iph.tot_len = htons(ip_len); b->iph.daddr = c->ip4.addr_seen.s_addr; + src = &b->s_in.sin_addr; src_port = ntohs(b->s_in.sin_port); if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_match) && - IN4_ARE_ADDR_EQUAL(&b->s_in.sin_addr, &c->ip4.dns_host) && - src_port == 53) { + IN4_ARE_ADDR_EQUAL(src, &c->ip4.dns_host) && src_port == 53) { b->iph.saddr = c->ip4.dns_match.s_addr; - } else if (IN4_IS_ADDR_LOOPBACK(&b->s_in.sin_addr) || - IN4_ARE_ADDR_EQUAL(&b->s_in.sin_addr, &c->ip4.addr_seen)) { + } else if (IN4_IS_ADDR_LOOPBACK(src) || + IN4_ARE_ADDR_EQUAL(src, &c->ip4.addr_seen)) { b->iph.saddr = c->ip4.gw.s_addr; udp_tap_map[V4][src_port].ts = now->tv_sec; udp_tap_map[V4][src_port].flags |= PORT_LOCAL; - if (IN4_ARE_ADDR_EQUAL(&b->s_in.sin_addr.s_addr, &c->ip4.addr_seen)) - udp_tap_map[V4][src_port].flags &= ~PORT_LOOPBACK; - else + if (IN4_IS_ADDR_LOOPBACK(src)) udp_tap_map[V4][src_port].flags |= PORT_LOOPBACK; + else + udp_tap_map[V4][src_port].flags &= ~PORT_LOOPBACK; bitmap_set(udp_act[V4][UDP_ACT_TAP], src_port); } else { - b->iph.saddr = b->s_in.sin_addr.s_addr; + b->iph.saddr = src->s_addr; } udp_update_check4(b); -- 2.43.2