/*
node.c -- node tree management
- Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
- 2001-2003 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+ 2001-2005 Ivo Timmermans
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.24 2003/07/24 12:08:15 guus Exp $
+ $Id$
*/
#include "system.h"
{
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)
{
- node_t *n = (node_t *) xmalloc_and_zero(sizeof(*n));
+ node_t *n = xmalloc_and_zero(sizeof(*n));
cp();
n->edge_tree = new_edge_tree();
n->queue = list_alloc((list_action_t) free);
EVP_CIPHER_CTX_init(&n->packet_ctx);
+ n->mtu = MTU;
+ n->maxmtu = MTU;
return n;
}
if(n->queue)
list_delete_list(n->queue);
- if(n->name)
- free(n->name);
-
- if(n->hostname)
- free(n->hostname);
-
if(n->key)
free(n->key);
if(n->edge_tree)
free_edge_tree(n->edge_tree);
+ sockaddrfree(&n->address);
+
EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+
+ if(n->mtuevent) {
+ tevent_del(n->mtuevent);
+ free_tevent(n->mtuevent);
+ }
+ if(n->hostname)
+ free(n->hostname);
+
+ if(n->name)
+ free(n->name);
+
free(n);
}
cp();
avl_insert(node_tree, n);
- avl_insert(node_udp_tree, n);
}
void node_del(node_t *n)
for(node = n->subnet_tree->head; node; node = next) {
next = node->next;
- s = (subnet_t *) node->data;
+ s = node->data;
subnet_del(n, s);
}
for(node = n->edge_tree->head; node; node = next) {
next = node->next;
- e = (edge_t *) node->data;
+ e = node->data;
edge_del(e);
}
avl_delete(node_tree, n);
- avl_delete(node_udp_tree, n);
}
-node_t *lookup_node(const char *name)
+node_t *lookup_node(char *name)
{
- node_t n = {
- .name = name,
- };
+ node_t n = {0};
cp();
+ n.name = name;
+
return avl_search(node_tree, &n);
}
node_t *lookup_node_udp(const sockaddr_t *sa)
{
- node_t n = {
- .address = *sa,
- .name = NULL,
- };
+ node_t n = {0};
cp();
+ n.address = *sa;
+ n.name = NULL;
+
return avl_search(node_udp_tree, &n);
}
logger(LOG_DEBUG, _("Nodes:"));
for(node = node_tree->head; node; node = node->next) {
- n = (node_t *) node->data;
- logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"),
+ n = node->data;
+ logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %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->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
+ n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
}
logger(LOG_DEBUG, _("End of nodes."));