X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnode.c;h=ebd2c7c2c9421d56c1225c89c95f7d593189c278;hp=0401144f43c039b924665693d691d2fb432739e1;hb=075e6828a7533e7daa790225f17aa6bb39703278;hpb=83263b74460656ba557fd9bb84dc27258549e9cd diff --git a/src/node.c b/src/node.c index 0401144f..ebd2c7c2 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,7 @@ /* node.c -- node tree management - Copyright (C) 2001-2003 Guus Sliepen , - 2001-2003 Ivo Timmermans + Copyright (C) 2001-2009 Guus Sliepen , + 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 @@ -17,12 +17,12 @@ 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" -#include "avl_tree.h" +#include "splay_tree.h" #include "logger.h" #include "net.h" #include "netutl.h" @@ -30,18 +30,16 @@ #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 */ +splay_tree_t *node_tree; /* Known nodes, sorted by name */ +splay_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ node_t *myself; -static int node_compare(const node_t *a, const node_t *b) -{ +static int node_compare(const node_t *a, const node_t *b) { return strcmp(a->name, b->name); } -static int node_udp_compare(const node_t *a, const node_t *b) -{ +static int node_udp_compare(const node_t *a, const node_t *b) { int result; cp(); @@ -54,74 +52,68 @@ static int node_udp_compare(const node_t *a, const node_t *b) return (a->name && b->name) ? strcmp(a->name, b->name) : 0; } -void init_nodes(void) -{ +void init_nodes(void) { cp(); - node_tree = avl_alloc_tree((avl_compare_t) node_compare, NULL); - node_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL); + node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node); + node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL); } -void exit_nodes(void) -{ +void exit_nodes(void) { cp(); - avl_delete_tree(node_tree); - avl_delete_tree(node_udp_tree); + splay_delete_tree(node_udp_tree); + splay_delete_tree(node_tree); } -node_t *new_node(void) -{ - node_t *n = (node_t *) xmalloc_and_zero(sizeof(*n)); +node_t *new_node(void) { + node_t *n = xmalloc_and_zero(sizeof *n); cp(); 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); + n->mtu = MTU; + n->maxmtu = MTU; return n; } -void free_node(node_t *n) -{ +void free_node(node_t *n) { cp(); - 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->subnet_tree) free_subnet_tree(n->subnet_tree); if(n->edge_tree) free_edge_tree(n->edge_tree); - EVP_CIPHER_CTX_cleanup(&n->packet_ctx); + sockaddrfree(&n->address); + + cipher_close(&n->incipher); + digest_close(&n->indigest); + cipher_close(&n->outcipher); + digest_close(&n->outdigest); + + event_del(&n->mtuevent); + if(n->hostname) + free(n->hostname); + + if(n->name) + free(n->name); + free(n); } -void node_add(node_t *n) -{ +void node_add(node_t *n) { cp(); - avl_insert(node_tree, n); - avl_insert(node_udp_tree, n); + splay_insert(node_tree, n); } -void node_del(node_t *n) -{ - avl_node_t *node, *next; +void node_del(node_t *n) { + splay_node_t *node, *next; edge_t *e; subnet_t *s; @@ -129,60 +121,75 @@ 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); + splay_delete(node_udp_tree, n); + splay_delete(node_tree, n); } -node_t *lookup_node(const char *name) -{ - node_t n = { - .name = name, - }; +node_t *lookup_node(char *name) { + node_t n = {0}; cp(); - return avl_search(node_tree, &n); + n.name = name; + + return splay_search(node_tree, &n); } -node_t *lookup_node_udp(const sockaddr_t *sa) -{ - node_t n = { - .address = *sa, - .name = NULL, - }; +node_t *lookup_node_udp(const sockaddr_t *sa) { + node_t n = {0}; cp(); - return avl_search(node_udp_tree, &n); + n.address = *sa; + n.name = NULL; + + return splay_search(node_udp_tree, &n); } -void dump_nodes(void) +void update_node_udp(node_t *n, const sockaddr_t *sa) { - avl_node_t *node; + splay_delete(node_udp_tree, n); + + if(n->hostname) + free(n->hostname); + + if(sa) { + n->address = *sa; + n->hostname = sockaddr2hostname(&n->address); + splay_insert(node_udp_tree, n); + logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname); + } else { + memset(&n->address, 0, sizeof n->address); + n->hostname = 0; + ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name); + } +} + +int dump_nodes(struct evbuffer *out) { + splay_node_t *node; node_t *n; cp(); - 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->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 = node->data; + if(evbuffer_add_printf(out, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n"), + n->name, n->hostname, cipher_get_nid(&n->outcipher), + digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression, + n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-", + n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu) == -1) + return errno; } - logger(LOG_DEBUG, _("End of nodes.")); + return 0; }