X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnetutl.c;h=f4ee5aa0f123151400b9628a1a0decd3a177b6a3;hp=a55eaea21255b71a647bd61151194133ceb7eacb;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=d2b19be1a0dd3c4987aa926117f5bf281892c78b

diff --git a/src/netutl.c b/src/netutl.c
index a55eaea2..f4ee5aa0 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,7 +1,6 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -26,24 +25,23 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool hostnames = false;
-
 /*
   Turn a string into a struct addrinfo.
   Return NULL on failure.
 */
 struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
-	struct addrinfo *ai, hint = {0};
+	struct addrinfo *ai;
 	int err;
 
-	hint.ai_family = addressfamily;
-	hint.ai_socktype = socktype;
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = socktype,
+	};
 
 	err = getaddrinfo(address, service, &hint, &ai);
 
 	if(err) {
-		logger(DEBUG_ALWAYS, LOG_WARNING, "Error looking up %s port %s: %s", address,
-				   service, gai_strerror(err));
+		logger(NULL, MESHLINK_WARNING, "Error looking up %s port %s: %s", address, service, err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
 		return NULL;
 	}
 
@@ -51,18 +49,22 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
 }
 
 sockaddr_t str2sockaddr(const char *address, const char *port) {
-	struct addrinfo *ai, hint = {0};
-	sockaddr_t result = {{0}};
+	struct addrinfo *ai;
+	sockaddr_t result;
 	int err;
 
-	hint.ai_family = AF_UNSPEC;
-	hint.ai_flags = AI_NUMERICHOST;
-	hint.ai_socktype = SOCK_STREAM;
+	memset(&result, 0, sizeof(result));
+
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_flags = AI_NUMERICHOST,
+		.ai_socktype = SOCK_STREAM,
+	};
 
 	err = getaddrinfo(address, port, &hint, &ai);
 
 	if(err || !ai) {
-		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Unknown type address %s port %s", address, port);
+		logger(NULL, MESHLINK_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);
@@ -82,30 +84,37 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
 	int err;
 
 	if(sa->sa.sa_family == AF_UNKNOWN) {
-		if(addrstr)
+		if(addrstr) {
 			*addrstr = xstrdup(sa->unknown.address);
-		if(portstr)
+		}
+
+		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);
+	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
 
 	if(err) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error while translating addresses: %s",
-			   gai_strerror(err));
+		logger(NULL, MESHLINK_ERROR, "Error while translating addresses: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
 		abort();
 	}
 
 	scopeid = strchr(address, '%');
 
-	if(scopeid)
-		*scopeid = '\0'; /* Descope. */
+	if(scopeid) {
+		*scopeid = '\0';        /* Descope. */
+	}
 
-	if(addrstr)
+	if(addrstr) {
 		*addrstr = xstrdup(address);
-	if(portstr)
+	}
+
+	if(portstr) {
 		*portstr = xstrdup(port);
+	}
 }
 
 char *sockaddr2hostname(const sockaddr_t *sa) {
@@ -119,11 +128,11 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
 		return str;
 	}
 
-	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port,
-					hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
+	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
+
 	if(err) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error while looking up hostname: %s",
-			   gai_strerror(err));
+		logger(NULL, MESHLINK_ERROR, "Error while looking up hostname: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
+		abort();
 	}
 
 	xasprintf(&str, "%s port %s", address, port);
@@ -136,26 +145,27 @@ int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
 
 	result = a->sa.sa_family - b->sa.sa_family;
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
-	switch (a->sa.sa_family) {
-		case AF_UNSPEC:
-			return 0;
+	switch(a->sa.sa_family) {
+	case AF_UNSPEC:
+		return 0;
 
-		case AF_UNKNOWN:
-			return strcmp(a->unknown.address, b->unknown.address);
+	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_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));
+	case AF_INET6:
+		return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
 
-		default:
-			logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
-				   a->sa.sa_family);
-			abort();
+	default:
+		logger(NULL, MESHLINK_ERROR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+		       a->sa.sa_family);
+		abort();
 	}
 }
 
@@ -164,41 +174,45 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
 
 	result = a->sa.sa_family - b->sa.sa_family;
 
-	if(result)
+	if(result) {
 		return result;
+	}
 
-	switch (a->sa.sa_family) {
-		case AF_UNSPEC:
-			return 0;
+	switch(a->sa.sa_family) {
+	case AF_UNSPEC:
+		return 0;
 
-		case AF_UNKNOWN:
-			result = strcmp(a->unknown.address, b->unknown.address);
+	case AF_UNKNOWN:
+		result = strcmp(a->unknown.address, b->unknown.address);
 
-			if(result)
-				return result;
+		if(result) {
+			return result;
+		}
 
-			return strcmp(a->unknown.port, b->unknown.port);
+		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);
+	case AF_INET:
+		result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a)->in.sin_addr);
 
-			if(result)
-				return result;
+		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);
+	case AF_INET6:
+		result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a)->in6.sin6_addr);
 
-			if(result)
-				return result;
+		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(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
-				   a->sa.sa_family);
-			abort();
+	default:
+		logger(NULL, MESHLINK_ERROR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+		       a->sa.sa_family);
+		abort();
 	}
 }
 
@@ -212,6 +226,23 @@ void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
 	}
 }
 
+void sockaddrcpy_setport(sockaddr_t *a, const sockaddr_t *b, uint16_t port) {
+	sockaddrcpy(a, b);
+
+	switch(b->sa.sa_family) {
+	case AF_INET:
+		a->in.sin_port = htons(port);
+		break;
+
+	case AF_INET6:
+		a->in6.sin6_port = htons(port);
+		break;
+
+	default:
+		break;
+	}
+}
+
 void sockaddrfree(sockaddr_t *a) {
 	if(a->sa.sa_family == AF_UNKNOWN) {
 		free(a->unknown.address);
@@ -225,3 +256,65 @@ void sockaddrunmap(sockaddr_t *sa) {
 		sa->in.sin_family = AF_INET;
 	}
 }
+
+void packmsg_add_sockaddr(packmsg_output_t *out, const sockaddr_t *sa) {
+	switch(sa->sa.sa_family) {
+	case AF_INET: {
+		uint8_t buf[6];
+		memcpy(buf + 0, &sa->in.sin_port, 2);
+		memcpy(buf + 2, &sa->in.sin_addr, 4);
+		packmsg_add_ext(out, 4, buf, sizeof(buf));
+		break;
+	}
+
+	case AF_INET6: {
+		uint8_t buf[18];
+		memcpy(buf + 0, &sa->in6.sin6_port, 2);
+		memcpy(buf + 2, &sa->in6.sin6_addr, 16);
+		packmsg_add_ext(out, 6, buf, sizeof(buf));
+		break;
+	}
+
+	default:
+		packmsg_output_invalidate(out);
+		break;
+	}
+}
+
+sockaddr_t packmsg_get_sockaddr(packmsg_input_t *in) {
+	sockaddr_t sa = {0};
+
+	int8_t type;
+	const void *data;
+	uint32_t len = packmsg_get_ext_raw(in, &type, &data);
+
+	switch(type) {
+	case 4:
+		if(len != 6) {
+			packmsg_input_invalidate(in);
+			return sa;
+		}
+
+		sa.sa.sa_family = AF_INET;
+		memcpy(&sa.in.sin_port, (uint8_t *)data + 0, 2);
+		memcpy(&sa.in.sin_addr, (uint8_t *)data + 2, 4);
+		break;
+
+	case 6:
+		if(len != 18) {
+			packmsg_input_invalidate(in);
+			return sa;
+		}
+
+		sa.sa.sa_family = AF_INET6;
+		memcpy(&sa.in6.sin6_port, (uint8_t *)data + 0, 2);
+		memcpy(&sa.in6.sin6_addr, (uint8_t *)data + 2, 16);
+		break;
+
+	default:
+		packmsg_input_invalidate(in);
+		return sa;
+	}
+
+	return sa;
+}