inany: Better helpers for using inany and specific family addrs together

This adds some extra inany helpers for comparing an inany address to
addresses of a specific family (including special addresses), and building
an inany from an IPv4 address (either statically or at runtime).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 2 insertions, 15 deletions

diff --git a/inany.c b/inany.c
index c8479a7..5e391dc 100644
--- a/inany.c
+++ b/inany.c
@@ -17,21 +17,8 @@
 #include "siphash.h"
 #include "inany.h"
 
-const union inany_addr inany_loopback4 = {
-	.v4mapped = {
-		.zero = { 0 },
-		.one = { 0xff, 0xff, },
-		.a4 = IN4ADDR_LOOPBACK_INIT,
-	},
-};
-
-const union inany_addr inany_any4 = {
-	.v4mapped = {
-		.zero = { 0 },
-		.one = { 0xff, 0xff, },
-		.a4 = IN4ADDR_ANY_INIT,
-	},
-};
+const union inany_addr inany_loopback4 = INANY_INIT4(IN4ADDR_LOOPBACK_INIT);
+const union inany_addr inany_any4 = INANY_INIT4(IN4ADDR_ANY_INIT);
 
 /** inany_ntop - Convert an IPv[46] address to text format
  * @src:	IPv[46] address