X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=5491d8ac2885ad7f4a74fcde4fcbbf7496f4a626;hb=refs%2Fheads%2F1.1;hp=86970ce60d00e70c82c681469f71dde22c7897b0;hpb=0345a1468613e1ba4a4aa6dbbef44a26f1eb42d9;p=tinc

diff --git a/src/edge.c b/src/edge.c
index 86970ce6..baa6d26c 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -26,15 +26,8 @@
 #include "logger.h"
 #include "netutl.h"
 #include "node.h"
-#include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *edge_weight_tree;
-
-static int edge_compare(const edge_t *a, const edge_t *b) {
-	return strcmp(a->to->name, b->to->name);
-}
-
 static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 	int result;
 
@@ -53,20 +46,22 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 	return strcmp(a->to->name, b->to->name);
 }
 
-void init_edges(void) {
-	edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
-}
+splay_tree_t edge_weight_tree = {
+	.compare = (splay_compare_t) edge_weight_compare,
+};
 
-splay_tree_t *new_edge_tree(void) {
-	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
+static int edge_compare(const edge_t *a, const edge_t *b) {
+	return strcmp(a->to->name, b->to->name);
 }
 
-void free_edge_tree(splay_tree_t *edge_tree) {
-	splay_delete_tree(edge_tree);
+void init_edge_tree(splay_tree_t *tree) {
+	memset(tree, 0, sizeof(*tree));
+	tree->compare = (splay_compare_t) edge_compare;
+	tree->delete = (splay_action_t) free_edge;
 }
 
 void exit_edges(void) {
-	splay_delete_tree(edge_weight_tree);
+	splay_empty_tree(&edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
@@ -76,14 +71,16 @@ edge_t *new_edge(void) {
 }
 
 void free_edge(edge_t *e) {
-	sockaddrfree(&e->address);
-	sockaddrfree(&e->local_address);
+	if(e) {
+		sockaddrfree(&e->address);
+		sockaddrfree(&e->local_address);
 
-	free(e);
+		free(e);
+	}
 }
 
 void edge_add(edge_t *e) {
-	splay_node_t *node = splay_insert(e->from->edge_tree, e);
+	splay_node_t *node = splay_insert(&e->from->edge_tree, e);
 
 	if(!node) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Edge from %s to %s already exists in edge_tree\n", e->from->name, e->to->name);
@@ -97,7 +94,7 @@ void edge_add(edge_t *e) {
 		e->reverse->reverse = e;
 	}
 
-	node = splay_insert(edge_weight_tree, e);
+	node = splay_insert(&edge_weight_tree, e);
 
 	if(!node) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Edge from %s to %s already exists in edge_weight_tree\n", e->from->name, e->to->name);
@@ -110,8 +107,8 @@ void edge_del(edge_t *e) {
 		e->reverse->reverse = NULL;
 	}
 
-	splay_delete(edge_weight_tree, e);
-	splay_delete(e->from->edge_tree, e);
+	splay_delete(&edge_weight_tree, e);
+	splay_delete(&e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to) {
@@ -120,12 +117,12 @@ edge_t *lookup_edge(node_t *from, node_t *to) {
 	v.from = from;
 	v.to = to;
 
-	return splay_search(from->edge_tree, &v);
+	return splay_search(&from->edge_tree, &v);
 }
 
 bool dump_edges(connection_t *c) {
-	for splay_each(node_t, n, node_tree) {
-		for splay_each(edge_t, e, n->edge_tree) {
+	for splay_each(node_t, n, &node_tree) {
+		for splay_each(edge_t, e, &n->edge_tree) {
 			char *address = sockaddr2hostname(&e->address);
 			char *local_address = sockaddr2hostname(&e->local_address);
 			send_request(c, "%d %d %s %s %s %s %x %d",