X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fnetutl.c;h=757bc5d8052596b31584a2793363698e4db7fe97;hp=6386e4cfff0cc5bef7780b9bdebaea636814f116;hb=c23fcf555ee4b69f03b76a0ffb731c3a475a77e7;hpb=f88c9942e1e3d4d463ec71ba5a60d045381bda8f

diff --git a/src/netutl.c b/src/netutl.c
index 6386e4c..757bc5d 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-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2009 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
@@ -128,7 +128,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;
 	}
 
@@ -139,11 +139,44 @@ 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_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;
@@ -225,7 +258,7 @@ void sockaddrunmap(sockaddr_t *sa)
 
 /* Subnet mask handling */
 
-int maskcmp(const void *va, const void *vb, int masklen, int len)
+int maskcmp(const void *va, const void *vb, int masklen)
 {
 	int i, m, result;
 	const char *a = va;