X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fedge.c;h=69f2c7f57273b874e0267078b4b592bfeea15604;hb=22dd23b650eb9b760bc68ab3a9227caf3b449140;hp=76bdc41b98ed8edb620d8f05e01b330870ffa49a;hpb=83263b74460656ba557fd9bb84dc27258549e9cd;p=tinc

diff --git a/src/edge.c b/src/edge.c
index 76bdc41b..69f2c7f5 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -17,7 +17,7 @@
     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.23 2003/07/24 12:08:15 guus Exp $
+    $Id: edge.c,v 1.1.2.26 2003/08/22 11:18:42 guus Exp $
 */
 
 #include "system.h"
@@ -58,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)
@@ -95,6 +94,8 @@ edge_t *new_edge(void)
 void free_edge(edge_t *e)
 {
 	cp();
+	
+	sockaddrfree(&e->address);
 
 	free(e);
 }
@@ -119,19 +120,19 @@ 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(const node_t *from, const node_t *to)
+edge_t *lookup_edge(node_t *from, node_t *to)
 {
-	edge_t v = {
-		.from = from,
-		.to = to
-	};
-
+	edge_t v;
+	
 	cp();
 
+	v.from = from;
+	v.to = to;
+
 	return avl_search(from->edge_tree, &v);
 }