X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=723bf8b1444545396c380d522a8c4c673d105221;hb=3c7003893fe2f82023d0d4f54b488bb7a16d0007;hp=ef4e59e9b7b8d4d1f2191b52b479af59d11cbc43;hpb=4c85542894f7fca823b119b05e07179deb24229a;p=tinc

diff --git a/src/subnet.c b/src/subnet.c
index ef4e59e9..723bf8b1 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-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,8 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "control_common.h"
 #include "device.h"
 #include "logger.h"
 #include "net.h"
@@ -33,7 +34,7 @@
 
 /* lists type of subnet */
 
-avl_tree_t *subnet_tree;
+splay_tree_t *subnet_tree;
 
 /* Subnet lookup cache */
 
@@ -47,113 +48,35 @@ 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;
-}
-
-/* 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(mac_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_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;
+	cache_mac_valid[0] = cache_mac_valid[1] = false;
 }
 
 /* Initialising trees */
 
 void init_subnets(void) {
-	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) {
-	avl_delete_tree(subnet_tree);
+	splay_delete_tree(subnet_tree);
 }
 
-avl_tree_t *new_subnet_tree(void) {
-	return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
+splay_tree_t *new_subnet_tree(void) {
+	return splay_alloc_tree((splay_compare_t) subnet_compare, NULL);
 }
 
-void free_subnet_tree(avl_tree_t *subnet_tree) {
-	avl_delete_tree(subnet_tree);
+void free_subnet_tree(splay_tree_t *subnet_tree) {
+	splay_delete_tree(subnet_tree);
 }
 
 /* Allocating and freeing space for subnets */
@@ -171,173 +94,69 @@ void free_subnet(subnet_t *subnet) {
 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) {
-	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 */
-
-bool str2net(subnet_t *subnet, const char *subnetstr) {
-	int i, l;
-	uint16_t x[8];
-	int weight = 10;
+/* Subnet lookup routines */
 
-	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_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
+	return splay_search(owner->subnet_tree, subnet);
+}
 
-		subnet->type = SUBNET_IPV4;
-		subnet->net.ipv4.prefixlength = l;
-		subnet->weight = weight;
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
+	subnet_t *p, *r = NULL;
+	splay_node_t *n;
+	int i;
 
-		for(i = 0; i < 4; i++) {
-			if(x[i] > 255)
-				return false;
-			subnet->net.ipv4.address.x[i] = x[i];
-		}
+	// Check if this address is cached
 
-		return true;
+	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];
 	}
 
-	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->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;
-	}
+	// 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(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
+		p = n->data;
+		
+		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->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 avl_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 = 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};
-	avl_node_t *n;
+	subnet_t *p, *r = NULL;
+	splay_node_t *n;
 	int i;
 
 	// Check if this address is cached
@@ -351,15 +170,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)) {
@@ -380,8 +194,8 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 }
 
 subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
-	subnet_t *p, *r = NULL, subnet = {0};
-	avl_node_t *n;
+	subnet_t *p, *r = NULL;
+	splay_node_t *n;
 	int i;
 
 	// Check if this address is cached
@@ -395,15 +209,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)) {
@@ -424,9 +233,9 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 }
 
 void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
-	avl_node_t *node;
+	splay_node_t *node;
 	int i;
-	char *envp[9] = {0};
+	char *envp[9] = {NULL};
 	char netstr[MAXNETSTR];
 	char *name, *address, *port;
 	char empty[] = "";
@@ -443,6 +252,8 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		// 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);
 	}
 
 	name = up ? "subnet-up" : "subnet-down";
@@ -453,7 +264,7 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 			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
@@ -470,9 +281,9 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 			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
@@ -486,23 +297,23 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		}
 	}
 
-	for(i = 0; envp[i] && i < 9; i++)
+	for(i = 0; envp[i] && i < 8; i++)
 		free(envp[i]);
 }
 
-void dump_subnets(void) {
+bool dump_subnets(connection_t *c) {
 	char netstr[MAXNETSTR];
 	subnet_t *subnet;
-	avl_node_t *node;
-
-	logger(LOG_DEBUG, "Subnet list:");
+	splay_node_t *node;
 
 	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);
+		send_request(c, "%d %d %s owner %s",
+				CONTROL, REQ_DUMP_SUBNETS,
+				netstr, subnet->owner->name);
 	}
 
-	logger(LOG_DEBUG, "End of subnet list.");
+	return send_request(c, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
 }