mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

Net: Replace runtime checks with STATIC_ASSERT()

Browse Source
This commit is contained in:
Ondrej Zajicek 2023-03-06 11:57:40 +01:00
parent 0f679438f3
commit 6b38285f58
3 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/net.c
View File

@ -57,6 +57,19 @@ const u16 net_max_text_length[] = {
[NET_MPLS] = 7, /* "1048575" */ [NET_MPLS] = 7, /* "1048575" */
}; };
/* There should be no implicit padding in net_addr structures */
STATIC_ASSERT(sizeof(net_addr) == 24);
STATIC_ASSERT(sizeof(net_addr_ip4) == 8);
STATIC_ASSERT(sizeof(net_addr_ip6) == 20);
STATIC_ASSERT(sizeof(net_addr_vpn4) == 16);
STATIC_ASSERT(sizeof(net_addr_vpn6) == 32);
STATIC_ASSERT(sizeof(net_addr_roa4) == 16);
STATIC_ASSERT(sizeof(net_addr_roa6) == 28);
STATIC_ASSERT(sizeof(net_addr_flow4) == 8);
STATIC_ASSERT(sizeof(net_addr_flow6) == 20);
STATIC_ASSERT(sizeof(net_addr_ip6_sadr) == 40);
STATIC_ASSERT(sizeof(net_addr_mpls) == 8);
int int
rd_format(const u64 rd, char *buf, int buflen) rd_format(const u64 rd, char *buf, int buflen)
@ -310,22 +323,3 @@ net_in_netX(const net_addr *a, const net_addr *n)
return (net_pxlen(n) <= net_pxlen(a)) && ipa_in_netX(net_prefix(a), n); return (net_pxlen(n) <= net_pxlen(a)) && ipa_in_netX(net_prefix(a), n);
} }
#define CHECK_NET(T,S) \
({ if (sizeof(T) != S) die("sizeof %s is %d/%d", #T, (int) sizeof(T), S); })
void
net_init(void)
{
CHECK_NET(net_addr, 24);
CHECK_NET(net_addr_ip4, 8);
CHECK_NET(net_addr_ip6, 20);
CHECK_NET(net_addr_vpn4, 16);
CHECK_NET(net_addr_vpn6, 32);
CHECK_NET(net_addr_roa4, 16);
CHECK_NET(net_addr_roa6, 28);
CHECK_NET(net_addr_flow4, 8);
CHECK_NET(net_addr_flow6, 20);
CHECK_NET(net_addr_ip6_sadr, 40);
CHECK_NET(net_addr_mpls, 8);
}

2
lib/net.h
View File

@ -620,6 +620,4 @@ static inline int net_in_net_src_ip6_sadr(const net_addr_ip6_sadr *a, const net_
int ipa_in_netX(const ip_addr A, const net_addr *N); int ipa_in_netX(const ip_addr A, const net_addr *N);
int net_in_netX(const net_addr *A, const net_addr *N); int net_in_netX(const net_addr *A, const net_addr *N);
void net_init(void);
#endif #endif

1
sysdep/unix/main.c
View File

@ -889,7 +889,6 @@ main(int argc, char **argv)
log_switch(1, NULL, NULL); log_switch(1, NULL, NULL);
random_init(); random_init();
net_init();
resource_init(); resource_init();
timer_init(); timer_init();
olock_init(); olock_init();