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.26 2003/07/30 11:50:45 guus Exp $
+ $Id: node.c,v 1.1.2.28 2003/08/28 21:05:10 guus Exp $
*/
#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();
if(n->edge_tree)
free_edge_tree(n->edge_tree);
+ sockaddrfree(&n->address);
+
EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
free(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);
}
logger(LOG_DEBUG, _("Nodes:"));
for(node = node_tree->head; node; node = node->next) {
- n = (node_t *) node->data;
+ 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"),
n->name, n->hostname, n->cipher ? n->cipher->nid : 0,
n->digest ? n->digest->type : 0, n->maclength, n->compression,