X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnetutl.c;h=8db252dd134c900933ed0a23fd897dace44084b4;hb=79e9a4f743b7b59fed968575f6b36171cf4a0063;hp=b8ecdd1e9ea19b4c9b365ac3e847960cdea2cc3e;hpb=4c85542894f7fca823b119b05e07179deb24229a;p=tinc

diff --git a/src/netutl.c b/src/netutl.c
index b8ecdd1e..8db252dd 100644
--- 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
@@ -88,13 +88,12 @@ 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",
 			   gai_strerror(err));
-		raise(SIGFPE);
-		exit(0);
+		abort();
 	}
 
 	scopeid = strchr(address, '%');
@@ -102,8 +101,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) {
@@ -117,7 +118,7 @@ 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",
@@ -153,8 +154,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();
 	}
 }
 
@@ -179,26 +179,25 @@ 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!",
 				   a->sa.sa_family);
-			raise(SIGFPE);
-			exit(0);
+			abort();
 	}
 }