socket: Add support for AF_INET6 in osmo_sockaddr_to_str_and_uint()

Related: SYS#4915
Change-Id: I439c7fa52a3a30eebc3d35e78be7f1724fb69294

1 files changed, 15 insertions, 2 deletions

diff --git a/src/socket.c b/src/socket.c
index a5bbddf5..e88af16e 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -983,9 +983,22 @@ size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint1
 unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,
 					   const struct sockaddr *sa)
 {
-	const struct sockaddr_in *sin = (const struct sockaddr_in *)sa;
 
-	return osmo_sockaddr_in_to_str_and_uint(addr, addr_len, port, sin);
+	const struct sockaddr_in6 *sin6;
+
+	switch (sa->sa_family) {
+	case AF_INET:
+		return osmo_sockaddr_in_to_str_and_uint(addr, addr_len, port,
+							(const struct sockaddr_in *)sa);
+	case AF_INET6:
+		sin6 = (const struct sockaddr_in6 *)sa;
+		if (port)
+			*port = ntohs(sin6->sin6_port);
+		if (addr && inet_ntop(sa->sa_family, &sin6->sin6_addr, addr, addr_len))
+			return strlen(addr);
+		break;
+	}
+	return 0;
 }
 
 /*! Initialize a unix domain socket (including bind/connect)