inany: Provide more conveniently typed constants for special addresses
Our inany_addr type is used in some places to represent either IPv4 or IPv6 addresses, and we plan to use it more widely. We don't yet provide constants of this type for special addresses (loopback and "any"). Add some of these, both the IPv4 and IPv6 variants of those addresses, but typed as union inany_addr. To avoid actually adding more things to .data we can use some macros and casting to overlay the IPv6 versions of these with the standard library's in6addr_loopback and in6addr_any. For the IPv4 versions we need to create new constant globals. For complicated historical reasons, the standard library doesn't provide constants for IPv4 loopback and any addresses as struct in_addr. It just has macros of type in_addr_t == uint32_t, which has some gotchas w.r.t. endianness. We can use some more macros to address this lack, using macros to effectively create these IPv4 constants as pieces of the inany constants above. We use this last to avoid some awkward temporary variables just used to get an address of an IPv4 loopback address. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:

committed by
Stefano Brivio

parent
330b5db77d
commit
0cf6b2d89d
9
inany.h
9
inany.h
@@ -32,6 +32,15 @@ static_assert(sizeof(union inany_addr) == sizeof(struct in6_addr),
|
||||
static_assert(_Alignof(union inany_addr) == _Alignof(uint32_t),
|
||||
"union inany_addr has unexpected alignment");
|
||||
|
||||
#define inany_loopback6 (*(const union inany_addr *)(&in6addr_loopback))
|
||||
extern const union inany_addr inany_loopback4;
|
||||
|
||||
#define inany_any6 (*(const union inany_addr *)(&in6addr_any))
|
||||
extern const union inany_addr inany_any4;
|
||||
|
||||
#define in4addr_loopback (inany_loopback4.v4mapped.a4)
|
||||
#define in4addr_any (inany_any4.v4mapped.a4)
|
||||
|
||||
/** inany_v4 - Extract IPv4 address, if present, from IPv[46] address
|
||||
* @addr: IPv4 or IPv6 address
|
||||
*
|
||||
|
Reference in New Issue
Block a user