Releasing 1.0.29.

[tinc] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index b8ecdd1..e473f17 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-2016 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
@@ -33,12 +33,16 @@ bool hostnames = false;
   Return NULL on failure.
 */
 struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
-       struct addrinfo *ai, hint = {0};
+       struct addrinfo *ai = NULL, hint = {0};
        int err;
 
        hint.ai_family = addressfamily;
        hint.ai_socktype = socktype;
 
+#if HAVE_DECL_RES_INIT
+       // ensure glibc reloads /etc/resolv.conf.
+       res_init();
+#endif
        err = getaddrinfo(address, service, &hint, &ai);
 
        if(err) {
@@ -51,7 +55,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};
+       struct addrinfo *ai = NULL, hint = {0};
        sockaddr_t result;
        int err;
 
@@ -83,8 +87,10 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
        int err;
 
        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;
        }
 
@@ -93,8 +99,7 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
        if(err) {
                logger(LOG_ERR, "Error while translating addresses: %s",
                           gai_strerror(err));
-               raise(SIGFPE);
-               exit(0);
+               abort();
        }
 
        scopeid = strchr(address, '%');
@@ -102,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) {
@@ -153,8 +160,7 @@ int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
                default:
                        logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
                                   a->sa.sa_family);
-                       raise(SIGFPE);
-                       exit(0);
+                       abort();
        }
 }
 
@@ -197,8 +203,7 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
                default:
                        logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
                                   a->sa.sa_family);
-                       raise(SIGFPE);
-                       exit(0);
+                       abort();
        }
 }
 
@@ -226,6 +231,25 @@ void sockaddrunmap(sockaddr_t *sa) {
        }
 }
 
+void sockaddr_setport(sockaddr_t *sa, const char *port) {
+       uint16_t portnum = htons(atoi(port));
+       if(!portnum)
+               return;
+       switch(sa->sa.sa_family) {
+               case AF_INET:
+                       sa->in.sin_port = portnum;
+                       break;
+               case AF_INET6:
+                       sa->in6.sin6_port = portnum;
+                       break;
+               case AF_UNKNOWN:
+                       free(sa->unknown.port);
+                       sa->unknown.port = xstrdup(port);
+               default:
+                       return;
+       }
+}
+
 /* Subnet mask handling */
 
 int maskcmp(const void *va, const void *vb, int masklen) {