X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.c;h=653963092b2bc77b6f4c0bcb62b9582db4f69f2e;hp=9509880e1512711f1ff234f7c6991df364038820;hb=abb24e9d71b3edb9cacf4c04361cc0dfd4e6a061;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee

diff --git a/src/edge.c b/src/edge.c
index 9509880e..65396309 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -1,6 +1,6 @@
 /*
     edge.c -- edge tree management
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,8 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "control_common.h"
 #include "edge.h"
 #include "logger.h"
 #include "netutl.h"
@@ -28,15 +29,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;
 
-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;
@@ -52,58 +51,43 @@ 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)
-{
-	cp();
-
-	edge_weight_tree = avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
+void init_edges(void) {
+	edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
 }
 
-avl_tree_t *new_edge_tree(void)
-{
-	cp();
-
-	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)
-{
-	cp();
-
-	avl_delete_tree(edge_tree);
+void free_edge_tree(splay_tree_t *edge_tree) {
+	splay_delete_tree(edge_tree);
 }
 
-void exit_edges(void)
-{
-	cp();
-
-	avl_delete_tree(edge_weight_tree);
+void exit_edges(void) {
+	// since edge_weight_tree does not have delete action defined
+	// we have to cleanup it on exit
+	for splay_each(edge_t, e, edge_weight_tree) {
+			sockaddrfree(&e->address);
+			sockaddrfree(&e->local_address);
+		}
+	splay_delete_tree(edge_weight_tree);
 }
 
 /* Creation and deletion of connection elements */
 
-edge_t *new_edge(void)
-{
-	cp();
-
-	return xmalloc_and_zero(sizeof(edge_t));
+edge_t *new_edge(void) {
+	return xzalloc(sizeof(edge_t));
 }
 
-void free_edge(edge_t *e)
-{
-	cp();
-	
+void free_edge(edge_t *e) {
 	sockaddrfree(&e->address);
 
 	free(e);
 }
 
-void edge_add(edge_t *e)
-{
-	cp();
-
-	avl_insert(edge_weight_tree, e);
-	avl_insert(e->from->edge_tree, e);
+void edge_add(edge_t *e) {
+	splay_insert(edge_weight_tree, e);
+	splay_insert(e->from->edge_tree, e);
 
 	e->reverse = lookup_edge(e->to, e->from);
 
@@ -111,50 +95,36 @@ void edge_add(edge_t *e)
 		e->reverse->reverse = e;
 }
 
-void edge_del(edge_t *e)
-{
-	cp();
-
+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 *lookup_edge(node_t *from, node_t *to) {
 	edge_t v;
-	
-	cp();
 
 	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;
-	node_t *n;
-	edge_t *e;
-	char *address;
-
-	cp();
-
-	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);
+bool dump_edges(connection_t *c) {
+	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",
+					CONTROL, REQ_DUMP_EDGES,
+					e->from->name, e->to->name, address,
+					local_address, e->options, e->weight);
 			free(address);
+			free(local_address);
 		}
 	}
 
-	logger(LOG_DEBUG, _("End of edges."));
+	return send_request(c, "%d %d", CONTROL, REQ_DUMP_EDGES);
 }