inany: Extend inany_ntop() to treat NULL as a fully unspecified address

In a number of places we're using a convention that a NULL inany represents
a dual-stack unspecified address, that is one which includes both 0.0.0.0
and ::.  Extend inany_ntop() to handle that convention, representing it
as "*".

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

1 files changed, 6 insertions, 3 deletions

diff --git a/inany.c b/inany.c
index 7680439..87a4d8b 100644
--- a/inany.c
+++ b/inany.c
@@ -22,7 +22,7 @@ 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
+ * @src:	IPv[46] address (NULL for unspecified)
  * @dst:	output buffer, minimum INANY_ADDRSTRLEN bytes
  * @size:	size of buffer at @dst
  *
@@ -30,9 +30,12 @@ const union inany_addr inany_any4 = INANY_INIT4(IN4ADDR_ANY_INIT);
  */
 const char *inany_ntop(const union inany_addr *src, char *dst, socklen_t size)
 {
-	const struct in_addr *v4 = inany_v4(src);
+	const struct in_addr *v4;
+
+	if (!src)
+		return strncpy(dst, "*", size);
 
-	if (v4)
+	if ((v4 = inany_v4(src)))
 		return inet_ntop(AF_INET, v4, dst, size);
 
 	return inet_ntop(AF_INET6, &src->a6, dst, size);