Don't assume sa.sa_family is a short int.

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 05b1f1e..2eebb64 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -39,11 +39,13 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
        hint.ai_family = addressfamily;
        hint.ai_socktype = socktype;
 
+#if HAVE_DECL_RES_INIT
+       res_init();
+#endif
        err = getaddrinfo(address, service, &hint, &ai);
 
        if(err) {
-               logger(DEBUG_ALWAYS, LOG_WARNING, "Error looking up %s port %s: %s", address,
-                                  service, gai_strerror(err));
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Error looking up %s port %s: %s", address, service, err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
                return NULL;
        }
 
@@ -52,7 +54,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
 
 sockaddr_t str2sockaddr(const char *address, const char *port) {
        struct addrinfo *ai, hint = {0};
-       sockaddr_t result;
+       sockaddr_t result = {{0}};
        int err;
 
        hint.ai_family = AF_UNSPEC;
@@ -81,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)
@@ -92,15 +100,14 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
        err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port, NI_NUMERICHOST | NI_NUMERICSERV);
 
        if(err) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Error while translating addresses: %s",
-                          gai_strerror(err));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while translating addresses: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
                abort();
        }
 
        scopeid = strchr(address, '%');
 
        if(scopeid)
-               *scopeid = '\0';                /* Descope. */
+               *scopeid = '\0'; /* Descope. */
 
        if(addrstr)
                *addrstr = xstrdup(address);
@@ -114,7 +121,10 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
        char port[NI_MAXSERV] = "unknown";
        int err;
 
-       if(sa->sa.sa_family == AF_UNKNOWN) {
+       if(sa->sa.sa_family == AF_UNSPEC) {
+               xasprintf(&str, "unspec port unspec");
+               return str;
+       } else if(sa->sa.sa_family == AF_UNKNOWN) {
                xasprintf(&str, "%s port %s", sa->unknown.address, sa->unknown.port);
                return str;
        }
@@ -122,8 +132,7 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
        err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port,
                                        hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
        if(err) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Error while looking up hostname: %s",
-                          gai_strerror(err));
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while looking up hostname: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
        }
 
        xasprintf(&str, "%s port %s", address, port);
@@ -218,7 +227,7 @@ void sockaddrfree(sockaddr_t *a) {
                free(a->unknown.port);
        }
 }
-       
+
 void sockaddrunmap(sockaddr_t *sa) {
        if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
                sa->in.sin_addr.s_addr = ((uint32_t *) & sa->in6.sin6_addr)[3];