X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnetutl.c;h=340a2da9641d706ee2152c5b1c681e4a05f6bcdf;hp=8db252dd134c900933ed0a23fd897dace44084b4;hb=19be9cf7150858311f7898fa3fb525d692d02f64;hpb=79e9a4f743b7b59fed968575f6b36171cf4a0063

diff --git a/src/netutl.c b/src/netutl.c
index 8db252dd..340a2da9 100644
--- 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);
@@ -83,15 +82,17 @@ 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;
 	}
 
 	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();
 	}
@@ -121,7 +122,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(LOG_ERR, "Error while looking up hostname: %s",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while looking up hostname: %s",
 			   gai_strerror(err));
 	}
 
@@ -152,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();
 	}
@@ -195,7 +196,7 @@ 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(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
 				   a->sa.sa_family);
 			abort();
 	}