X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=090a62bfe74236e4d7289e366d0a063f25f3630e;hp=1cb816390465fda49cc0bf762ee645f05d50167a;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf

diff --git a/src/subnet.c b/src/subnet.c
index 1cb81639..090a62bf 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-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -21,12 +21,15 @@
 #include "system.h"
 
 #include "splay_tree.h"
+#include "control_common.h"
 #include "device.h"
+#include "hash.h"
 #include "logger.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
-#include "process.h"
+#include "script.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
@@ -37,103 +40,14 @@ splay_tree_t *subnet_tree;
 
 /* Subnet lookup cache */
 
-static ipv4_t cache_ipv4_address[2];
-static subnet_t *cache_ipv4_subnet[2];
-static bool cache_ipv4_valid[2];
-static int cache_ipv4_slot;
+static hash_t *ipv4_cache;
+static hash_t *ipv6_cache;
+static hash_t *mac_cache;
 
-static ipv6_t cache_ipv6_address[2];
-static subnet_t *cache_ipv6_subnet[2];
-static bool cache_ipv6_valid[2];
-static int cache_ipv6_slot;
-
-void subnet_cache_flush() {
-	cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
-	cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
-}
-
-/* Subnet comparison */
-
-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 a->net.mac.address);
-
-	if(result)
-		return result;
-	
-	result = a->weight - b->weight;
-
-	if(result || !a->owner || !b->owner)
-		return result;
-
-	return strcmp(a->owner->name, b->owner->name);
-}
-
-static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) {
-	int result;
-
-	result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
-
-	if(result)
-		return result;
-
-	result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
-
-	if(result)
-		return result;
-	
-	result = a->weight - b->weight;
-
-	if(result || !a->owner || !b->owner)
-		return result;
-
-	return strcmp(a->owner->name, b->owner->name);
-}
-
-static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) {
-	int result;
-
-	result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
-
-	if(result)
-		return result;
-	
-	result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
-
-	if(result)
-		return result;
-	
-	result = a->weight - b->weight;
-
-	if(result || !a->owner || !b->owner)
-		return result;
-
-	return strcmp(a->owner->name, b->owner->name);
-}
-
-int subnet_compare(const subnet_t *a, const subnet_t *b) {
-	int result;
-
-	result = a->type - b->type;
-
-	if(result)
-		return result;
-
-	switch (a->type) {
-	case SUBNET_MAC:
-		return subnet_compare_mac(a, b);
-	case SUBNET_IPV4:
-		return subnet_compare_ipv4(a, b);
-	case SUBNET_IPV6:
-		return subnet_compare_ipv6(a, b);
-	default:
-		logger(LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!",
-			   a->type);
-		exit(0);
-	}
-
-	return 0;
+void subnet_cache_flush(void) {
+	hash_clear(ipv4_cache);
+	hash_clear(ipv6_cache);
+	hash_clear(mac_cache);
 }
 
 /* Initialising trees */
@@ -141,11 +55,17 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
 void init_subnets(void) {
 	subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
 
-	subnet_cache_flush();
+	ipv4_cache = hash_alloc(0x100, sizeof(ipv4_t));
+	ipv6_cache = hash_alloc(0x100, sizeof(ipv6_t));
+	mac_cache = hash_alloc(0x100, sizeof(mac_t));
 }
 
 void exit_subnets(void) {
 	splay_delete_tree(subnet_tree);
+
+	hash_free(ipv4_cache);
+	hash_free(ipv6_cache);
+	hash_free(mac_cache);
 }
 
 splay_tree_t *new_subnet_tree(void) {
@@ -159,7 +79,7 @@ void free_subnet_tree(splay_tree_t *subnet_tree) {
 /* Allocating and freeing space for subnets */
 
 subnet_t *new_subnet(void) {
-	return xmalloc_and_zero(sizeof(subnet_t));
+	return xzalloc(sizeof(subnet_t));
 }
 
 void free_subnet(subnet_t *subnet) {
@@ -172,337 +92,191 @@ void subnet_add(node_t *n, subnet_t *subnet) {
 	subnet->owner = n;
 
 	splay_insert(subnet_tree, subnet);
-	splay_insert(n->subnet_tree, subnet);
+	if (n)
+		splay_insert(n->subnet_tree, subnet);
 
 	subnet_cache_flush();
 }
 
 void subnet_del(node_t *n, subnet_t *subnet) {
-	splay_delete(n->subnet_tree, subnet);
+	if (n)
+		splay_delete(n->subnet_tree, subnet);
 	splay_delete(subnet_tree, subnet);
 
 	subnet_cache_flush();
 }
 
-/* Ascii representation of subnets */
-
-bool str2net(subnet_t *subnet, const char *subnetstr) {
-	int i, l;
-	uint16_t x[8];
-	int weight = 10;
-
-	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)
-			return false;
-
-		subnet->type = SUBNET_IPV4;
-		subnet->net.ipv4.prefixlength = l;
-		subnet->weight = weight;
-
-		for(i = 0; i < 4; i++) {
-			if(x[i] > 255)
-				return false;
-			subnet->net.ipv4.address.x[i] = x[i];
-		}
+/* Subnet lookup routines */
 
-		return true;
-	}
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
+	return splay_search(owner->subnet_tree, subnet);
+}
 
-	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
-			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7],
-			  &l, &weight) >= 9) {
-		if(l < 0 || l > 128)
-			return false;
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
+	subnet_t *r = NULL;
 
-		subnet->type = SUBNET_IPV6;
-		subnet->net.ipv6.prefixlength = l;
-		subnet->weight = weight;
+	// Check if this address is cached
 
-		for(i = 0; i < 8; i++)
-			subnet->net.ipv6.address.x[i] = htons(x[i]);
+	if((r = hash_search(mac_cache, address)))
+		return r;
 
-		return true;
-	}
+	// Search all subnets for a matching one
 
-	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu#%d", &x[0], &x[1], &x[2], &x[3], &weight) >= 4) {
-		subnet->type = SUBNET_IPV4;
-		subnet->net.ipv4.prefixlength = 32;
-		subnet->weight = weight;
+	for splay_each(subnet_t, p, owner ? owner->subnet_tree : subnet_tree) {
+		if(!p || p->type != SUBNET_MAC)
+			continue;
 
-		for(i = 0; i < 4; i++) {
-			if(x[i] > 255)
-				return false;
-			subnet->net.ipv4.address.x[i] = x[i];
+		if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+			r = p;
+			if(!p->owner || p->owner->status.reachable)
+				break;
 		}
-
-		return true;
-	}
-
-	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx#%d",
-			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7], &weight) >= 8) {
-		subnet->type = SUBNET_IPV6;
-		subnet->net.ipv6.prefixlength = 128;
-		subnet->weight = weight;
-
-		for(i = 0; i < 8; i++)
-			subnet->net.ipv6.address.x[i] = htons(x[i]);
-
-		return true;
-	}
-
-	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
-			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &weight) >= 6) {
-		subnet->type = SUBNET_MAC;
-		subnet->weight = weight;
-
-		for(i = 0; i < 6; i++)
-			subnet->net.mac.address.x[i] = x[i];
-
-		return true;
-	}
-
-	return false;
-}
-
-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);
-		return false;
 	}
 
-	switch (subnet->type) {
-		case SUBNET_MAC:
-			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
-					 subnet->net.mac.address.x[0],
-					 subnet->net.mac.address.x[1],
-					 subnet->net.mac.address.x[2],
-					 subnet->net.mac.address.x[3],
-					 subnet->net.mac.address.x[4],
-					 subnet->net.mac.address.x[5],
-					 subnet->weight);
-			break;
-
-		case SUBNET_IPV4:
-			snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%d",
-					 subnet->net.ipv4.address.x[0],
-					 subnet->net.ipv4.address.x[1],
-					 subnet->net.ipv4.address.x[2],
-					 subnet->net.ipv4.address.x[3],
-					 subnet->net.ipv4.prefixlength,
-					 subnet->weight);
-			break;
-
-		case SUBNET_IPV6:
-			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
-					 ntohs(subnet->net.ipv6.address.x[0]),
-					 ntohs(subnet->net.ipv6.address.x[1]),
-					 ntohs(subnet->net.ipv6.address.x[2]),
-					 ntohs(subnet->net.ipv6.address.x[3]),
-					 ntohs(subnet->net.ipv6.address.x[4]),
-					 ntohs(subnet->net.ipv6.address.x[5]),
-					 ntohs(subnet->net.ipv6.address.x[6]),
-					 ntohs(subnet->net.ipv6.address.x[7]),
-					 subnet->net.ipv6.prefixlength,
-					 subnet->weight);
-			break;
-
-		default:
-			logger(LOG_ERR,
-				   "net2str() was called with unknown subnet type %d, exiting!",
-				   subnet->type);
-			exit(0);
-	}
-
-	return true;
-}
-
-/* Subnet lookup routines */
-
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
-	return splay_search(owner->subnet_tree, subnet);
-}
-
-subnet_t *lookup_subnet_mac(const mac_t *address) {
-	subnet_t *p, subnet = {0};
-
-	subnet.type = SUBNET_MAC;
-	subnet.net.mac.address = *address;
-	subnet.owner = NULL;
+	// Cache the result
 
-	p = splay_search(subnet_tree, &subnet);
+	if(r)
+		hash_insert(mac_cache, address, r);
 
-	return p;
+	return r;
 }
 
 subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
-	subnet_t *p, *r = NULL, subnet = {0};
-	splay_node_t *n;
-	int i;
+	subnet_t *r = NULL;
 
 	// Check if this address is cached
 
-	for(i = 0; i < 2; i++) {
-		if(!cache_ipv4_valid[i])
-			continue;
-		if(!memcmp(address, &cache_ipv4_address[i], sizeof *address))
-			return cache_ipv4_subnet[i];
-	}
+	if((r = hash_search(ipv4_cache, address)))
+		return r;
 
 	// 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)
+	for splay_each(subnet_t, p, subnet_tree) {
+		if(!p || p->type != SUBNET_IPV4)
 			continue;
 
 		if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
 			r = p;
-			if(p->owner->status.reachable)
+			if(!p->owner || p->owner->status.reachable)
 				break;
 		}
 	}
 
 	// Cache the result
 
-	cache_ipv4_slot = !cache_ipv4_slot;
-	memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof *address);
-	cache_ipv4_subnet[cache_ipv4_slot] = r;
-	cache_ipv4_valid[cache_ipv4_slot] = true;
+	if(r)
+		hash_insert(ipv4_cache, address, r);
 
 	return r;
 }
 
 subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
-	subnet_t *p, *r = NULL, subnet = {0};
-	splay_node_t *n;
-	int i;
+	subnet_t *r = NULL;
 
 	// Check if this address is cached
 
-	for(i = 0; i < 2; i++) {
-		if(!cache_ipv6_valid[i])
-			continue;
-		if(!memcmp(address, &cache_ipv6_address[i], sizeof *address))
-			return cache_ipv6_subnet[i];
-	}
+	if((r = hash_search(ipv6_cache, address)))
+		return r;
 
 	// 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)
+	for splay_each(subnet_t, p, subnet_tree) {
+		if(!p || p->type != SUBNET_IPV6)
 			continue;
 
 		if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
 			r = p;
-			if(p->owner->status.reachable)
+			if(!p->owner || p->owner->status.reachable)
 				break;
 		}
 	}
 
 	// Cache the result
 
-	cache_ipv6_slot = !cache_ipv6_slot;
-	memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof *address);
-	cache_ipv6_subnet[cache_ipv6_slot] = r;
-	cache_ipv6_valid[cache_ipv6_slot] = true;
+	if(r)
+		hash_insert(ipv6_cache, address, r);
 
 	return r;
 }
 
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-	splay_node_t *node;
-	int i;
-	char *envp[9] = {0};
 	char netstr[MAXNETSTR];
 	char *name, *address, *port;
 	char empty[] = "";
 
 	// Prepare environment variables to be passed to the script
 
-	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);
+	char *envp[10] = {NULL};
+	int n = 0;
+	xasprintf(&envp[n++], "NETNAME=%s", netname ? : "");
+	xasprintf(&envp[n++], "DEVICE=%s", device ? : "");
+	xasprintf(&envp[n++], "INTERFACE=%s", iface ? : "");
+	xasprintf(&envp[n++], "NODE=%s", owner->name);
 
 	if(owner != myself) {
 		sockaddr2str(&owner->address, &address, &port);
-		// 4 and 5 are reserved for SUBNET and WEIGHT
-		xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
-		xasprintf(&envp[7], "REMOTEPORT=%s", port);
+		xasprintf(&envp[n++], "REMOTEADDRESS=%s", address);
+		xasprintf(&envp[n++], "REMOTEPORT=%s", port);
+		free(port);
+		free(address);
 	}
 
+	xasprintf(&envp[n++], "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;
+		for splay_each(subnet_t, subnet, owner->subnet_tree) {
 			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 + 7, '#');
+			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);
+			free(envp[n]);
+			free(envp[n + 1]);
+			xasprintf(&envp[n], "SUBNET=%s", netstr);
+			xasprintf(&envp[n + 1], "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 + 7, '#');
+			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);
+			xasprintf(&envp[n], "SUBNET=%s", netstr);
+			xasprintf(&envp[n + 1], "WEIGHT=%s", weight);
 
 			execute_script(name, envp);
 		}
 	}
 
-	for(i = 0; envp[i] && i < 9; i++)
+	for(int i = 0; envp[i] && i < 9; i++)
 		free(envp[i]);
 }
 
-int dump_subnets(struct evbuffer *out) {
-	char netstr[MAXNETSTR];
-	subnet_t *subnet;
-	splay_node_t *node;
+bool dump_subnets(connection_t *c) {
+	for splay_each(subnet_t, subnet, subnet_tree) {
+		char netstr[MAXNETSTR];
 
-	for(node = subnet_tree->head; node; node = node->next) {
-		subnet = node->data;
 		if(!net2str(netstr, sizeof netstr, subnet))
 			continue;
-		if(evbuffer_add_printf(out, " %s owner %s\n",
-							   netstr, subnet->owner->name) == -1)
-			return errno;
+
+		send_request(c, "%d %d %s %s",
+				CONTROL, REQ_DUMP_SUBNETS,
+				netstr, subnet->owner ? subnet->owner->name : "(broadcast)");
 	}
 
-	return 0;
+	return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
 }