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 70D4A5A0276 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=/YBeVuU7ugLHN9Tj9+YDMRG321cTZ7EtDIY13r5w7oI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d7sNKy+UJCNy1k0gSp+lt1HMgVx5VYM/+TKpAk3FTEgM6I/q/sCpR91Nwjxzxk+Mz qNk5F0gfnofYJbTq5jIGUTzNlpetsVGFrwYxnWj7nwqC9sdcbMmofjIvZel+jQADxo 5QgCVrvLvYUscVKg83Fayr3LpZ+nv0YBSEW5NuzB7MkXOxt8kNPoZuRxaGpT61XXcL gw8AxoGRTgHX5MmM0fbY7A+lbDOpyNhvC5hh3R0a4xbwSJ7/yGuPtB8yUjrLpkGxqc qxL9Mmq4hVIECMI+Z5nFqMnBJOvimQjTP2x+FCDw+xQ4fEdQSEU4GsHy7E9DAS1id3 DnCNznwosvZMQ== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TqLj23vTzz4wcJ; Wed, 6 Mar 2024 16:34:30 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v2 2/6] udp: Consistent port variable names in udp_update_hdr[46] Date: Wed, 6 Mar 2024 16:34:24 +1100 Message-ID: <20240306053428.1176129-3-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: LO2SBJMAL7X4ZTHY6LOVIYRVVRDK7IDV X-Message-ID-Hash: LO2SBJMAL7X4ZTHY6LOVIYRVVRDK7IDV 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: In these functions we have 'dstport' for the destination port, but 'src_port' for the source port. Change the latter to 'srcport' for consistency. Signed-off-by: David Gibson --- udp.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/udp.c b/udp.c index df5f3c48..79f0a63c 100644 --- a/udp.c +++ b/udp.c @@ -574,7 +574,7 @@ static size_t udp_update_hdr4(const struct ctx *c, int n, in_port_t dstport, { struct udp4_l2_buf_t *b = &udp4_l2_buf[n]; const struct in_addr *src; - in_port_t src_port; + in_port_t srcport; size_t ip_len; ip_len = udp4_l2_mh_sock[n].msg_len + sizeof(b->iph) + sizeof(b->uh); @@ -583,22 +583,22 @@ static size_t udp_update_hdr4(const struct ctx *c, int n, in_port_t dstport, b->iph.daddr = c->ip4.addr_seen.s_addr; src = &b->s_in.sin_addr; - src_port = ntohs(b->s_in.sin_port); + srcport = ntohs(b->s_in.sin_port); if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_match) && - IN4_ARE_ADDR_EQUAL(src, &c->ip4.dns_host) && src_port == 53) { + 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][src_port].ts = now->tv_sec; - udp_tap_map[V4][src_port].flags |= PORT_LOCAL; + udp_tap_map[V4][srcport].ts = now->tv_sec; + udp_tap_map[V4][srcport].flags |= PORT_LOCAL; if (IN4_IS_ADDR_LOOPBACK(src)) - udp_tap_map[V4][src_port].flags |= PORT_LOOPBACK; + udp_tap_map[V4][srcport].flags |= PORT_LOOPBACK; else - udp_tap_map[V4][src_port].flags &= ~PORT_LOOPBACK; + udp_tap_map[V4][srcport].flags &= ~PORT_LOOPBACK; - bitmap_set(udp_act[V4][UDP_ACT_TAP], src_port); + bitmap_set(udp_act[V4][UDP_ACT_TAP], srcport); src = &c->ip4.gw; } @@ -628,12 +628,12 @@ static size_t udp_update_hdr6(const struct ctx *c, int n, in_port_t dstport, struct udp6_l2_buf_t *b = &udp6_l2_buf[n]; const struct in6_addr *src, *dst; uint16_t payload_len; - in_port_t src_port; + in_port_t srcport; size_t ip_len; dst = &c->ip6.addr_seen; src = &b->s_in6.sin6_addr; - src_port = ntohs(b->s_in6.sin6_port); + srcport = ntohs(b->s_in6.sin6_port); ip_len = udp6_l2_mh_sock[n].msg_len + sizeof(b->ip6h) + sizeof(b->uh); @@ -644,25 +644,25 @@ static size_t udp_update_hdr6(const struct ctx *c, int n, in_port_t dstport, dst = &c->ip6.addr_ll_seen; } else if (!IN6_IS_ADDR_UNSPECIFIED(&c->ip6.dns_match) && IN6_ARE_ADDR_EQUAL(src, &c->ip6.dns_host) && - src_port == 53) { + srcport == 53) { src = &c->ip6.dns_match; } else if (IN6_IS_ADDR_LOOPBACK(src) || IN6_ARE_ADDR_EQUAL(src, &c->ip6.addr_seen) || IN6_ARE_ADDR_EQUAL(src, &c->ip6.addr)) { - udp_tap_map[V6][src_port].ts = now->tv_sec; - udp_tap_map[V6][src_port].flags |= PORT_LOCAL; + udp_tap_map[V6][srcport].ts = now->tv_sec; + udp_tap_map[V6][srcport].flags |= PORT_LOCAL; if (IN6_IS_ADDR_LOOPBACK(src)) - udp_tap_map[V6][src_port].flags |= PORT_LOOPBACK; + udp_tap_map[V6][srcport].flags |= PORT_LOOPBACK; else - udp_tap_map[V6][src_port].flags &= ~PORT_LOOPBACK; + udp_tap_map[V6][srcport].flags &= ~PORT_LOOPBACK; if (IN6_ARE_ADDR_EQUAL(src, &c->ip6.addr)) - udp_tap_map[V6][src_port].flags |= PORT_GUA; + udp_tap_map[V6][srcport].flags |= PORT_GUA; else - udp_tap_map[V6][src_port].flags &= ~PORT_GUA; + udp_tap_map[V6][srcport].flags &= ~PORT_GUA; - bitmap_set(udp_act[V6][UDP_ACT_TAP], src_port); + bitmap_set(udp_act[V6][UDP_ACT_TAP], srcport); dst = &c->ip6.addr_ll_seen; -- 2.44.0