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

util: Introduce hton*_constant() in place of #ifdefs

Browse source 
We have several places where we have fairly ugly #ifdefs on __BYTE_ORDER
where we need network order values in a constant expression (so we can't
use htons() or htonl()).  We can do this more cleanly by using a single
__BYTE_ORDER ifdef to define htons_constant() and htonl_constant()
macros, then using those in all the other places.

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-01-06 11:43:12 +11:00 committed by Stefano Brivio
parent 6d011c1faa
commit f5a950115b
2 changed files with 24 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
dhcpv6.c
View file

@ -39,37 +39,21 @@
*/ */
struct opt_hdr { struct opt_hdr {
uint16_t t; uint16_t t;
#if __BYTE_ORDER == __BIG_ENDIAN # define OPT_CLIENTID htons_constant(1)
# define OPT_CLIENTID 1 # define OPT_SERVERID htons_constant(2)
# define OPT_SERVERID 2 # define OPT_IA_NA htons_constant(3)
# define OPT_IA_NA 3 # define OPT_IA_TA htons_constant(4)
# define OPT_IA_TA 4 # define OPT_IAAADR htons_constant(5)
# define OPT_IAAADR 5 # define OPT_STATUS_CODE htons_constant(13)
# define OPT_STATUS_CODE 13 # define STATUS_NOTONLINK htons_constant(4)
# define STATUS_NOTONLINK 4 # define OPT_DNS_SERVERS htons_constant(23)
# define OPT_DNS_SERVERS 23 # define OPT_DNS_SEARCH htons_constant(24)
# define OPT_DNS_SEARCH 24
#else
# define OPT_CLIENTID __bswap_constant_16(1)
# define OPT_SERVERID __bswap_constant_16(2)
# define OPT_IA_NA __bswap_constant_16(3)
# define OPT_IA_TA __bswap_constant_16(4)
# define OPT_IAAADR __bswap_constant_16(5)
# define OPT_STATUS_CODE __bswap_constant_16(13)
# define STATUS_NOTONLINK __bswap_constant_16(4)
# define OPT_DNS_SERVERS __bswap_constant_16(23)
# define OPT_DNS_SEARCH __bswap_constant_16(24)
#endif
#define STR_NOTONLINK "Prefix not appropriate for link." #define STR_NOTONLINK "Prefix not appropriate for link."
uint16_t l; uint16_t l;
} __attribute__((packed)); } __attribute__((packed));
#if __BYTE_ORDER == __BIG_ENDIAN # define OPT_SIZE_CONV(x) (htons_constant(x))
# define OPT_SIZE_CONV(x) (x)
#else
# define OPT_SIZE_CONV(x) (__bswap_constant_16(x))
#endif
#define OPT_SIZE(x) OPT_SIZE_CONV(sizeof(struct opt_##x) - \ #define OPT_SIZE(x) OPT_SIZE_CONV(sizeof(struct opt_##x) - \
sizeof(struct opt_hdr)) sizeof(struct opt_hdr))
#define OPT_VSIZE(x) (sizeof(struct opt_##x) - \ #define OPT_VSIZE(x) (sizeof(struct opt_##x) - \
@ -103,19 +87,11 @@ struct opt_server_id {
uint8_t duid_lladdr[ETH_ALEN]; uint8_t duid_lladdr[ETH_ALEN];
} __attribute__ ((packed)); } __attribute__ ((packed));
#if __BYTE_ORDER == __BIG_ENDIAN #define SERVER_ID { \
#define SERVER_ID { \
{ OPT_SERVERID, OPT_SIZE(server_id) }, \ { OPT_SERVERID, OPT_SIZE(server_id) }, \
DUID_TYPE_LLT, ARPHRD_ETHER, 0, { 0 } \ htons_constant(DUID_TYPE_LLT), \
htons_constant(ARPHRD_ETHER), 0, { 0 } \
} }
#else
#define SERVER_ID { \
{ OPT_SERVERID, OPT_SIZE(server_id) }, \
__bswap_constant_16(DUID_TYPE_LLT), \
__bswap_constant_16(ARPHRD_ETHER), \
0, { 0 } \
}
#endif
/** /**
* struct opt_ia_na - Identity Association for Non-temporary Addresses Option * struct opt_ia_na - Identity Association for Non-temporary Addresses Option

37
util.h
View file

@ -69,6 +69,14 @@
#define MAC_ZERO ((uint8_t [ETH_ALEN]){ 0 }) #define MAC_ZERO ((uint8_t [ETH_ALEN]){ 0 })
#define MAC_IS_ZERO(addr) (!memcmp((addr), MAC_ZERO, ETH_ALEN)) #define MAC_IS_ZERO(addr) (!memcmp((addr), MAC_ZERO, ETH_ALEN))
#if __BYTE_ORDER == __BIG_ENDIAN
#define htons_constant(x) (x)
#define htonl_constant(x) (x)
#else
#define htons_constant(x) (__bswap_constant_16(x))
#define htonl_constant(x) (__bswap_constant_32(x))
#endif
#define IN4_IS_ADDR_UNSPECIFIED(a) \ #define IN4_IS_ADDR_UNSPECIFIED(a) \
((a)->s_addr == htonl(INADDR_ANY)) ((a)->s_addr == htonl(INADDR_ANY))
#define IN4_IS_ADDR_BROADCAST(a) \ #define IN4_IS_ADDR_BROADCAST(a) \
@ -79,13 +87,8 @@
(IN_MULTICAST(ntohl((a)->s_addr))) (IN_MULTICAST(ntohl((a)->s_addr)))
#define IN4_ARE_ADDR_EQUAL(a, b) \ #define IN4_ARE_ADDR_EQUAL(a, b) \
(((struct in_addr *)(a))->s_addr == ((struct in_addr *)b)->s_addr) (((struct in_addr *)(a))->s_addr == ((struct in_addr *)b)->s_addr)
#if __BYTE_ORDER == __BIG_ENDIAN
#define IN4ADDR_LOOPBACK_INIT \ #define IN4ADDR_LOOPBACK_INIT \
{ .s_addr = INADDR_LOOPBACK } { .s_addr = htonl_constant(INADDR_LOOPBACK) }
#else
#define IN4ADDR_LOOPBACK_INIT \
{ .s_addr = __bswap_constant_32(INADDR_LOOPBACK) }
#endif
#define NS_FN_STACK_SIZE (RLIMIT_STACK_VAL * 1024 / 8) #define NS_FN_STACK_SIZE (RLIMIT_STACK_VAL * 1024 / 8)
int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags, int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags,
@ -99,37 +102,19 @@ int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags,
(void *)(arg)); \ (void *)(arg)); \
} while (0) } while (0)
#if __BYTE_ORDER == __BIG_ENDIAN
#define L2_BUF_ETH_IP4_INIT \ #define L2_BUF_ETH_IP4_INIT \
{ \ { \
.h_dest = { 0 }, \ .h_dest = { 0 }, \
.h_source = { 0 }, \ .h_source = { 0 }, \
.h_proto = ETH_P_IP, \ .h_proto = htons_constant(ETH_P_IP), \
} }
#else
#define L2_BUF_ETH_IP4_INIT \
{ \
.h_dest = { 0 }, \
.h_source = { 0 }, \
.h_proto = __bswap_constant_16(ETH_P_IP), \
}
#endif
#if __BYTE_ORDER == __BIG_ENDIAN
#define L2_BUF_ETH_IP6_INIT \ #define L2_BUF_ETH_IP6_INIT \
{ \ { \
.h_dest = { 0 }, \ .h_dest = { 0 }, \
.h_source = { 0 }, \ .h_source = { 0 }, \
.h_proto = ETH_P_IPV6, \ .h_proto = htons_constant(ETH_P_IPV6), \
} }
#else
#define L2_BUF_ETH_IP6_INIT \
{ \
.h_dest = { 0 }, \
.h_source = { 0 }, \
.h_proto = __bswap_constant_16(ETH_P_IPV6), \
}
#endif
#define L2_BUF_IP4_INIT(proto) \ #define L2_BUF_IP4_INIT(proto) \
{ \ { \