X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fedge.c;h=88847909c01b3fb9e31b19e5a08e1a444e293974;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=9e1b31ebcf262ba001d3bf3809395841f24a4a9d;hpb=4c85542894f7fca823b119b05e07179deb24229a;p=meshlink

diff --git a/src/edge.c b/src/edge.c
index 9e1b31eb..88847909 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     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
@@ -20,7 +19,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "edge.h"
 #include "logger.h"
 #include "netutl.h"
@@ -28,7 +27,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
+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);
@@ -51,25 +50,25 @@ static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 }
 
 void init_edges(void) {
-	edge_weight_tree = avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
+	edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
-avl_tree_t *new_edge_tree(void) {
-	return avl_alloc_tree((avl_compare_t) edge_compare, (avl_action_t) free_edge);
+splay_tree_t *new_edge_tree(void) {
+	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
 }
 
-void free_edge_tree(avl_tree_t *edge_tree) {
-	avl_delete_tree(edge_tree);
+void free_edge_tree(splay_tree_t *edge_tree) {
+	splay_delete_tree(edge_tree);
 }
 
 void exit_edges(void) {
-	avl_delete_tree(edge_weight_tree);
+	splay_delete_tree(edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
 
 edge_t *new_edge(void) {
-	return xmalloc_and_zero(sizeof(edge_t));
+	return xzalloc(sizeof(edge_t));
 }
 
 void free_edge(edge_t *e) {
@@ -79,8 +78,8 @@ void free_edge(edge_t *e) {
 }
 
 void edge_add(edge_t *e) {
-	avl_insert(edge_weight_tree, e);
-	avl_insert(e->from->edge_tree, e);
+	splay_insert(edge_weight_tree, e);
+	splay_insert(e->from->edge_tree, e);
 
 	e->reverse = lookup_edge(e->to, e->from);
 
@@ -92,37 +91,15 @@ void edge_del(edge_t *e) {
 	if(e->reverse)
 		e->reverse->reverse = NULL;
 
-	avl_delete(edge_weight_tree, e);
-	avl_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) {
 	edge_t v;
-	
+
 	v.from = from;
 	v.to = to;
 
-	return avl_search(from->edge_tree, &v);
-}
-
-void dump_edges(void) {
-	avl_node_t *node, *node2;
-	node_t *n;
-	edge_t *e;
-	char *address;
-
-	logger(LOG_DEBUG, "Edges:");
-
-	for(node = node_tree->head; node; node = node->next) {
-		n = node->data;
-		for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
-			e = node2->data;
-			address = sockaddr2hostname(&e->address);
-			logger(LOG_DEBUG, " %s to %s at %s options %lx weight %d",
-				   e->from->name, e->to->name, address, e->options, e->weight);
-			free(address);
-		}
-	}
-
-	logger(LOG_DEBUG, "End of edges.");
+	return splay_search(from->edge_tree, &v);
 }