X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=69f2c7f57273b874e0267078b4b592bfeea15604;hp=3bceb00433581aaf50983d67469329c7364d90b0;hb=570e7e9c615388cfba263c7a7c66cbc3d092d6e7;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/edge.c b/src/edge.c
index 3bceb004..69f2c7f5 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -17,37 +17,27 @@
     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.21 2003/07/12 17:41:45 guus Exp $
+    $Id: edge.c,v 1.1.2.26 2003/08/22 11:18:42 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
-#include "net.h"				/* Don't ask. */
-#include "netutl.h"
-#include "conf.h"
-#include <utils.h>
-#include "subnet.h"
+#include "avl_tree.h"
 #include "edge.h"
-#include "node.h"
 #include "logger.h"
-
+#include "netutl.h"
+#include "node.h"
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
 avl_tree_t *edge_weight_tree;	/* Tree with all edges, sorted on weight */
 
-static int edge_compare(edge_t *a, 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(edge_t *a, edge_t *b)
+static int edge_weight_compare(const edge_t *a, const edge_t *b)
 {
 	int result;
 
@@ -68,15 +58,14 @@ void init_edges(void)
 {
 	cp();
 
-	edge_weight_tree =
-		avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
+	edge_weight_tree = avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
 }
 
 avl_tree_t *new_edge_tree(void)
 {
 	cp();
 
-	return avl_alloc_tree((avl_compare_t) edge_compare, NULL);
+	return avl_alloc_tree((avl_compare_t) edge_compare, (avl_action_t) free_edge);
 }
 
 void free_edge_tree(avl_tree_t *edge_tree)
@@ -105,6 +94,8 @@ edge_t *new_edge(void)
 void free_edge(edge_t *e)
 {
 	cp();
+	
+	sockaddrfree(&e->address);
 
 	free(e);
 }
@@ -129,14 +120,14 @@ void edge_del(edge_t *e)
 	if(e->reverse)
 		e->reverse->reverse = NULL;
 
-	avl_delete(e->from->edge_tree, e);
 	avl_delete(edge_weight_tree, e);
+	avl_delete(e->from->edge_tree, e);
 }
 
 edge_t *lookup_edge(node_t *from, node_t *to)
 {
 	edge_t v;
-
+	
 	cp();
 
 	v.from = from;