X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=20453612dd10efb23bc0af68e0d3a584992b0ac2;hp=4b21d5baf99e80eed07dd3692934bf796b83df34;hb=503c32eb0ef9d6329e931559082f4ddf6d487dc6;hpb=6d41b429a26dd1acaa7c56b2124f2daf55b5b97c diff --git a/src/node.c b/src/node.c index 4b21d5ba..20453612 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,7 @@ /* node.c -- node tree management - Copyright (C) 2001-2003 Guus Sliepen , - 2001-2003 Ivo Timmermans + Copyright (C) 2001-2006 Guus Sliepen , + 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,7 +17,7 @@ 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" @@ -78,9 +78,9 @@ node_t *new_node(void) 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; return n; } @@ -89,15 +89,6 @@ 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,7 +101,16 @@ void free_node(node_t *n) sockaddrfree(&n->address); EVP_CIPHER_CTX_cleanup(&n->packet_ctx); + + if(n->mtuevent) + event_del(n->mtuevent); + if(n->hostname) + free(n->hostname); + + if(n->name) + free(n->name); + free(n); } @@ -119,7 +119,6 @@ void node_add(node_t *n) cp(); avl_insert(node_tree, n); - avl_insert(node_udp_tree, n); } void node_del(node_t *n) @@ -143,7 +142,6 @@ void node_del(node_t *n) } avl_delete(node_tree, n); - avl_delete(node_udp_tree, n); } node_t *lookup_node(char *name) @@ -180,11 +178,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."));