X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=275c64f796e29321a39c86d709b42056cdb2f56e;hp=c5ff5b766f5a686c6c74514eeeaf5161729694c0;hb=ad7a6f5518acee377ddcb42d727e06b483c02f81;hpb=7f3ab38c222809b15da2fe8dd655d35432eaafe0

diff --git a/src/netutl.c b/src/netutl.c
index c5ff5b76..275c64f7 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -1,6 +1,7 @@
 /*
     netutl.c -- some supporting network utility code
-    Copyright (C) 1998,1999,2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2000-2015 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
@@ -12,243 +13,288 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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.10 2000/09/15 12:58:40 zarq Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "config.h"
-
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <syslog.h>
-
-#include <utils.h>
-#include <xalloc.h>
+#include "system.h"
 
-#include "errno.h"
-#include "conf.h"
-#include "encr.h"
 #include "net.h"
 #include "netutl.h"
+#include "logger.h"
+#include "utils.h"
+#include "xalloc.h"
 
-#include "system.h"
+bool hostnames = false;
 
 /*
-  look for a connection associated with the given vpn ip,
-  return its connection structure.
-  Skips connections that are not activated!
+  Turn a string into a struct addrinfo.
+  Return NULL on failure.
 */
-conn_list_t *lookup_conn(ip_t ip)
-{
-  conn_list_t *p = conn_list;
-cp
-  /* Exact match suggested by James B. MacLean */
-  for(p = conn_list; p != NULL; p = p->next)
-    if((ip == p->vpn_ip) && p->status.active)
-      return p;
-  for(p = conn_list; p != NULL; p = p->next)
-    if(((ip & p->vpn_mask) == (p->vpn_ip & p->vpn_mask)) && p->status.active)
-      return p;
-cp
-  return NULL;
+struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
+	struct addrinfo *ai, hint = {0};
+	int err;
+
+	hint.ai_family = addressfamily;
+	hint.ai_socktype = socktype;
+
+#if HAVE_DECL_RES_INIT
+	// ensure glibc reloads /etc/resolv.conf.
+	res_init();
+#endif
+	err = getaddrinfo(address, service, &hint, &ai);
+
+	if(err) {
+		logger(LOG_WARNING, "Error looking up %s port %s: %s", address,
+				   service, gai_strerror(err));
+		return NULL;
+	}
+
+	return ai;
 }
 
-/*
-  free a queue and all of its elements
-*/
-void destroy_queue(packet_queue_t *pq)
-{
-  queue_element_t *p, *q;
-cp
-  for(p = pq->head; p != NULL; p = q)
-    {
-      q = p->next;
-      if(p->packet)
-	free(p->packet);
-      free(p);
-    }
-
-  free(pq);
-cp
+sockaddr_t str2sockaddr(const char *address, const char *port) {
+	struct addrinfo *ai, hint = {0};
+	sockaddr_t result;
+	int err;
+
+	hint.ai_family = AF_UNSPEC;
+	hint.ai_flags = AI_NUMERICHOST;
+	hint.ai_socktype = SOCK_STREAM;
+
+	err = getaddrinfo(address, port, &hint, &ai);
+
+	if(err || !ai) {
+		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;
+	}
+
+	memcpy(&result, ai->ai_addr, ai->ai_addrlen);
+	freeaddrinfo(ai);
+
+	return result;
 }
 
-/*
-  free a conn_list_t element and all its pointers
-*/
-void free_conn_element(conn_list_t *p)
-{
-cp
-  if(p->sq)
-    destroy_queue(p->sq);
-  if(p->rq)
-    destroy_queue(p->rq);
-  if(p->name)
-    free(p->name);
-  if(p->hostname)
-    free(p->hostname);
-  free_key(p->public_key);
-  free_key(p->datakey);
-  free(p);
-cp
+void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
+	char address[NI_MAXHOST];
+	char port[NI_MAXSERV];
+	char *scopeid;
+	int err;
+
+	if(sa->sa.sa_family == AF_UNKNOWN) {
+		if(addrstr)
+			*addrstr = xstrdup(sa->unknown.address);
+		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);
+
+	if(err) {
+		logger(LOG_ERR, "Error while translating addresses: %s",
+			   gai_strerror(err));
+		abort();
+	}
+
+	scopeid = strchr(address, '%');
+
+	if(scopeid)
+		*scopeid = '\0';		/* Descope. */
+
+	if(addrstr)
+		*addrstr = xstrdup(address);
+	if(portstr)
+		*portstr = xstrdup(port);
 }
 
-/*
-  remove all marked connections
-*/
-void prune_conn_list(void)
-{
-  conn_list_t *p, *prev = NULL, *next = NULL;
-cp
-  for(p = conn_list; p != NULL; )
-    {
-      next = p->next;
-
-      if(p->status.remove)
-	{
-	  if(prev)
-	    prev->next = next;
-	  else
-	    conn_list = next;
-
-	  free_conn_element(p);
+char *sockaddr2hostname(const sockaddr_t *sa) {
+	char *str;
+	char address[NI_MAXHOST] = "unknown";
+	char port[NI_MAXSERV] = "unknown";
+	int err;
+
+	if(sa->sa.sa_family == AF_UNKNOWN) {
+		xasprintf(&str, "%s port %s", sa->unknown.address, sa->unknown.port);
+		return str;
 	}
-      else
-	prev = p;
 
-      p = next;
-    }
-cp
+	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",
+			   gai_strerror(err));
+	}
+
+	xasprintf(&str, "%s port %s", address, port);
+
+	return str;
 }
 
-/*
-  creates new conn_list element, and initializes it
-*/
-conn_list_t *new_conn_list(void)
-{
-  conn_list_t *p = xmalloc(sizeof(*p));
-cp
-  /* initialise all those stupid pointers at once */
-  memset(p, '\0', sizeof(*p));
-  p->vpn_mask = (ip_t)(~0L); /* If this isn't done, it would be a
-                                wastebucket for all packets with
-                                unknown destination. */
-  p->nexthop = p;
-cp
-  return p;
+int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
+	int result;
+
+	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);
+			abort();
+	}
 }
 
-/*
-  free all elements of conn_list
-*/
-void destroy_conn_list(void)
-{
-  conn_list_t *p, *next;
-cp
-  for(p = conn_list; p != NULL; )
-    {
-      next = p->next;
-      free_conn_element(p);
-      p = next;
-    }
-
-  conn_list = NULL;
-cp
+int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
+	int result;
+
+	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:
+			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));
+
+			if(result)
+				return result;
+
+			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));
+
+			if(result)
+				return result;
+
+			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);
+			abort();
+	}
 }
 
-/*
-  look up the name associated with the ip
-  address `addr'
-*/
+void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
+	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);
+	}
+}
 
-char *hostlookup(unsigned long addr)
-{
-  char *name;
-  struct hostent *host = NULL;
-  struct in_addr in;
-  config_t const *cfg;
-  int lookup_hostname;
-cp
-  in.s_addr = addr;
-
-  lookup_hostname = 0;
-  if((cfg = get_config_val(resolve_dns)) != NULL)
-    if(cfg->data.val == stupid_true)
-      lookup_hostname = 1;
-
-  if(lookup_hostname)
-    host = gethostbyaddr((char *)&in, sizeof(in), AF_INET);
-
-  if(!lookup_hostname || !host)
-    {
-      asprintf(&name, "%s", inet_ntoa(in));
-    }
-  else
-    {
-      asprintf(&name, "%s", host->h_name);
-    }
-cp
-  return name;
+void sockaddrfree(sockaddr_t *a) {
+	if(a->sa.sa_family == AF_UNKNOWN) {
+		free(a->unknown.address);
+		free(a->unknown.port);
+	}
+}
+	
+void sockaddrunmap(sockaddr_t *sa) {
+	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;
+	}
 }
 
-/*
-  Turn a string into an IP addy with netmask
-  return NULL on failure
-*/
-ip_mask_t *strtoip(char *str)
-{
-  ip_mask_t *ip;
-  int masker;
-  char *q, *p;
-  struct hostent *h;
-cp
-  p = str;
-  if((q = strchr(p, '/')))
-    {
-      *q = '\0';
-      q++; /* q now points to netmask part, or NULL if no mask */
-    }
-
-  if(!(h = gethostbyname(p)))
-    {
-      fprintf(stderr, _("Error looking up `%s': %s\n"), p, strerror(errno));
-      return NULL;
-    }
-
-  masker = 0;
-  if(q)
-    {
-      masker = strtol(q, &p, 10);
-      if(q == p || (*p))
-	return NULL;
-    }
-
-  ip = xmalloc(sizeof(*ip));
-  ip->ip = ntohl(*((ip_t*)(h->h_addr_list[0])));
-
-  ip->mask = masker ? ~((1 << (32 - masker)) - 1) : 0;
-cp
-  return ip;
+/* Subnet mask handling */
+
+int maskcmp(const void *va, const void *vb, int masklen) {
+	int i, m, result;
+	const char *a = va;
+	const char *b = vb;
+
+	for(m = masklen, i = 0; m >= 8; m -= 8, i++) {
+		result = a[i] - b[i];
+		if(result)
+			return result;
+	}
+
+	if(m)
+		return (a[i] & (0x100 - (1 << (8 - m)))) -
+			(b[i] & (0x100 - (1 << (8 - m))));
+
+	return 0;
+}
+
+void mask(void *va, int masklen, int len) {
+	int i;
+	char *a = va;
+
+	i = masklen / 8;
+	masklen %= 8;
+
+	if(masklen)
+		a[i++] &= (0x100 - (1 << (8 - masklen)));
+
+	for(; i < len; i++)
+		a[i] = 0;
 }
 
-void dump_conn_list(void)
-{
-  conn_list_t *p;
-cp
-  syslog(LOG_DEBUG, _("Connection list:"));
-
-  for(p = conn_list; p != NULL; p = p->next)
-    {
-      syslog(LOG_DEBUG, _("%s netmask %d.%d.%d.%d at %s port %hd flags %d sockets %d, %d status %04x"),
-	     p->name, IP_ADDR_V(p->vpn_mask), p->hostname, p->port, p->flags,
-	     p->socket, p->meta_socket, p->status);
-    }
-cp
+void maskcpy(void *va, const void *vb, int masklen, int len) {
+	int i, m;
+	char *a = va;
+	const char *b = vb;
+
+	for(m = masklen, i = 0; m >= 8; m -= 8, i++)
+		a[i] = b[i];
+
+	if(m) {
+		a[i] = b[i] & (0x100 - (1 << (8 - m)));
+		i++;
+	}
+
+	for(; i < len; i++)
+		a[i] = 0;
+}
+
+bool maskcheck(const void *va, int masklen, int len) {
+	int i;
+	const char *a = va;
+
+	i = masklen / 8;
+	masklen %= 8;
+
+	if(masklen && a[i++] & (0xff >> masklen))
+		return false;
+
+	for(; i < len; i++)
+		if(a[i] != 0)
+			return false;
+
+	return true;
 }