X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=80d28d64112c8cc49e1ad3616b4fb06cb432c463;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hp=9d4d2f4393231556c7dba9376edaf22b219c2189;hpb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;p=meshlink

diff --git a/src/node.c b/src/node.c
index 9d4d2f43..80d28d64 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,6 +1,6 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -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,8 +30,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;
 
@@ -55,26 +55,24 @@ static int node_udp_compare(const node_t *a, const node_t *b) {
 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) {
 	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 *n = xmalloc_and_zero(sizeof *n);
 
 	cp();
 
 	n->subnet_tree = new_subnet_tree();
 	n->edge_tree = new_edge_tree();
-	n->queue = list_alloc((list_action_t) free);
-	EVP_CIPHER_CTX_init(&n->packet_ctx);
 	n->mtu = MTU;
 	n->maxmtu = MTU;
 
@@ -84,12 +82,6 @@ node_t *new_node(void) {
 void free_node(node_t *n) {
 	cp();
 
-	if(n->queue)
-		list_delete_list(n->queue);
-
-	if(n->key)
-		free(n->key);
-
 	if(n->subnet_tree)
 		free_subnet_tree(n->subnet_tree);
 
@@ -98,7 +90,8 @@ void free_node(node_t *n) {
 
 	sockaddrfree(&n->address);
 
-	EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+	cipher_close(&n->cipher);
+	digest_close(&n->digest);
 
 	event_del(&n->mtuevent);
 	
@@ -114,11 +107,11 @@ void free_node(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;
+	splay_node_t *node, *next;
 	edge_t *e;
 	subnet_t *s;
 
@@ -136,7 +129,7 @@ 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) {
@@ -146,7 +139,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) {
@@ -157,25 +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;
 }