Merge branch 'master' into 1.1

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index c1f1219..2ef28b5 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -20,7 +20,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
@@ -28,8 +28,8 @@
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *node_tree;                 /* Known nodes, sorted by name */
-avl_tree_t *node_udp_tree;             /* Known nodes, sorted by address and port */
+splay_tree_t *node_tree;                       /* Known nodes, sorted by name */
+splay_tree_t *node_udp_tree;           /* Known nodes, sorted by address and port */
 
 node_t *myself;
 
@@ -38,26 +38,31 @@ static int node_compare(const node_t *a, const node_t *b) {
 }
 
 static int node_udp_compare(const node_t *a, const node_t *b) {
-       return sockaddrcmp(&a->address, &b->address);
+       int result;
+
+       result = sockaddrcmp(&a->address, &b->address);
+
+       if(result)
+               return result;
+
+       return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
 }
 
 void init_nodes(void) {
-       node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node);
-       node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL);
+       node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
+       node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL);
 }
 
 void exit_nodes(void) {
-       avl_delete_tree(node_udp_tree);
-       avl_delete_tree(node_tree);
+       splay_delete_tree(node_udp_tree);
+       splay_delete_tree(node_tree);
 }
 
 node_t *new_node(void) {
-       node_t *n = xmalloc_and_zero(sizeof(*n));
+       node_t *n = xmalloc_and_zero(sizeof *n);
 
        n->subnet_tree = new_subnet_tree();
        n->edge_tree = new_edge_tree();
-       EVP_CIPHER_CTX_init(&n->inctx);
-       EVP_CIPHER_CTX_init(&n->outctx);
        n->mtu = MTU;
        n->maxmtu = MTU;
 
@@ -65,12 +70,6 @@ node_t *new_node(void) {
 }
 
 void free_node(node_t *n) {
-       if(n->inkey)
-               free(n->inkey);
-
-       if(n->outkey)
-               free(n->outkey);
-
        if(n->subnet_tree)
                free_subnet_tree(n->subnet_tree);
 
@@ -79,11 +78,12 @@ void free_node(node_t *n) {
 
        sockaddrfree(&n->address);
 
-       EVP_CIPHER_CTX_cleanup(&n->inctx);
-       EVP_CIPHER_CTX_cleanup(&n->outctx);
+       cipher_close(&n->incipher);
+       digest_close(&n->indigest);
+       cipher_close(&n->outcipher);
+       digest_close(&n->outdigest);
 
-       if(n->mtuevent)
-               event_del(n->mtuevent);
+       event_del(&n->mtuevent);
        
        if(n->hostname)
                free(n->hostname);
@@ -95,11 +95,11 @@ void free_node(node_t *n) {
 }
 
 void node_add(node_t *n) {
-       avl_insert(node_tree, n);
+       splay_insert(node_tree, n);
 }
 
 void node_del(node_t *n) {
-       avl_node_t *node, *next;
+       splay_node_t *node, *next;
        edge_t *e;
        subnet_t *s;
 
@@ -115,8 +115,8 @@ void node_del(node_t *n) {
                edge_del(e);
        }
 
-       avl_delete(node_udp_tree, n);
-       avl_delete(node_tree, n);
+       splay_delete(node_udp_tree, n);
+       splay_delete(node_tree, n);
 }
 
 node_t *lookup_node(char *name) {
@@ -124,7 +124,7 @@ node_t *lookup_node(char *name) {
 
        n.name = name;
 
-       return avl_search(node_tree, &n);
+       return splay_search(node_tree, &n);
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa) {
@@ -133,11 +133,11 @@ node_t *lookup_node_udp(const sockaddr_t *sa) {
        n.address = *sa;
        n.name = NULL;
 
-       return avl_search(node_udp_tree, &n);
+       return splay_search(node_udp_tree, &n);
 }
 
 void update_node_udp(node_t *n, const sockaddr_t *sa) {
-       avl_delete(node_udp_tree, n);
+       splay_delete(node_udp_tree, n);
 
        if(n->hostname)
                free(n->hostname);
@@ -145,8 +145,8 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
        if(sa) {
                n->address = *sa;
                n->hostname = sockaddr2hostname(&n->address);
-               avl_insert(node_udp_tree, n);
-               ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+               splay_insert(node_udp_tree, n);
+               logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
        } else {
                memset(&n->address, 0, sizeof n->address);
                n->hostname = 0;
@@ -154,20 +154,19 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
        }
 }
 
-void dump_nodes(void) {
-       avl_node_t *node;
+int dump_nodes(struct evbuffer *out) {
+       splay_node_t *node;
        node_t *n;
 
-       logger(LOG_DEBUG, "Nodes:");
-
        for(node = node_tree->head; node; node = node->next) {
                n = node->data;
-               logger(LOG_DEBUG, " %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)",
-                          n->name, n->hostname, n->outcipher ? n->outcipher->nid : 0,
-                          n->outdigest ? n->outdigest->type : 0, n->outmaclength, n->outcompression,
+               if(evbuffer_add_printf(out, " %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n",
+                          n->name, n->hostname, cipher_get_nid(&n->outcipher),
+                          digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression,
                           n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
-                          n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
+                          n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu) == -1)
+                       return errno;
        }
 
-       logger(LOG_DEBUG, "End of nodes.");
+       return 0;
 }