projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce KEY_CHANGED traffic.
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
6e3b0f9
..
adc3a74
100644
(file)
--- a/
src/node.c
+++ b/
src/node.c
@@
-1,7
+1,7
@@
/*
node.c -- node tree management
/*
node.c -- node tree management
- Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.
warande.net
>,
- 2001-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>
+ Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.
eu.org
>,
+ 2001-2002 Ivo Timmermans <i
vo@o2w.nl
>
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
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.
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.1
0 2002/02/18 16:25:16
guus Exp $
+ $Id: node.c,v 1.1.2.1
4 2002/09/03 20:43:25
guus Exp $
*/
#include "config.h"
*/
#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();
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;
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);
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
}
free(n);
cp
}
@@
-113,7
+110,6
@@
cp
void node_del(node_t *n)
{
avl_node_t *node, *next;
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)
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);
}
s = (subnet_t *)node->data;
subnet_del(n, s);
}
-
- for(node = n->subnet_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);
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;
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 %l
d status %04x nexthop %s via %s
"),
+ syslog(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %l
x 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->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."));
}
syslog(LOG_DEBUG, _("End of nodes."));