X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=527970540868007a5296bca04b0d8e2a277b5cf8;hb=2956559f7d12caa9779207525419801e0e9ab3e3;hp=6df236a1a76681ffa5cf1ce8ef47b775acac7625;hpb=4124b9682f8f890acb25d0c92f2583eef670274a;p=meshlink diff --git a/src/node.c b/src/node.c index 6df236a1..52797054 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,6 @@ /* node.c -- node tree management - Copyright (C) 2001-2009 Guus Sliepen , - 2001-2005 Ivo Timmermans + Copyright (C) 2014 Guus Sliepen , 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 @@ -13,25 +12,24 @@ 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 "splay_tree.h" +#include "hash.h" #include "logger.h" #include "net.h" #include "netutl.h" #include "node.h" +#include "splay_tree.h" #include "utils.h" #include "xalloc.h" -splay_tree_t *node_tree; /* Known nodes, sorted by name */ -splay_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ +splay_tree_t *node_tree; +static hash_t *node_udp_cache; node_t *myself; @@ -39,39 +37,20 @@ 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) { - int result; - - cp(); - - result = sockaddrcmp(&a->address, &b->address); - - if(result) - return result; - - return (a->name && b->name) ? strcmp(a->name, b->name) : 0; -} - void init_nodes(void) { - cp(); - 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); + node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t)); } void exit_nodes(void) { - cp(); - - splay_delete_tree(node_udp_tree); + hash_free(node_udp_cache); splay_delete_tree(node_tree); } node_t *new_node(void) { - node_t *n = xmalloc_and_zero(sizeof *n); - - cp(); + node_t *n = xzalloc(sizeof *n); - n->subnet_tree = new_subnet_tree(); + if(replaywin) n->late = xzalloc(replaywin); n->edge_tree = new_edge_tree(); n->mtu = MTU; n->maxmtu = MTU; @@ -80,116 +59,71 @@ node_t *new_node(void) { } void free_node(node_t *n) { - cp(); - - if(n->subnet_tree) - free_subnet_tree(n->subnet_tree); - if(n->edge_tree) free_edge_tree(n->edge_tree); sockaddrfree(&n->address); - cipher_close(&n->incipher); - digest_close(&n->indigest); - cipher_close(&n->outcipher); - digest_close(&n->outdigest); + ecdsa_free(n->ecdsa); + sptps_stop(&n->sptps); + + timeout_del(&n->mtutimeout); - event_del(&n->mtuevent); - if(n->hostname) free(n->hostname); if(n->name) free(n->name); + if(n->late) + free(n->late); + free(n); } void node_add(node_t *n) { - cp(); - splay_insert(node_tree, n); } 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; - subnet_del(n, s); - } - - for(node = n->edge_tree->head; node; node = next) { - next = node->next; - e = node->data; + for splay_each(edge_t, e, n->edge_tree) edge_del(e); - } splay_delete(node_tree, n); - splay_delete(node_udp_tree, n); } node_t *lookup_node(char *name) { - node_t n = {0}; + node_t n = {NULL}; - cp(); - n.name = name; return splay_search(node_tree, &n); } node_t *lookup_node_udp(const sockaddr_t *sa) { - node_t n = {0}; - - cp(); - - n.address = *sa; - n.name = NULL; - - return splay_search(node_udp_tree, &n); + return hash_search(node_udp_cache, sa); } -void update_node_udp(node_t *n, const sockaddr_t *sa) -{ - splay_delete(node_udp_tree, n); +void update_node_udp(node_t *n, const sockaddr_t *sa) { + if(n == myself) { + logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of myself!"); + return; + } - if(n->hostname) - free(n->hostname); + hash_insert(node_udp_cache, &n->address, NULL); if(sa) { n->address = *sa; + n->sock = 0; + for(int i = 0; i < listen_sockets; i++) { + if(listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) { + n->sock = i; + break; + } + } + hash_insert(node_udp_cache, sa, n); + free(n->hostname); n->hostname = sockaddr2hostname(&n->address); - splay_delete(node_udp_tree, n); - 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); - logger(LOG_DEBUG, "UDP address of %s cleared", n->name); - } -} - -int dump_nodes(struct evbuffer *out) { - splay_node_t *node; - node_t *n; - - cp(); - - for(node = node_tree->head; node; node = node->next) { - 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, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-", - n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu) == -1) - return errno; + logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname); } - - return 0; }