Let sockaddr2str() handle AF_UNSPEC addresses.

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 3ea5d4a..701a430 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -39,7 +39,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
        hint.ai_family = addressfamily;
        hint.ai_socktype = socktype;
 
-#ifdef HAVE_DECL_RES_INIT
+#if HAVE_DECL_RES_INIT
        res_init();
 #endif
        err = getaddrinfo(address, service, &hint, &ai);
@@ -83,7 +83,13 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
        char *scopeid;
        int err;
 
-       if(sa->sa.sa_family == AF_UNKNOWN) {
+       if(sa->sa.sa_family == AF_UNSPEC) {
+               if(addrstr)
+                       *addrstr = xstrdup("unspec");
+               if(portstr)
+                       *portstr = xstrdup("unspec");
+               return;
+       } else if(sa->sa.sa_family == AF_UNKNOWN) {
                if(addrstr)
                        *addrstr = xstrdup(sa->unknown.address);
                if(portstr)