Merge branch 'master' into 1.1

[tinc] / src / edge.c

diff --git a/src/edge.c b/src/edge.c
index 9e1b31e..4d674f3 100644 (file)
--- a/src/edge.c
+++ b/src/edge.c
@@ -20,7 +20,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "edge.h"
 #include "logger.h"
 #include "netutl.h"
@@ -28,7 +28,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;        /* Tree with all edges, sorted on weight */
 
 static int edge_compare(const edge_t *a, const edge_t *b) {
        return strcmp(a->to->name, b->to->name);
@@ -51,19 +51,19 @@ 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 */
@@ -79,8 +79,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,8 +92,8 @@ 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) {
@@ -102,27 +102,30 @@ 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;
+int dump_edges(struct evbuffer *out) {
+       splay_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);
+                       if(evbuffer_add_printf(out,
+                                                                  " %s to %s at %s options %lx weight %d\n",
+                                                                  e->from->name, e->to->name, address,
+                                                                  e->options, e->weight) == -1) {
+                               free(address);
+                               return errno;
+                       }
                        free(address);
                }
        }
 
-       logger(LOG_DEBUG, "End of edges.");
+       return 0;
 }