X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=446d38b15f4c86ec34a583b5126705419616bcdf;hb=551cd19406a560d0d206bff5b4e9da064ec222b6;hp=3652cd3a8946afa341f5cb750badeb370ca86d1a;hpb=92c4a28d7d43b68a324cf2eca741298ed6b692d6;p=tinc

diff --git a/src/subnet.c b/src/subnet.c
index 3652cd3a..446d38b1 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,7 +1,7 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2004 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2004 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     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
@@ -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,7 @@
 
 /* lists type of subnet */
 
-avl_tree_t *subnet_tree;
+splay_tree_t *subnet_tree;
 
 /* Subnet comparison */
 
@@ -43,7 +43,7 @@ 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 || !a->owner || !b->owner)
 		return result;
@@ -55,7 +55,7 @@ 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 = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof a->net.ipv4.address);
 
 	if(result)
 		return result;
@@ -72,7 +72,7 @@ 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 = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof a->net.ipv6.address);
 
 	if(result)
 		return result;
@@ -117,28 +117,28 @@ 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);
 }
 
 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 +165,16 @@ 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);
 }
 
 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);
 }
 
 /* Ascii representation of subnets */
@@ -188,11 +188,17 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 
 	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
 			  &x[0], &x[1], &x[2], &x[3], &l) == 5) {
+		if(l < 0 || l > 32)
+			return false;
+
 		subnet->type = SUBNET_IPV4;
 		subnet->net.ipv4.prefixlength = l;
 
-		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;
 	}
@@ -200,6 +206,9 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 	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],
 			  &l) == 9) {
+		if(l < 0 || l > 128)
+			return false;
+
 		subnet->type = SUBNET_IPV6;
 		subnet->net.ipv6.prefixlength = l;
 
@@ -213,8 +222,11 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 		subnet->type = SUBNET_IPV4;
 		subnet->net.ipv4.prefixlength = 32;
 
-		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;
 	}
@@ -300,7 +312,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,7 +325,7 @@ 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;
 }
@@ -332,7 +344,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 	do {
 		/* Go find subnet */
 
-		p = avl_search_closest_smaller(subnet_tree, &subnet);
+		p = splay_search_closest_smaller(subnet_tree, &subnet);
 
 		/* Check if the found subnet REALLY matches */
 
@@ -342,13 +354,15 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 				break;
 			}
 
-			if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
+			if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength))
 				break;
 			else {
 				/* Otherwise, see if there is a bigger enclosing subnet */
 
 				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));
+				if(subnet.net.ipv4.prefixlength < 0 || subnet.net.ipv4.prefixlength > 32)
+					return NULL;
+				maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof subnet.net.ipv4.address);
 			}
 		}
 	} while(p);
@@ -370,7 +384,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 	do {
 		/* Go find subnet */
 
-		p = avl_search_closest_smaller(subnet_tree, &subnet);
+		p = splay_search_closest_smaller(subnet_tree, &subnet);
 
 		/* Check if the found subnet REALLY matches */
 
@@ -378,13 +392,15 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 			if(p->type != SUBNET_IPV6)
 				return NULL;
 
-			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))
 				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));
+				if(subnet.net.ipv6.prefixlength < 0 || subnet.net.ipv6.prefixlength > 128)
+					return NULL;
+				maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof subnet.net.ipv6.address);
 			}
 		}
 	} while(p);
@@ -393,7 +409,7 @@ 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[8];
 	char netstr[MAXNETSTR + 7] = "SUBNET=";
@@ -438,22 +454,22 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 	}
 }
 
-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;
 }