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

Use endian-safer typing in struct tap4_l4_t

Browse source 
We recently converted to using struct in_addr rather than bare in_addr_t
or uint32_t to represent IPv4 addresses in network order.  This makes it
harder forget to apply the correct endian conversions.

We omitted the IPv4 addresses stored in struct tap4_l4_t, however.  Convert
those as well.

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 2022-11-04 14:10:36 +11:00 committed by Stefano Brivio
parent 7c7b68dbe0
commit f7653a1446
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tap.c
View file

@ -320,8 +320,8 @@ static struct tap4_l4_t {
uint16_t source; uint16_t source;
uint16_t dest; uint16_t dest;
uint32_t saddr; struct in_addr saddr;
uint32_t daddr; struct in_addr daddr;
struct pool_l4_t p; struct pool_l4_t p;
} tap4_l4[TAP_SEQS /* Arbitrary: TAP_MSGS in theory, so limit in users */]; } tap4_l4[TAP_SEQS /* Arbitrary: TAP_MSGS in theory, so limit in users */];
@ -367,14 +367,15 @@ static void tap_packet_debug(const struct iphdr *iph,
uint8_t proto = 0; uint8_t proto = 0;
if (iph || seq4) { if (iph || seq4) {
inet_ntop(AF_INET, iph ? &iph->saddr : &seq4->saddr, if (iph) {
buf4s, sizeof(buf4s)); inet_ntop(AF_INET, &iph->saddr, buf4s, sizeof(buf4s));
inet_ntop(AF_INET, iph ? &iph->daddr : &seq4->daddr, inet_ntop(AF_INET, &iph->daddr, buf4d, sizeof(buf4d));
buf4d, sizeof(buf4d));
if (iph)
proto = iph->protocol; proto = iph->protocol;
else if (seq4) } else {
inet_ntop(AF_INET, &seq4->saddr, buf4s, sizeof(buf4s));
inet_ntop(AF_INET, &seq4->daddr, buf4d, sizeof(buf4d));
proto = seq4->protocol; proto = seq4->protocol;
}
} else { } else {
inet_ntop(AF_INET6, ip6h ? &ip6h->saddr : &seq6->saddr, inet_ntop(AF_INET6, ip6h ? &ip6h->saddr : &seq6->saddr,
buf6s, sizeof(buf6s)); buf6s, sizeof(buf6s));
@ -491,15 +492,15 @@ resume:
#define L4_MATCH(iph, uh, seq) \ #define L4_MATCH(iph, uh, seq) \
(seq->protocol == iph->protocol && \ (seq->protocol == iph->protocol && \
seq->source == uh->source && seq->dest == uh->dest && \ seq->source == uh->source && seq->dest == uh->dest && \
seq->saddr == iph->saddr && seq->daddr == iph->daddr) seq->saddr.s_addr == iph->saddr && seq->daddr.s_addr == iph->daddr)
#define L4_SET(iph, uh, seq) \ #define L4_SET(iph, uh, seq) \
do { \ do { \
seq->protocol = iph->protocol; \ seq->protocol = iph->protocol; \
seq->source = uh->source; \ seq->source = uh->source; \
seq->dest = uh->dest; \ seq->dest = uh->dest; \
seq->saddr = iph->saddr; \ seq->saddr.s_addr = iph->saddr; \
seq->daddr = iph->daddr; \ seq->daddr.s_addr = iph->daddr; \
} while (0) } while (0)
if (seq && L4_MATCH(iph, uh, seq) && seq->p.count < TAP_SEQS) if (seq && L4_MATCH(iph, uh, seq) && seq->p.count < TAP_SEQS)
@ -531,7 +532,7 @@ append:
for (j = 0, seq = tap4_l4; j < seq_count; j++, seq++) { for (j = 0, seq = tap4_l4; j < seq_count; j++, seq++) {
struct pool *p = (struct pool *)&seq->p; struct pool *p = (struct pool *)&seq->p;
uint32_t *da = &seq->daddr; struct in_addr *da = &seq->daddr;
size_t n = p->count; size_t n = p->count;
tap_packet_debug(NULL, NULL, seq, 0, NULL, n); tap_packet_debug(NULL, NULL, seq, 0, NULL, n);