X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=adc3a74de9ee3c39edca7ba5881e1fef9334172a;hp=591f4ed50dab08378f18e61f43d51e473992a0b4;hb=d134c4542d4e890e1c1007f32b866742319853c5;hpb=856de4c5fe8acd779aa9277d4554e34ff3625e97 diff --git a/src/node.c b/src/node.c index 591f4ed5..adc3a74d 100644 --- a/src/node.c +++ b/src/node.c @@ -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.13 2002/06/21 10:11:13 guus Exp $ + $Id: node.c,v 1.1.2.14 2002/09/03 20:43:25 guus Exp $ */ #include "config.h" @@ -77,7 +77,6 @@ node_t *new_node(void) node_t *n = (node_t *)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); cp return n; @@ -96,8 +95,6 @@ cp free(n->key); if(n->subnet_tree) free_subnet_tree(n->subnet_tree); - if(n->edge_tree) - free_edge_tree(n->edge_tree); free(n); cp } @@ -113,7 +110,6 @@ cp void node_del(node_t *n) { avl_node_t *node, *next; - edge_t *e; subnet_t *s; cp for(node = n->subnet_tree->head; node; node = next) @@ -122,13 +118,6 @@ cp s = (subnet_t *)node->data; subnet_del(n, s); } - - for(node = n->edge_tree->head; node; node = next) - { - next = node->next; - e = (edge_t *)node->data; - edge_del(e); - } cp avl_delete(node_tree, n); avl_delete(node_udp_tree, n); @@ -163,9 +152,9 @@ cp for(node = node_tree->head; node; node = node->next) { n = (node_t *)node->data; - syslog(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"), + syslog(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s distance %d"), n->name, n->hostname, n->cipher?n->cipher->nid:0, n->digest?n->digest->type:0, n->maclength, n->compression, n->options, - n->status, n->nexthop?n->nexthop->name:"-", n->via?n->via->name:"-"); + n->status, n->nexthop?n->nexthop->name:"-", n->distance); } syslog(LOG_DEBUG, _("End of nodes."));