Always call res_init() before getaddrinfo().

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 9872480..fc3cdc9 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-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2011 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
@@ -36,15 +36,17 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
        struct addrinfo *ai, hint = {0};
        int err;
 
-       cp();
-
        hint.ai_family = addressfamily;
        hint.ai_socktype = socktype;
 
+#ifdef HAVE_DECL_RES_INIT
+       // ensure glibc reloads /etc/resolv.conf.
+       res_init();
+#endif
        err = getaddrinfo(address, service, &hint, &ai);
 
        if(err) {
-               logger(LOG_WARNING, _("Error looking up %s port %s: %s"), address,
+               logger(LOG_WARNING, "Error looking up %s port %s: %s", address,
                                   service, gai_strerror(err));
                return NULL;
        }
@@ -57,8 +59,6 @@ sockaddr_t str2sockaddr(const char *address, const char *port) {
        sockaddr_t result;
        int err;
 
-       cp();
-
        hint.ai_family = AF_UNSPEC;
        hint.ai_flags = AI_NUMERICHOST;
        hint.ai_socktype = SOCK_STREAM;
@@ -86,22 +86,20 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
        char *scopeid;
        int err;
 
-       cp();
-
        if(sa->sa.sa_family == AF_UNKNOWN) {
-               *addrstr = xstrdup(sa->unknown.address);
-               *portstr = xstrdup(sa->unknown.port);
+               if(addrstr)
+                       *addrstr = xstrdup(sa->unknown.address);
+               if(portstr)
+                       *portstr = xstrdup(sa->unknown.port);
                return;
        }
 
        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(LOG_ERR, "Error while translating addresses: %s",
                           gai_strerror(err));
-               cp_trace();
-               raise(SIGFPE);
-               exit(0);
+               abort();
        }
 
        scopeid = strchr(address, '%');
@@ -109,8 +107,10 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
        if(scopeid)
                *scopeid = '\0';                /* Descope. */
 
-       *addrstr = xstrdup(address);
-       *portstr = xstrdup(port);
+       if(addrstr)
+               *addrstr = xstrdup(address);
+       if(portstr)
+               *portstr = xstrdup(port);
 }
 
 char *sockaddr2hostname(const sockaddr_t *sa) {
@@ -119,21 +119,19 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
        char port[NI_MAXSERV] = "unknown";
        int err;
 
-       cp();
-
        if(sa->sa.sa_family == AF_UNKNOWN) {
-               xasprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port);
+               xasprintf(&str, "%s port %s", sa->unknown.address, sa->unknown.port);
                return str;
        }
 
        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(LOG_ERR, "Error while looking up hostname: %s",
                           gai_strerror(err));
        }
 
-       xasprintf(&str, _("%s port %s"), address, port);
+       xasprintf(&str, "%s port %s", address, port);
 
        return str;
 }
@@ -141,8 +139,6 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
 int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
        int result;
 
-       cp();
-
        result = a->sa.sa_family - b->sa.sa_family;
 
        if(result)
@@ -162,19 +158,15 @@ 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(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
                                   a->sa.sa_family);
-                       cp_trace();
-                       raise(SIGFPE);
-                       exit(0);
+                       abort();
        }
 }
 
 int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
        int result;
 
-       cp();
-
        result = a->sa.sa_family - b->sa.sa_family;
 
        if(result)
@@ -209,17 +201,13 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
                        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(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
                                   a->sa.sa_family);
-                       cp_trace();
-                       raise(SIGFPE);
-                       exit(0);
+                       abort();
        }
 }
 
 void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
-       cp();
-
        if(b->sa.sa_family != AF_UNKNOWN) {
                *a = *b;
        } else {
@@ -230,8 +218,6 @@ void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
 }
 
 void sockaddrfree(sockaddr_t *a) {
-       cp();
-
        if(a->sa.sa_family == AF_UNKNOWN) {
                free(a->unknown.address);
                free(a->unknown.port);
@@ -239,8 +225,6 @@ void sockaddrfree(sockaddr_t *a) {
 }
        
 void sockaddrunmap(sockaddr_t *sa) {
-       cp();
-
        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];
                sa->in.sin_family = AF_INET;
@@ -254,8 +238,6 @@ int maskcmp(const void *va, const void *vb, int masklen) {
        const char *a = va;
        const char *b = vb;
 
-       cp();
-
        for(m = masklen, i = 0; m >= 8; m -= 8, i++) {
                result = a[i] - b[i];
                if(result)
@@ -273,8 +255,6 @@ void mask(void *va, int masklen, int len) {
        int i;
        char *a = va;
 
-       cp();
-
        i = masklen / 8;
        masklen %= 8;
 
@@ -290,8 +270,6 @@ void maskcpy(void *va, const void *vb, int masklen, int len) {
        char *a = va;
        const char *b = vb;
 
-       cp();
-
        for(m = masklen, i = 0; m >= 8; m -= 8, i++)
                a[i] = b[i];
 
@@ -308,8 +286,6 @@ bool maskcheck(const void *va, int masklen, int len) {
        int i;
        const char *a = va;
 
-       cp();
-
        i = masklen / 8;
        masklen %= 8;