projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More updates to protocol handlers and reimplemented terminate_connection().
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
3776d18
..
95a1d4f
100644
(file)
--- 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.
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.
3 2001/10/27 13:13:35
guus Exp $
+ $Id: node.c,v 1.1.2.
5 2001/10/30 12:59:12
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-43,7
+43,7
@@
int node_compare(node_t *a, node_t *b)
return strcmp(a->name, b->name);
}
return strcmp(a->name, b->name);
}
-int node_udp_compare(
connection_t *a, connection
_t *b)
+int node_udp_compare(
node_t *a, node
_t *b)
{
if(a->address < b->address)
return -1;
{
if(a->address < b->address)
return -1;
@@
-73,7
+73,8
@@
node_t *new_node(void)
{
node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
cp
{
node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
cp
- n->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+ 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;
@@
-90,6
+91,10
@@
cp
free(n->hostname);
if(n->key)
free(n->key);
free(n->hostname);
if(n->key)
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
}
@@
-137,9
+142,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 port %hd options %ld status %04x"),
+ syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld status %04x
nexthop %s via %s
"),
n->name, n->hostname, n->port, n->options,
n->name, n->hostname, n->port, n->options,
- n->status);
+ n->status
, n->nexthop->name, n->via->name
);
}
syslog(LOG_DEBUG, _("End of nodes."));
}
syslog(LOG_DEBUG, _("End of nodes."));