X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fsubnet.c;h=057550ab0760455f1626aaedebb49aed970f9c9a;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=4ac625da37af7ee8de7769da381cf44e7264e5a3;hpb=de78d79db84c486afcc353884ec1770866beb653;p=meshlink

diff --git a/src/subnet.c b/src/subnet.c
index 4ac625da..057550ab 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,6 +1,6 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "device.h"
 #include "logger.h"
 #include "net.h"
@@ -35,7 +35,24 @@
 
 /* lists type of subnet */
 
-avl_tree_t *subnet_tree;
+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 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 */
 
@@ -43,7 +60,12 @@ 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));
+	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;
@@ -55,12 +77,17 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
 {
 	int result;
 
-	result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
+	result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
 
 	if(result)
 		return result;
 
-	result = a->net.ipv4.prefixlength - b->net.ipv4.prefixlength;
+	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;
@@ -72,12 +99,17 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
 {
 	int result;
 
-	result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+	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));
 
-	result = a->net.ipv6.prefixlength - b->net.ipv6.prefixlength;
+	if(result)
+		return result;
+	
+	result = a->weight - b->weight;
 
 	if(result || !a->owner || !b->owner)
 		return result;
@@ -117,28 +149,30 @@ void init_subnets(void)
 {
 	cp();
 
-	subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
+	subnet_tree = splay_alloc_tree((splay_compare_t) subnet_compare, (splay_action_t) free_subnet);
+
+	subnet_cache_flush();
 }
 
 void exit_subnets(void)
 {
 	cp();
 
-	avl_delete_tree(subnet_tree);
+	splay_delete_tree(subnet_tree);
 }
 
-avl_tree_t *new_subnet_tree(void)
+splay_tree_t *new_subnet_tree(void)
 {
 	cp();
 
-	return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
+	return splay_alloc_tree((splay_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(avl_tree_t *subnet_tree)
+void free_subnet_tree(splay_tree_t *subnet_tree)
 {
 	cp();
 
-	avl_delete_tree(subnet_tree);
+	splay_delete_tree(subnet_tree);
 }
 
 /* Allocating and freeing space for subnets */
@@ -165,16 +199,20 @@ void subnet_add(node_t *n, subnet_t *subnet)
 
 	subnet->owner = n;
 
-	avl_insert(subnet_tree, subnet);
-	avl_insert(n->subnet_tree, subnet);
+	splay_insert(subnet_tree, subnet);
+	splay_insert(n->subnet_tree, subnet);
+
+	subnet_cache_flush();
 }
 
 void subnet_del(node_t *n, subnet_t *subnet)
 {
 	cp();
 
-	avl_delete(n->subnet_tree, subnet);
-	avl_delete(subnet_tree, subnet);
+	splay_delete(n->subnet_tree, subnet);
+	splay_delete(subnet_tree, subnet);
+
+	subnet_cache_flush();
 }
 
 /* Ascii representation of subnets */
@@ -183,25 +221,37 @@ 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",
-			  &x[0], &x[1], &x[2], &x[3], &l) == 5) {
+	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++)
+		for(i = 0; i < 4; i++) {
+			if(x[i] > 255)
+				return false;
 			subnet->net.ipv4.address.x[i] = x[i];
+		}
 
 		return true;
 	}
 
-	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
+	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) == 9) {
+			  &l, &weight) >= 9) {
+		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]);
@@ -209,20 +259,25 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 		return true;
 	}
 
-	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu", &x[0], &x[1], &x[2], &x[3]) == 4) {
+	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(i = 0; i < 4; i++)
+		for(i = 0; i < 4; i++) {
+			if(x[i] > 255)
+				return false;
 			subnet->net.ipv4.address.x[i] = x[i];
+		}
 
 		return true;
 	}
 
-	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
-			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8) {
+	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]);
@@ -230,9 +285,10 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 		return true;
 	}
 
-	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx",
-			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5]) == 6) {
+	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];
@@ -254,24 +310,28 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 
 	switch (subnet->type) {
 		case SUBNET_MAC:
-			snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx",
+			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->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",
+			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->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",
+			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]),
@@ -280,7 +340,8 @@ bool net2str(char *netstr, int len, const subnet_t *subnet)
 					 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->net.ipv6.prefixlength,
+					 subnet->weight);
 			break;
 
 		default:
@@ -300,7 +361,7 @@ subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
 {
 	cp();
 
-	return avl_search(owner->subnet_tree, subnet);
+	return splay_search(owner->subnet_tree, subnet);
 }
 
 subnet_t *lookup_subnet_mac(const mac_t *address)
@@ -313,106 +374,125 @@ subnet_t *lookup_subnet_mac(const mac_t *address)
 	subnet.net.mac.address = *address;
 	subnet.owner = NULL;
 
-	p = avl_search(subnet_tree, &subnet);
+	p = splay_search(subnet_tree, &subnet);
 
 	return p;
 }
 
 subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 {
-	subnet_t *p, subnet = {0};
+	subnet_t *p, *r = NULL, subnet = {0};
+	splay_node_t *n;
+	int i;
 
 	cp();
 
+	// 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];
+	}
+
+	// Search all subnets for a matching one
+
 	subnet.type = SUBNET_IPV4;
 	subnet.net.ipv4.address = *address;
 	subnet.net.ipv4.prefixlength = 32;
 	subnet.owner = NULL;
 
-	do {
-		/* Go find subnet */
-
-		p = avl_search_closest_smaller(subnet_tree, &subnet);
-
-		/* Check if the found subnet REALLY matches */
+	for(n = subnet_tree->head; n; n = n->next) {
+		p = n->data;
+		
+		if(!p || p->type != subnet.type)
+			continue;
 
-		if(p) {
-			if(p->type != SUBNET_IPV4) {
-				p = NULL;
+		if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
+			r = p;
+			if(p->owner->status.reachable)
 				break;
-			}
+		}
+	}
 
-			if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
-				break;
-			else {
-				/* Otherwise, see if there is a bigger enclosing subnet */
+	// Cache the result
 
-				subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
-				maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
-			}
-		}
-	} while(p);
+	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;
 
-	return p;
+	return r;
 }
 
 subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 {
-	subnet_t *p, subnet = {0};
+	subnet_t *p, *r = NULL, subnet = {0};
+	splay_node_t *n;
+	int i;
 
 	cp();
 
+	// 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];
+	}
+
+	// Search all subnets for a matching one
+
 	subnet.type = SUBNET_IPV6;
 	subnet.net.ipv6.address = *address;
 	subnet.net.ipv6.prefixlength = 128;
 	subnet.owner = NULL;
 
-	do {
-		/* Go find subnet */
-
-		p = avl_search_closest_smaller(subnet_tree, &subnet);
-
-		/* Check if the found subnet REALLY matches */
-
-		if(p) {
-			if(p->type != SUBNET_IPV6)
-				return NULL;
+	for(n = subnet_tree->head; n; n = n->next) {
+		p = n->data;
+		
+		if(!p || p->type != subnet.type)
+			continue;
 
-			if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength, sizeof(ipv6_t)))
+		if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
+			r = p;
+			if(p->owner->status.reachable)
 				break;
-			else {
-				/* Otherwise, see if there is a bigger enclosing subnet */
-
-				subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
-				maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
-			}
 		}
-	} while(p);
+	}
 
-	return p;
+	// 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;
+
+	return r;
 }
 
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-	avl_node_t *node;
+	splay_node_t *node;
 	int i;
-	char *envp[8];
-	char netstr[MAXNETSTR + 7] = "SUBNET=";
+	char *envp[9] = {0};
+	char netstr[MAXNETSTR];
 	char *name, *address, *port;
+	char empty[] = "";
 
-	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);
+	// 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);
 
 	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);
 	}
 
 	name = up ? "subnet-up" : "subnet-down";
@@ -420,40 +500,62 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 	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 + 7, '#');
+			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 + 7, sizeof netstr - 7, subnet)) {
+			// Strip the weight from the subnet, and put it in its own environment variable
+			char *weight = strchr(netstr + 7, '#');
+			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)
+int dump_subnets(struct evbuffer *out)
 {
 	char netstr[MAXNETSTR];
 	subnet_t *subnet;
-	avl_node_t *node;
+	splay_node_t *node;
 
 	cp();
 
-	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);
+		if(evbuffer_add_printf(out, _(" %s owner %s\n"),
+							   netstr, subnet->owner->name) == -1)
+			return errno;
 	}
 
-	logger(LOG_DEBUG, _("End of subnet list."));
+	return 0;
 }