Merge branch 'master' into 1.1

[meshlink] / src / node.c

diff --git a/src/node.c b/src/node.c
index 4ee9ce72a36f9a775880862f4e892bd6513424c1..80d28d64112c8cc49e1ad3616b4fb06cb432c463 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
@@ -30,18 +30,16 @@
 #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;
 
-static int node_compare(const node_t *a, const node_t *b)
-{
+static int node_compare(const node_t *a, const node_t *b) {
        return strcmp(a->name, b->name);
 }
 
-static int node_udp_compare(const node_t *a, const node_t *b)
-{
+static int node_udp_compare(const node_t *a, const node_t *b) {
        int result;
 
        cp();
@@ -54,44 +52,36 @@ static int node_udp_compare(const node_t *a, const node_t *b)
        return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
 }
 
-void init_nodes(void)
-{
+void init_nodes(void) {
        cp();
 
-       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)
-{
+void exit_nodes(void) {
        cp();
 
-       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 *new_node(void) {
+       node_t *n = xmalloc_and_zero(sizeof *n);
 
        cp();
 
        n->subnet_tree = new_subnet_tree();
        n->edge_tree = new_edge_tree();
-       EVP_CIPHER_CTX_init(&n->packet_ctx);
        n->mtu = MTU;
        n->maxmtu = MTU;
 
        return n;
 }
 
-void free_node(node_t *n)
-{
+void free_node(node_t *n) {
        cp();
 
-       if(n->key)
-               free(n->key);
-
        if(n->subnet_tree)
                free_subnet_tree(n->subnet_tree);
 
@@ -100,10 +90,10 @@ void free_node(node_t *n)
 
        sockaddrfree(&n->address);
 
-       EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+       cipher_close(&n->cipher);
+       digest_close(&n->digest);
 
-       if(n->mtuevent)
-               event_del(n->mtuevent);
+       event_del(&n->mtuevent);
        
        if(n->hostname)
                free(n->hostname);
@@ -114,16 +104,14 @@ void free_node(node_t *n)
        free(n);
 }
 
-void node_add(node_t *n)
-{
+void node_add(node_t *n) {
        cp();
 
-       avl_insert(node_tree, n);
+       splay_insert(node_tree, n);
 }
 
-void node_del(node_t *n)
-{
-       avl_node_t *node, *next;
+void node_del(node_t *n) {
+       splay_node_t *node, *next;
        edge_t *e;
        subnet_t *s;
 
@@ -141,22 +129,20 @@ void node_del(node_t *n)
                edge_del(e);
        }
 
-       avl_delete(node_tree, n);
+       splay_delete(node_tree, n);
 }
 
-node_t *lookup_node(char *name)
-{
+node_t *lookup_node(char *name) {
        node_t n = {0};
 
        cp();
        
        n.name = name;
 
-       return avl_search(node_tree, &n);
+       return splay_search(node_tree, &n);
 }
 
-node_t *lookup_node_udp(const sockaddr_t *sa)
-{
+node_t *lookup_node_udp(const sockaddr_t *sa) {
        node_t n = {0};
 
        cp();
@@ -164,26 +150,24 @@ 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 dump_nodes(void)
-{
-       avl_node_t *node;
+int dump_nodes(struct evbuffer *out) {
+       splay_node_t *node;
        node_t *n;
 
        cp();
 
-       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->cipher ? n->cipher->nid : 0,
-                          n->digest ? n->digest->type : 0, n->maclength, n->compression,
+               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->cipher),
+                          digest_get_nid(&n->digest), n->maclength, n->compression,
                           n->options, *(uint32_t *)&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;
 }