Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index c57b24ff1e2dd86a554b24e63187b3885ca0a164..340a2da9641d706ee2152c5b1c681e4a05f6bcdf 100644 (file)
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -42,7 +42,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
        err = getaddrinfo(address, service, &hint, &ai);
 
        if(err) {
-               logger(LOG_WARNING, "Error looking up %s port %s: %s", address,
+               logger(DEBUG_ALWAYS, LOG_WARNING, "Error looking up %s port %s: %s", address,
                                   service, gai_strerror(err));
                return NULL;
        }
@@ -62,8 +62,7 @@ sockaddr_t str2sockaddr(const char *address, const char *port) {
        err = getaddrinfo(address, port, &hint, &ai);
 
        if(err || !ai) {
-               ifdebug(SCARY_THINGS)
-                       logger(LOG_DEBUG, "Unknown type address %s port %s", address, port);
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Unknown type address %s port %s", address, port);
                result.sa.sa_family = AF_UNKNOWN;
                result.unknown.address = xstrdup(address);
                result.unknown.port = xstrdup(port);
@@ -90,10 +89,10 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
                return;
        }
 
-       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
+       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port, NI_NUMERICHOST | NI_NUMERICSERV);
 
        if(err) {
-               logger(LOG_ERR, "Error while translating addresses: %s",
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while translating addresses: %s",
                           gai_strerror(err));
                abort();
        }
@@ -120,10 +119,10 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
                return str;
        }
 
-       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
+       err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port,
                                        hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
        if(err) {
-               logger(LOG_ERR, "Error while looking up hostname: %s",
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error while looking up hostname: %s",
                           gai_strerror(err));
        }
 
@@ -154,7 +153,7 @@ int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
                        return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
 
                default:
-                       logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+                       logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
                                   a->sa.sa_family);
                        abort();
        }
@@ -181,23 +180,23 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
                        return strcmp(a->unknown.port, b->unknown.port);
 
                case AF_INET:
-                       result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+                       result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof a->in.sin_addr);
 
                        if(result)
                                return result;
 
-                       return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof(a->in.sin_port));
+                       return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof a->in.sin_port);
 
                case AF_INET6:
-                       result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
+                       result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof a->in6.sin6_addr);
 
                        if(result)
                                return result;
 
-                       return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
+                       return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof a->in6.sin6_port);
 
                default:
-                       logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+                       logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
                                   a->sa.sa_family);
                        abort();
        }