X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=debc91552ef8b31e8d546b72dc1abe91a657149a;hb=90f1cba1fd9e748ec4b8274511d5a36ec1a24d9d;hp=80d28d64112c8cc49e1ad3616b4fb06cb432c463;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b;p=tinc diff --git a/src/node.c b/src/node.c index 80d28d64..debc9155 100644 --- a/src/node.c +++ b/src/node.c @@ -1,6 +1,6 @@ /* node.c -- node tree management - Copyright (C) 2001-2009 Guus Sliepen , + Copyright (C) 2001-2011 Guus Sliepen , 2001-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -13,25 +13,25 @@ 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 "control_common.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 */ +static hash_t *node_udp_cache; node_t *myself; @@ -39,38 +39,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(); - + if(replaywin) n->late = xmalloc_and_zero(replaywin); n->subnet_tree = new_subnet_tree(); n->edge_tree = new_edge_tree(); n->mtu = MTU; @@ -80,8 +62,6 @@ node_t *new_node(void) { } void free_node(node_t *n) { - cp(); - if(n->subnet_tree) free_subnet_tree(n->subnet_tree); @@ -90,10 +70,16 @@ void free_node(node_t *n) { sockaddrfree(&n->address); - cipher_close(&n->cipher); - digest_close(&n->digest); + cipher_close(&n->incipher); + digest_close(&n->indigest); + cipher_close(&n->outcipher); + digest_close(&n->outdigest); + + ecdsa_free(&n->ecdsa); + sptps_stop(&n->sptps); - event_del(&n->mtuevent); + if(timeout_initialized(&n->mtuevent)) + event_del(&n->mtuevent); if(n->hostname) free(n->hostname); @@ -101,12 +87,13 @@ 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(); - splay_insert(node_tree, n); } @@ -115,8 +102,6 @@ void node_del(node_t *n) { edge_t *e; subnet_t *s; - cp(); - for(node = n->subnet_tree->head; node; node = next) { next = node->next; s = node->data; @@ -133,41 +118,65 @@ void node_del(node_t *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}; + return hash_search(node_udp_cache, sa); +} - cp(); +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; + } - n.address = *sa; - n.name = NULL; + if(n->hostname) + free(n->hostname); - return splay_search(node_udp_tree, &n); + hash_insert(node_udp_cache, &n->address, NULL); + + if(sa) { + n->address = *sa; + hash_insert(node_udp_cache, sa, n); + n->hostname = sockaddr2hostname(&n->address); + logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname); + } else { + memset(&n->address, 0, sizeof n->address); + n->hostname = NULL; + logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s cleared", n->name); + } } -int dump_nodes(struct evbuffer *out) { +bool dump_nodes(connection_t *c) { splay_node_t *node; node_t *n; - cp(); + for(node = node_tree->head; node; node = node->next) { + n = node->data; + send_request(c, "%d %d %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)", CONTROL, REQ_DUMP_NODES, + n->name, n->hostname, cipher_get_nid(&n->outcipher), + digest_get_nid(&n->outdigest), (int)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); + } + + return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES); +} + +bool dump_traffic(connection_t *c) { + splay_node_t *node; + node_t *n; 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->cipher), - digest_get_nid(&n->digest), n->maclength, n->compression, - 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; + send_request(c, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_TRAFFIC, + n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes); } - return 0; + return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC); }