X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=cbafe712c9840d62b3c59ca726a740e5e4acee47;hb=40731d030fef793c6b6405efd9b3e64c26c00045;hp=4b21d5baf99e80eed07dd3692934bf796b83df34;hpb=6d41b429a26dd1acaa7c56b2124f2daf55b5b97c;p=tinc

diff --git a/src/node.c b/src/node.c
index 4b21d5ba..cbafe712 100644
--- a/src/node.c
+++ b/src/node.c
@@ -1,7 +1,7 @@
 /*
     node.c -- node tree management
-    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,12 +17,12 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.c,v 1.1.2.30 2003/12/20 21:25:17 guus Exp $
+    $Id$
 */
 
 #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,24 +52,21 @@ 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 *new_node(void) {
 	node_t *n = xmalloc_and_zero(sizeof(*n));
 
 	cp();
@@ -81,23 +76,17 @@ node_t *new_node(void)
 	n->queue = list_alloc((list_action_t) free);
 	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->queue)
 		list_delete_list(n->queue);
 
-	if(n->name)
-		free(n->name);
-
-	if(n->hostname)
-		free(n->hostname);
-
 	if(n->key)
 		free(n->key);
 
@@ -110,21 +99,26 @@ void free_node(node_t *n)
 	sockaddrfree(&n->address);
 
 	EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+
+	event_del(&n->mtuevent);
 	
+	if(n->hostname)
+		free(n->hostname);
+
+	if(n->name)
+		free(n->name);
+
 	free(n);
 }
 
-void node_add(node_t *n)
-{
+void node_add(node_t *n) {
 	cp();
 
-	avl_insert(node_tree, n);
-	avl_insert(node_udp_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;
 
@@ -142,23 +136,20 @@ void node_del(node_t *n)
 		edge_del(e);
 	}
 
-	avl_delete(node_tree, n);
-	avl_delete(node_udp_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();
@@ -166,12 +157,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 dump_nodes(void)
-{
-	avl_node_t *node;
+void dump_nodes(void) {
+	splay_node_t *node;
 	node_t *n;
 
 	cp();
@@ -180,11 +170,11 @@ void dump_nodes(void)
 
 	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 probedmtu %d"),
+		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,
 			   n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
-			   n->via ? n->via->name : "-", n->probedmtu);
+			   n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
 	}
 
 	logger(LOG_DEBUG, _("End of nodes."));