mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

udp: Re-order udp_update_hdr[46] for clarity and brevity

Browse source 
The order of things in these functions is a bit odd for historical reasons.
We initialise some IP header fields early, the more later after making
some tests.  Likewise we declare some variables without initialisation,
but then unconditionally set them to values we could calculate at the
start of the function.

Previous cleanups have removed the reasons for some of these choices, so
reorder for clarity, and where possible move the first assignment into an
initialiser.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-03-06 16:34:26 +11:00 committed by Stefano Brivio
parent 8a842e03cd
commit b0419d150a
1 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
udp.c
View file

@ -574,17 +574,9 @@ static size_t udp_update_hdr4(const struct ctx *c, struct udp4_l2_buf_t *b,
in_port_t dstport, size_t datalen, in_port_t dstport, size_t datalen,
const struct timespec *now) const struct timespec *now)
{ {
const struct in_addr *src; size_t ip_len = datalen + sizeof(b->iph) + sizeof(b->uh);
in_port_t srcport; const struct in_addr *src = &b->s_in.sin_addr;
size_t ip_len; in_port_t srcport = ntohs(b->s_in.sin_port);
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;
src = &b->s_in.sin_addr;
srcport = ntohs(b->s_in.sin_port);
if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_match) && if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.dns_match) &&
IN4_ARE_ADDR_EQUAL(src, &c->ip4.dns_host) && srcport == 53) { IN4_ARE_ADDR_EQUAL(src, &c->ip4.dns_host) && srcport == 53) {
@ -603,10 +595,13 @@ static size_t udp_update_hdr4(const struct ctx *c, struct udp4_l2_buf_t *b,
src = &c->ip4.gw; src = &c->ip4.gw;
} }
b->iph.saddr = src->s_addr;
b->iph.tot_len = htons(ip_len);
b->iph.daddr = c->ip4.addr_seen.s_addr;
b->iph.saddr = src->s_addr;
b->iph.check = csum_ip4_header(b->iph.tot_len, IPPROTO_UDP, 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.source = b->s_in.sin_port;
b->uh.dest = htons(dstport); b->uh.dest = htons(dstport);
b->uh.len = htons(datalen + sizeof(b->uh)); b->uh.len = htons(datalen + sizeof(b->uh));
@ -628,19 +623,10 @@ static size_t udp_update_hdr6(const struct ctx *c, struct udp6_l2_buf_t *b,
in_port_t dstport, size_t datalen, in_port_t dstport, size_t datalen,
const struct timespec *now) const struct timespec *now)
{ {
const struct in6_addr *src, *dst; const struct in6_addr *src = &b->s_in6.sin6_addr;
uint16_t payload_len; const struct in6_addr *dst = &c->ip6.addr_seen;
in_port_t srcport; uint16_t payload_len = datalen + sizeof(b->uh);
size_t ip_len; in_port_t srcport = ntohs(b->s_in6.sin6_port);
dst = &c->ip6.addr_seen;
src = &b->s_in6.sin6_addr;
srcport = ntohs(b->s_in6.sin6_port);
ip_len = datalen + sizeof(b->ip6h) + sizeof(b->uh);
payload_len = datalen + sizeof(b->uh);
b->ip6h.payload_len = htons(payload_len);
if (IN6_IS_ADDR_LINKLOCAL(src)) { if (IN6_IS_ADDR_LINKLOCAL(src)) {
dst = &c->ip6.addr_ll_seen; dst = &c->ip6.addr_ll_seen;
@ -674,6 +660,8 @@ static size_t udp_update_hdr6(const struct ctx *c, struct udp6_l2_buf_t *b,
src = &c->ip6.addr_ll; src = &c->ip6.addr_ll;
} }
b->ip6h.payload_len = htons(payload_len);
b->ip6h.daddr = *dst; b->ip6h.daddr = *dst;
b->ip6h.saddr = *src; b->ip6h.saddr = *src;
b->ip6h.version = 6; b->ip6h.version = 6;
@ -688,7 +676,7 @@ static size_t udp_update_hdr6(const struct ctx *c, struct udp6_l2_buf_t *b,
proto_ipv6_header_psum(payload_len, IPPROTO_UDP, proto_ipv6_header_psum(payload_len, IPPROTO_UDP,
src, dst)); src, dst));
return tap_iov_len(c, &b->taph, ip_len); return tap_iov_len(c, &b->taph, payload_len + sizeof(b->ip6h));
} }
/** /**