lib: make sockunion2str safer to use
It's mostly used for logging, and the return value is never
checked, so try to make it valid.
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/lib/sockunion.c b/lib/sockunion.c
index 727730a..492c36e 100644
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -166,13 +166,20 @@
const char *
sockunion2str (const union sockunion *su, char *buf, size_t len)
{
- if (su->sa.sa_family == AF_INET)
- return inet_ntop (AF_INET, &su->sin.sin_addr, buf, len);
+ switch (sockunion_family(su))
+ {
+ case AF_UNSPEC:
+ snprintf (buf, len, "(unspec)");
+ return buf;
+ case AF_INET:
+ return inet_ntop (AF_INET, &su->sin.sin_addr, buf, len);
#ifdef HAVE_IPV6
- else if (su->sa.sa_family == AF_INET6)
- return inet_ntop (AF_INET6, &su->sin6.sin6_addr, buf, len);
+ case AF_INET6:
+ return inet_ntop (AF_INET6, &su->sin6.sin6_addr, buf, len);
#endif /* HAVE_IPV6 */
- return NULL;
+ }
+ snprintf (buf, len, "(af %d)", sockunion_family(su));
+ return buf;
}
union sockunion *