X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=dce57477091a00259f0414784a1a60646f160dc8;hp=67be001041042af94395724e8b6b443881c0472b;hb=103543aa2c15d9f1e2aa313a2e593a7524cce484;hpb=292354912f346fe467f557f0dc026b519997289c

diff --git a/src/subnet.c b/src/subnet.c
index 67be0010..dce57477 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -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 */
 
@@ -63,7 +64,7 @@ void subnet_cache_flush() {
 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;
@@ -145,21 +146,21 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
 /* 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 */
@@ -177,15 +178,15 @@ 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();
 }
@@ -273,7 +274,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 
 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;
 	}
 
@@ -326,12 +327,12 @@ 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) {
-	return avl_search(owner->subnet_tree, subnet);
+	return splay_search(owner->subnet_tree, subnet);
 }
 
 subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 	subnet_t *p, *r = NULL;
-	avl_node_t *n;
+	splay_node_t *n;
 	int i;
 
 	// Check if this address is cached
@@ -372,7 +373,7 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 
 subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 	subnet_t *p, *r = NULL;
-	avl_node_t *n;
+	splay_node_t *n;
 	int i;
 
 	// Check if this address is cached
@@ -411,7 +412,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 
 subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 	subnet_t *p, *r = NULL;
-	avl_node_t *n;
+	splay_node_t *n;
 	int i;
 
 	// Check if this address is cached
@@ -449,7 +450,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[9] = {0};
 	char netstr[MAXNETSTR];
@@ -515,19 +516,19 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		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);
 }