X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=6e8ad07f9da31b909e927017d0d7ed97a019ba92;hp=9547829fa74b7563478c9f04fe1828282ae81b37;hb=8fce1eacd7fd7496a740be3ffc236fde37c681d7;hpb=78fc59e994c764d072bf0045177f690a378d1308

diff --git a/src/subnet.c b/src/subnet.c
index 9547829f..6e8ad07f 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,6 +1,6 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -13,11 +13,9 @@
     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$
+    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 "system.h"
@@ -49,15 +47,20 @@ static subnet_t *cache_ipv6_subnet[2];
 static bool cache_ipv6_valid[2];
 static int cache_ipv6_slot;
 
-void subnet_cache_flush() {
+static mac_t cache_mac_address[2];
+static subnet_t *cache_mac_subnet[2];
+static bool cache_mac_valid[2];
+static int cache_mac_slot;
+
+void subnet_cache_flush(void) {
 	cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
 	cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
+	cache_mac_valid[0] = cache_mac_valid[1] = false;
 }
 
 /* Subnet comparison */
 
-static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
 	int result;
 
 	result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
@@ -73,8 +76,7 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) {
 	int result;
 
 	result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
@@ -95,8 +97,7 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) {
 	int result;
 
 	result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
@@ -117,8 +118,7 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
 	return strcmp(a->owner->name, b->owner->name);
 }
 
-int subnet_compare(const subnet_t *a, const subnet_t *b)
-{
+int subnet_compare(const subnet_t *a, const subnet_t *b) {
 	int result;
 
 	result = a->type - b->type;
@@ -134,9 +134,8 @@ int subnet_compare(const subnet_t *a, const subnet_t *b)
 	case SUBNET_IPV6:
 		return subnet_compare_ipv6(a, b);
 	default:
-		logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"),
+		logger(LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!",
 			   a->type);
-		cp_trace();
 		exit(0);
 	}
 
@@ -145,58 +144,37 @@ int subnet_compare(const subnet_t *a, const subnet_t *b)
 
 /* Initialising trees */
 
-void init_subnets(void)
-{
-	cp();
-
+void init_subnets(void) {
 	subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
 
 	subnet_cache_flush();
 }
 
-void exit_subnets(void)
-{
-	cp();
-
+void exit_subnets(void) {
 	avl_delete_tree(subnet_tree);
 }
 
-avl_tree_t *new_subnet_tree(void)
-{
-	cp();
-
+avl_tree_t *new_subnet_tree(void) {
 	return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(avl_tree_t *subnet_tree)
-{
-	cp();
-
+void free_subnet_tree(avl_tree_t *subnet_tree) {
 	avl_delete_tree(subnet_tree);
 }
 
 /* Allocating and freeing space for subnets */
 
-subnet_t *new_subnet(void)
-{
-	cp();
-
+subnet_t *new_subnet(void) {
 	return xmalloc_and_zero(sizeof(subnet_t));
 }
 
-void free_subnet(subnet_t *subnet)
-{
-	cp();
-
+void free_subnet(subnet_t *subnet) {
 	free(subnet);
 }
 
 /* Adding and removing subnets */
 
-void subnet_add(node_t *n, subnet_t *subnet)
-{
-	cp();
-
+void subnet_add(node_t *n, subnet_t *subnet) {
 	subnet->owner = n;
 
 	avl_insert(subnet_tree, subnet);
@@ -205,10 +183,7 @@ void subnet_add(node_t *n, subnet_t *subnet)
 	subnet_cache_flush();
 }
 
-void subnet_del(node_t *n, subnet_t *subnet)
-{
-	cp();
-
+void subnet_del(node_t *n, subnet_t *subnet) {
 	avl_delete(n->subnet_tree, subnet);
 	avl_delete(subnet_tree, subnet);
 
@@ -217,14 +192,11 @@ void subnet_del(node_t *n, subnet_t *subnet)
 
 /* Ascii representation of subnets */
 
-bool str2net(subnet_t *subnet, const char *subnetstr)
-{
+bool str2net(subnet_t *subnet, const char *subnetstr) {
 	int i, l;
 	uint16_t x[8];
 	int weight = 10;
 
-	cp();
-
 	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d",
 			  &x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) {
 		if(l < 0 || l > 32)
@@ -296,21 +268,90 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 		return true;
 	}
 
+	// IPv6 short form
+	if(strstr(subnetstr, "::")) {
+		const char *p;
+		char *q;
+		int colons = 0;
+
+		// Count number of colons
+		for(p = subnetstr; *p; p++)
+			if(*p == ':')
+				colons++;
+
+		if(colons > 7)
+			return false;
+
+		// Scan numbers before the double colon
+		p = subnetstr;
+		for(i = 0; i < colons; i++) {
+			if(*p == ':')
+				break;
+			x[i] = strtoul(p, &q, 0x10);
+			if(!q || p == q || *q != ':')
+				return false;
+			p = ++q;
+		}
+
+		p++;
+		colons -= i;
+		if(!i) {
+			p++;
+			colons--;
+		}
+
+		if(!*p || *p == '/' || *p == '#')
+			colons--;
+
+		// Fill in the blanks
+		for(; i < 8 - colons; i++)
+			x[i] = 0;
+
+		// Scan the remaining numbers
+		for(; i < 8; i++) {
+			x[i] = strtoul(p, &q, 0x10);
+			if(!q || p == q)
+				return false;
+			if(i == 7) {
+				p = q;
+				break;
+			}
+			if(*q != ':')
+				return false;
+			p = ++q;
+		}
+
+		l = 128;
+		if(*p == '/')
+			sscanf(p, "/%d#%d", &l, &weight);
+		else if(*p == '#')
+			sscanf(p, "#%d", &weight);
+
+		if(l < 0 || l > 128)
+			return false;
+
+		subnet->type = SUBNET_IPV6;
+		subnet->net.ipv6.prefixlength = l;
+		subnet->weight = weight;
+
+		for(i = 0; i < 8; i++)
+			subnet->net.ipv6.address.x[i] = htons(x[i]);
+
+		return true;
+	}
+
 	return false;
 }
 
-bool net2str(char *netstr, int len, const subnet_t *subnet)
-{
-	cp();
-
+bool net2str(char *netstr, int len, const subnet_t *subnet) {
 	if(!netstr || !subnet) {
-		logger(LOG_ERR, _("net2str() was called with netstr=%p, subnet=%p!\n"), netstr, subnet);
+		logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet);
 		return false;
 	}
 
 	switch (subnet->type) {
 		case SUBNET_MAC:
-			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
+			snprintf(netstr, len, "%x:%x:%x:%x:%x:%x#%d",
 					 subnet->net.mac.address.x[0],
 					 subnet->net.mac.address.x[1],
 					 subnet->net.mac.address.x[2],
@@ -321,7 +362,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 			break;
 
 		case SUBNET_IPV4:
-			snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%d",
+			snprintf(netstr, len, "%u.%u.%u.%u/%d#%d",
 					 subnet->net.ipv4.address.x[0],
 					 subnet->net.ipv4.address.x[1],
 					 subnet->net.ipv4.address.x[2],
@@ -331,7 +372,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 			break;
 
 		case SUBNET_IPV6:
-			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
+			snprintf(netstr, len, "%x:%x:%x:%x:%x:%x:%x:%x/%d#%d",
 					 ntohs(subnet->net.ipv6.address.x[0]),
 					 ntohs(subnet->net.ipv6.address.x[1]),
 					 ntohs(subnet->net.ipv6.address.x[2]),
@@ -346,9 +387,8 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 
 		default:
 			logger(LOG_ERR,
-				   _("net2str() was called with unknown subnet type %d, exiting!"),
+				   "net2str() was called with unknown subnet type %d, exiting!",
 				   subnet->type);
-			cp_trace();
 			exit(0);
 	}
 
@@ -357,36 +397,56 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 
 /* Subnet lookup routines */
 
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
-{
-	cp();
-
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
 	return avl_search(owner->subnet_tree, subnet);
 }
 
-subnet_t *lookup_subnet_mac(const mac_t *address)
-{
-	subnet_t *p, subnet = {0};
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
+	subnet_t *p, *r = NULL;
+	avl_node_t *n;
+	int i;
+
+	// Check if this address is cached
 
-	cp();
+	for(i = 0; i < 2; i++) {
+		if(!cache_mac_valid[i])
+			continue;
+		if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner)
+			continue;
+		if(!memcmp(address, &cache_mac_address[i], sizeof *address))
+			return cache_mac_subnet[i];
+	}
+
+	// Search all subnets for a matching one
+
+	for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
+		p = n->data;
+		
+		if(!p || p->type != SUBNET_MAC)
+			continue;
+
+		if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+			r = p;
+			if(p->owner->status.reachable)
+				break;
+		}
+	}
 
-	subnet.type = SUBNET_MAC;
-	subnet.net.mac.address = *address;
-	subnet.owner = NULL;
+	// Cache the result
 
-	p = avl_search(subnet_tree, &subnet);
+	cache_mac_slot = !cache_mac_slot;
+	memcpy(&cache_mac_address[cache_mac_slot], address, sizeof *address);
+	cache_mac_subnet[cache_mac_slot] = r;
+	cache_mac_valid[cache_mac_slot] = true;
 
-	return p;
+	return r;
 }
 
-subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
-{
-	subnet_t *p, *r = NULL, subnet = {0};
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
+	subnet_t *p, *r = NULL;
 	avl_node_t *n;
 	int i;
 
-	cp();
-
 	// Check if this address is cached
 
 	for(i = 0; i < 2; i++) {
@@ -398,15 +458,10 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 
 	// Search all subnets for a matching one
 
-	subnet.type = SUBNET_IPV4;
-	subnet.net.ipv4.address = *address;
-	subnet.net.ipv4.prefixlength = 32;
-	subnet.owner = NULL;
-
 	for(n = subnet_tree->head; n; n = n->next) {
 		p = n->data;
 		
-		if(!p || p->type != subnet.type)
+		if(!p || p->type != SUBNET_IPV4)
 			continue;
 
 		if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
@@ -426,14 +481,11 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 	return r;
 }
 
-subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
-{
-	subnet_t *p, *r = NULL, subnet = {0};
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
+	subnet_t *p, *r = NULL;
 	avl_node_t *n;
 	int i;
 
-	cp();
-
 	// Check if this address is cached
 
 	for(i = 0; i < 2; i++) {
@@ -445,15 +497,10 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 
 	// Search all subnets for a matching one
 
-	subnet.type = SUBNET_IPV6;
-	subnet.net.ipv6.address = *address;
-	subnet.net.ipv6.prefixlength = 128;
-	subnet.owner = NULL;
-
 	for(n = subnet_tree->head; n; n = n->next) {
 		p = n->data;
 		
-		if(!p || p->type != subnet.type)
+		if(!p || p->type != SUBNET_IPV6)
 			continue;
 
 		if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
@@ -476,65 +523,87 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 	avl_node_t *node;
 	int i;
-	char *envp[8];
-	char netstr[MAXNETSTR + 7] = "SUBNET=";
+	char *envp[10] = {NULL};
+	char netstr[MAXNETSTR];
 	char *name, *address, *port;
+	char empty[] = "";
+
+	// Prepare environment variables to be passed to the script
 
-	asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	asprintf(&envp[1], "DEVICE=%s", device ? : "");
-	asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-	asprintf(&envp[3], "NODE=%s", owner->name);
+	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
+	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
+	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+	xasprintf(&envp[3], "NODE=%s", owner->name);
 
 	if(owner != myself) {
 		sockaddr2str(&owner->address, &address, &port);
-		asprintf(&envp[4], "REMOTEADDRESS=%s", address);
-		asprintf(&envp[5], "REMOTEPORT=%s", port);
-		envp[6] = netstr;
-		envp[7] = NULL;
-	} else {
-		envp[4] = netstr;
-		envp[5] = NULL;
+		// 4 and 5 are reserved for SUBNET and WEIGHT
+		xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
+		xasprintf(&envp[7], "REMOTEPORT=%s", port);
+		free(port);
+		free(address);
 	}
 
+	xasprintf(&envp[8], "NAME=%s", myself->name);
+
 	name = up ? "subnet-up" : "subnet-down";
 
 	if(!subnet) {
 		for(node = owner->subnet_tree->head; node; node = node->next) {
 			subnet = node->data;
-			if(!net2str(netstr + 7, sizeof netstr - 7, subnet))
+			if(!net2str(netstr, sizeof netstr, subnet))
 				continue;
+			// Strip the weight from the subnet, and put it in its own environment variable
+			char *weight = strchr(netstr, '#');
+			if(weight)
+				*weight++ = 0;
+			else
+				weight = empty;
+
+			// Prepare the SUBNET and WEIGHT variables
+			if(envp[4])
+				free(envp[4]);
+			if(envp[5])
+				free(envp[5]);
+			xasprintf(&envp[4], "SUBNET=%s", netstr);
+			xasprintf(&envp[5], "WEIGHT=%s", weight);
+
 			execute_script(name, envp);
 		}
 	} else {
-		if(net2str(netstr + 7, sizeof netstr - 7, subnet))
+		if(net2str(netstr, sizeof netstr, subnet)) {
+			// Strip the weight from the subnet, and put it in its own environment variable
+			char *weight = strchr(netstr, '#');
+			if(weight)
+				*weight++ = 0;
+			else
+				weight = empty;
+
+			// Prepare the SUBNET and WEIGHT variables
+			xasprintf(&envp[4], "SUBNET=%s", netstr);
+			xasprintf(&envp[5], "WEIGHT=%s", weight);
+
 			execute_script(name, envp);
+		}
 	}
 
-	for(i = 0; i < (owner != myself ? 6 : 4); i++)
+	for(i = 0; envp[i] && i < 9; i++)
 		free(envp[i]);
-
-	if(owner != myself) {
-		free(address);
-		free(port);
-	}
 }
 
-void dump_subnets(void)
-{
+void dump_subnets(void) {
 	char netstr[MAXNETSTR];
 	subnet_t *subnet;
 	avl_node_t *node;
 
-	cp();
-
-	logger(LOG_DEBUG, _("Subnet list:"));
+	logger(LOG_DEBUG, "Subnet list:");
 
 	for(node = subnet_tree->head; node; node = node->next) {
 		subnet = node->data;
 		if(!net2str(netstr, sizeof netstr, subnet))
 			continue;
-		logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
+		logger(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
 	}
 
-	logger(LOG_DEBUG, _("End of subnet list."));
+	logger(LOG_DEBUG, "End of subnet list.");
 }