X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnetutl.c;h=aefde072eb5186fcb1ce0fb9b7ac4dd66bae90f2;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=05b1f1e24252d684d6a40d052acae37138513413;hpb=248d300f1be0d5f2aae39202041699ab2b46c56b;p=meshlink

diff --git a/src/netutl.c b/src/netutl.c
index 05b1f1e2..aefde072 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,6 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -42,8 +41,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
 	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 +50,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;
@@ -92,15 +90,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);
@@ -122,8 +119,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 +214,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];