X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=c12ed93cc9eb159654709e51ad9932aecda8c3dd;hp=cd50792feafed8502b4c36ca9ce127419c80e452;hb=22dd23b650eb9b760bc68ab3a9227caf3b449140;hpb=83263b74460656ba557fd9bb84dc27258549e9cd

diff --git a/src/netutl.c b/src/netutl.c
index cd50792f..c12ed93c 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: netutl.c,v 1.12.4.49 2003/07/24 12:08:15 guus Exp $
+    $Id: netutl.c,v 1.12.4.54 2003/08/22 15:03:59 guus Exp $
 */
 
 #include "system.h"
@@ -36,20 +36,18 @@ bool hostnames = false;
 */
 struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype)
 {
-	struct addrinfo hint, *ai;
+	struct addrinfo *ai, hint = {0};
 	int err;
 
 	cp();
 
-	memset(&hint, 0, sizeof(hint));
-
 	hint.ai_family = addressfamily;
 	hint.ai_socktype = socktype;
 
 	err = getaddrinfo(address, service, &hint, &ai);
 
 	if(err) {
-		logger(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
+		logger(LOG_WARNING, _("Error looking up %s port %s: %s"), address,
 				   service, gai_strerror(err));
 		return NULL;
 	}
@@ -59,14 +57,12 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
 
 sockaddr_t str2sockaddr(const char *address, const char *port)
 {
-	struct addrinfo hint, *ai;
+	struct addrinfo *ai, hint = {0};
 	sockaddr_t result;
 	int err;
 
 	cp();
 
-	memset(&hint, 0, sizeof(hint));
-
 	hint.ai_family = AF_UNSPEC;
 	hint.ai_flags = AI_NUMERICHOST;
 	hint.ai_socktype = SOCK_STREAM;
@@ -74,11 +70,12 @@ sockaddr_t str2sockaddr(const char *address, const char *port)
 	err = getaddrinfo(address, port, &hint, &ai);
 
 	if(err || !ai) {
-		logger(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
-			   gai_strerror(err));
-		cp_trace();
-		raise(SIGFPE);
-		exit(0);
+		ifdebug(SCARY_THINGS)
+			logger(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);
+		return result;
 	}
 
 	result = *(sockaddr_t *) ai->ai_addr;
@@ -96,6 +93,12 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
 
 	cp();
 
+	if(sa->sa.sa_family == AF_UNKNOWN) {
+		*addrstr = xstrdup(sa->unknown.address);
+		*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) {
@@ -124,6 +127,11 @@ 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);
+		return str;
+	}
+
 	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
 					hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
 	if(err) {
@@ -151,6 +159,14 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
 		case AF_UNSPEC:
 			return 0;
 
+		case AF_UNKNOWN:
+			result = strcmp(a->unknown.address, b->unknown.address);
+
+			if(result)
+				return result;
+
+			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));
 
@@ -176,8 +192,31 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
 	}
 }
 
+void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
+	cp();
+
+	if(b->sa.sa_family != AF_UNKNOWN) {
+		*a = *b;
+	} else {
+		a->unknown.family = AF_UNKNOWN;
+		a->unknown.address = xstrdup(b->unknown.address);
+		a->unknown.port = xstrdup(b->unknown.port);
+	}
+}
+
+void sockaddrfree(sockaddr_t *a) {
+	cp();
+
+	if(a->sa.sa_family == AF_UNKNOWN) {
+		free(a->unknown.address);
+		free(a->unknown.port);
+	}
+}
+	
 void sockaddrunmap(sockaddr_t *sa)
 {
+	cp();
+
 	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];
 		sa->in.sin_family = AF_INET;