/*
node.c -- node tree management
- Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
- 2001-2002 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
+ 2001-2003 Ivo Timmermans <ivo@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
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.18 2002/09/09 22:32:49 guus Exp $
+ $Id: node.c,v 1.1.2.27 2003/08/22 11:18:42 guus Exp $
*/
-#include "config.h"
-
-#include <string.h>
-#include <syslog.h>
+#include "system.h"
-#include <avl_tree.h>
-#include "node.h"
-#include "netutl.h"
+#include "avl_tree.h"
+#include "logger.h"
#include "net.h"
-#include <utils.h>
-#include <xalloc.h>
-
-#include "system.h"
+#include "netutl.h"
+#include "node.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)
+static int node_compare(const node_t *a, const node_t *b)
{
return strcmp(a->name, b->name);
}
-int node_udp_compare(node_t *a, node_t *b)
+static int node_udp_compare(const node_t *a, const node_t *b)
{
int result;
{
cp();
- node_tree = avl_alloc_tree((avl_compare_t) node_compare, NULL);
+ node_tree = avl_alloc_tree((avl_compare_t) node_compare, (avl_action_t) free_node);
node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL);
}
{
cp();
- avl_delete_tree(node_tree);
avl_delete_tree(node_udp_tree);
+ avl_delete_tree(node_tree);
}
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);
return n;
}
if(n->edge_tree)
free_edge_tree(n->edge_tree);
+ sockaddrfree(&n->address);
+
+ EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+
free(n);
}
node_t *lookup_node(char *name)
{
- node_t n;
+ node_t n = {0};
+
cp();
+
n.name = name;
+
return avl_search(node_tree, &n);
}
-node_t *lookup_node_udp(sockaddr_t *sa)
+node_t *lookup_node_udp(const sockaddr_t *sa)
{
- node_t n;
+ node_t n = {0};
+
cp();
+
n.address = *sa;
n.name = NULL;
cp();
- syslog(LOG_DEBUG, _("Nodes:"));
+ logger(LOG_DEBUG, _("Nodes:"));
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"),
+ logger(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->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
n->via ? n->via->name : "-");
}
- syslog(LOG_DEBUG, _("End of nodes."));
+ logger(LOG_DEBUG, _("End of nodes."));
}