X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=861b94538111041e53ab75f83ce6c188f584eeae;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=bf43d304a575c9ddb78753dd046896ae8ccb58c6;hpb=42e01abd54bd36ee84a45a2b646cfa27034de8d1;p=tinc

diff --git a/src/edge.c b/src/edge.c
index bf43d304..861b9453 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,7 +1,7 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    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
@@ -17,12 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: edge.c,v 1.1.2.27 2003/08/28 21:05:10 guus Exp $
+    $Id$
 */
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "edge.h"
 #include "logger.h"
 #include "netutl.h"
@@ -30,15 +30,13 @@
 #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;	/* Tree with all edges, sorted on weight */
 
-static int edge_compare(const edge_t *a, const edge_t *b)
-{
+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)
-{
+static int edge_weight_compare(const edge_t *a, const edge_t *b) {
 	int result;
 
 	result = a->weight - b->weight;
@@ -54,45 +52,39 @@ 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)
-{
+void init_edges(void) {
 	cp();
 
-	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)
-{
+splay_tree_t *new_edge_tree(void) {
 	cp();
 
-	return avl_alloc_tree((avl_compare_t) edge_compare, (avl_action_t) free_edge);
+	return splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge);
 }
 
-void free_edge_tree(avl_tree_t *edge_tree)
-{
+void free_edge_tree(splay_tree_t *edge_tree) {
 	cp();
 
-	avl_delete_tree(edge_tree);
+	splay_delete_tree(edge_tree);
 }
 
-void exit_edges(void)
-{
+void exit_edges(void) {
 	cp();
 
-	avl_delete_tree(edge_weight_tree);
+	splay_delete_tree(edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
 
-edge_t *new_edge(void)
-{
+edge_t *new_edge(void) {
 	cp();
 
 	return xmalloc_and_zero(sizeof(edge_t));
 }
 
-void free_edge(edge_t *e)
-{
+void free_edge(edge_t *e) {
 	cp();
 	
 	sockaddrfree(&e->address);
@@ -100,12 +92,11 @@ void free_edge(edge_t *e)
 	free(e);
 }
 
-void edge_add(edge_t *e)
-{
+void edge_add(edge_t *e) {
 	cp();
 
-	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);
 
@@ -113,19 +104,17 @@ void edge_add(edge_t *e)
 		e->reverse->reverse = e;
 }
 
-void edge_del(edge_t *e)
-{
+void edge_del(edge_t *e) {
 	cp();
 
 	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 *lookup_edge(node_t *from, node_t *to) {
 	edge_t v;
 	
 	cp();
@@ -133,12 +122,11 @@ edge_t *lookup_edge(node_t *from, node_t *to)
 	v.from = from;
 	v.to = to;
 
-	return avl_search(from->edge_tree, &v);
+	return splay_search(from->edge_tree, &v);
 }
 
-void dump_edges(void)
-{
-	avl_node_t *node, *node2;
+void dump_edges(void) {
+	splay_node_t *node, *node2;
 	node_t *n;
 	edge_t *e;
 	char *address;