X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnetutl.c;h=480b716b5073dd23e84404cbfd5be385d08f9ba7;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=116d858d41f194ac53599d9803fbbc26b6229d80;hpb=636200d1a2024982fe5b3062153daa72a8253015;p=tinc

diff --git a/src/netutl.c b/src/netutl.c
index 116d858d..480b716b 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -124,7 +124,7 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
 	cp();
 
 	if(sa->sa.sa_family == AF_UNKNOWN) {
-		asprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port);
+		xasprintf(&str, _("%s port %s"), sa->unknown.address, sa->unknown.port);
 		return str;
 	}
 
@@ -135,12 +135,46 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
 			   gai_strerror(err));
 	}
 
-	asprintf(&str, _("%s port %s"), address, port);
+	xasprintf(&str, _("%s port %s"), address, port);
 
 	return str;
 }
 
-int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
+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)
+		return result;
+
+	switch (a->sa.sa_family) {
+		case AF_UNSPEC:
+			return 0;
+
+		case AF_UNKNOWN:
+			return strcmp(a->unknown.address, b->unknown.address);
+
+		case AF_INET:
+			return memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+
+		case AF_INET6:
+			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!"),
+				   a->sa.sa_family);
+			cp_trace();
+			raise(SIGFPE);
+			exit(0);
+	}
+}
+
+int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
+{
 	int result;
 
 	cp();