/*
node.c -- node tree management
- Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
- 2001 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.warande.net>,
+ 2001-2002 Ivo Timmermans <itimmermans@bigfoot.com>
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
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.2 2001/10/27 12:13:17 guus Exp $
+ $Id: node.c,v 1.1.2.11 2002/03/22 13:31:18 guus Exp $
*/
#include "config.h"
#include <avl_tree.h>
#include "node.h"
+#include "netutl.h"
#include "net.h"
#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 */
+node_t *myself;
+
int node_compare(node_t *a, node_t *b)
{
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;
- else if (a->address > b->address)
- return 1;
- else
- return a->port - b->port;
+ int result;
+cp
+ result = sockaddrcmp(&a->address, &b->address);
+
+ if(result)
+ return result;
+
+ return (a->name && b->name)?strcmp(a->name, b->name):0;
}
void init_nodes(void)
{
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;
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
}
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)
+ {
+ next = node->next;
+ 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);
return avl_search(node_tree, &n);
}
-node_t *lookup_node_udp(ipv4_t address, port_t port)
+node_t *lookup_node_udp(sockaddr_t *sa)
{
node_t n;
cp
- n.address = address;
- n.port = port;
+ n.address = *sa;
+ n.name = NULL;
+
return avl_search(node_udp_tree, &n);
}
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"),
- n->name, n->hostname, n->port, n->options,
- n->status);
+ syslog(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"),
+ 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:"-");
}
syslog(LOG_DEBUG, _("End of nodes."));