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

netlink: Use struct in_addr for IPv4 addresses, not bare uint32_t

Browse source 
This improves consistency with IPv6 and makes it harder to misuse these as
some other sort of value.

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 2023-08-03 17:19:43 +10:00 committed by Stefano Brivio
parent 257a6b0b7e
commit cfe7509e5c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
netlink.c
View file

@ -265,9 +265,9 @@ void nl_route_set_def(unsigned int ifi, sa_family_t af, void *gw)
} r6; } r6;
struct { struct {
struct rtattr rta_dst; struct rtattr rta_dst;
uint32_t d; struct in_addr d;
struct rtattr rta_gw; struct rtattr rta_gw;
uint32_t a; struct in_addr a;
} r4; } r4;
} set; } set;
} req = { } req = {
@ -309,7 +309,7 @@ void nl_route_set_def(unsigned int ifi, sa_family_t af, void *gw)
req.set.r4.rta_dst.rta_type = RTA_DST; req.set.r4.rta_dst.rta_type = RTA_DST;
req.set.r4.rta_dst.rta_len = rta_len; req.set.r4.rta_dst.rta_len = rta_len;
req.set.r4.a = *(uint32_t *)gw; memcpy(&req.set.r4.a, gw, sizeof(req.set.r4.a));
req.set.r4.rta_gw.rta_type = RTA_GATEWAY; req.set.r4.rta_gw.rta_type = RTA_GATEWAY;
req.set.r4.rta_gw.rta_len = rta_len; req.set.r4.rta_gw.rta_len = rta_len;
} }
@ -470,9 +470,9 @@ void nl_addr_set(unsigned int ifi, sa_family_t af, void *addr, int prefix_len)
union { union {
struct { struct {
struct rtattr rta_l; struct rtattr rta_l;
uint32_t l; struct in_addr l;
struct rtattr rta_a; struct rtattr rta_a;
uint32_t a; struct in_addr a;
} a4; } a4;
struct { struct {
struct rtattr rta_l; struct rtattr rta_l;
@ -516,7 +516,7 @@ void nl_addr_set(unsigned int ifi, sa_family_t af, void *addr, int prefix_len)
req.nlh.nlmsg_len = offsetof(struct req_t, set.a4) req.nlh.nlmsg_len = offsetof(struct req_t, set.a4)
+ sizeof(req.set.a4); + sizeof(req.set.a4);
req.set.a4.l = req.set.a4.a = *(uint32_t *)addr; memcpy(&req.set.a4.l, addr, sizeof(req.set.a4.l));
req.set.a4.rta_l.rta_len = rta_len; req.set.a4.rta_l.rta_len = rta_len;
req.set.a4.rta_l.rta_type = IFA_LOCAL; req.set.a4.rta_l.rta_type = IFA_LOCAL;
req.set.a4.rta_a.rta_len = rta_len; req.set.a4.rta_a.rta_len = rta_len;