X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=862bd69693ca9707e2ebd01076806e0e1bec43cf;hb=886a6f61a1f4cc48a77b42d10f34f9126377d904;hp=20453612dd10efb23bc0af68e0d3a584992b0ac2;hpb=503c32eb0ef9d6329e931559082f4ddf6d487dc6;p=meshlink diff --git a/src/node.c b/src/node.c index 20453612..862bd696 100644 --- a/src/node.c +++ b/src/node.c @@ -1,6 +1,6 @@ /* node.c -- node tree management - Copyright (C) 2001-2006 Guus Sliepen , + Copyright (C) 2001-2009 Guus Sliepen , 2001-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -13,16 +13,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" -#include "avl_tree.h" +#include "control_common.h" +#include "splay_tree.h" #include "logger.h" #include "net.h" #include "netutl.h" @@ -30,22 +29,18 @@ #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(); - result = sockaddrcmp(&a->address, &b->address); if(result) @@ -54,44 +49,29 @@ 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) -{ - cp(); - - 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); +void init_nodes(void) { + 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) -{ - cp(); - - avl_delete_tree(node_udp_tree); - avl_delete_tree(node_tree); +void exit_nodes(void) { + splay_delete_tree(node_udp_tree); + splay_delete_tree(node_tree); } -node_t *new_node(void) -{ - node_t *n = xmalloc_and_zero(sizeof(*n)); - - cp(); +node_t *new_node(void) { + node_t *n = xmalloc_and_zero(sizeof *n); + if(replaywin) n->late = xmalloc_and_zero(replaywin); n->subnet_tree = new_subnet_tree(); n->edge_tree = new_edge_tree(); - EVP_CIPHER_CTX_init(&n->packet_ctx); n->mtu = MTU; n->maxmtu = MTU; return n; } -void free_node(node_t *n) -{ - cp(); - - if(n->key) - free(n->key); - +void free_node(node_t *n) { if(n->subnet_tree) free_subnet_tree(n->subnet_tree); @@ -100,10 +80,12 @@ void free_node(node_t *n) sockaddrfree(&n->address); - EVP_CIPHER_CTX_cleanup(&n->packet_ctx); + cipher_close(&n->incipher); + digest_close(&n->indigest); + cipher_close(&n->outcipher); + digest_close(&n->outdigest); - if(n->mtuevent) - event_del(n->mtuevent); + event_del(&n->mtuevent); if(n->hostname) free(n->hostname); @@ -111,24 +93,21 @@ void free_node(node_t *n) if(n->name) free(n->name); + if(n->late) + free(n->late); + free(n); } -void node_add(node_t *n) -{ - cp(); - - avl_insert(node_tree, n); +void node_add(node_t *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; - cp(); - for(node = n->subnet_tree->head; node; node = next) { next = node->next; s = node->data; @@ -141,49 +120,57 @@ void node_del(node_t *n) edge_del(e); } - avl_delete(node_tree, n); + splay_delete(node_udp_tree, n); + splay_delete(node_tree, n); } -node_t *lookup_node(char *name) -{ +node_t *lookup_node(char *name) { node_t n = {0}; - cp(); - n.name = name; - return avl_search(node_tree, &n); + return splay_search(node_tree, &n); } -node_t *lookup_node_udp(const sockaddr_t *sa) -{ +node_t *lookup_node_udp(const sockaddr_t *sa) { node_t n = {0}; - cp(); - n.address = *sa; n.name = NULL; - return avl_search(node_udp_tree, &n); + return splay_search(node_udp_tree, &n); } -void dump_nodes(void) -{ - avl_node_t *node; - node_t *n; +void update_node_udp(node_t *n, const sockaddr_t *sa) { + splay_delete(node_udp_tree, n); - cp(); + if(n->hostname) + free(n->hostname); - logger(LOG_DEBUG, _("Nodes:")); + 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); + } +} + +bool dump_nodes(connection_t *c) { + splay_node_t *node; + node_t *n; for(node = node_tree->head; node; node = node->next) { 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, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-", - n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu); + send_request(c, "%d %d %s at %s cipher %d digest %d maclength %zd compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)", CONTROL, REQ_DUMP_NODES, + 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); } - logger(LOG_DEBUG, _("End of nodes.")); + return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES); }