X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=740b9448639a9cde7e664634cfc99651ac4620b1;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hp=a66bc177790d4f90dd54edc5edfa62287b8c66a4;hpb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a;p=tinc diff --git a/src/node.c b/src/node.c index a66bc177..740b9448 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,7 @@ /* node.c -- node tree management - Copyright (C) 2001-2002 Guus Sliepen , - 2001-2002 Ivo Timmermans + Copyright (C) 2001-2011 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 @@ -13,161 +13,144 @@ 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: node.c,v 1.1.2.15 2002/09/04 13:48:52 guus Exp $ + 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 "config.h" - -#include -#include +#include "system.h" -#include -#include "node.h" -#include "netutl.h" +#include "control_common.h" +#include "hash.h" +#include "logger.h" #include "net.h" -#include -#include - -#include "system.h" +#include "netutl.h" +#include "node.h" +#include "splay_tree.h" +#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; +static hash_t *node_udp_cache; node_t *myself; -int node_compare(node_t *a, node_t *b) -{ - return strcmp(a->name, b->name); +static int node_compare(const node_t *a, const node_t *b) { + return strcmp(a->name, b->name); } -int node_udp_compare(node_t *a, node_t *b) -{ - int result; -cp - result = sockaddrcmp(&a->address, &b->address); - - if(result) - return result; +void init_nodes(void) { + node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node); + node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t)); +} - return (a->name && b->name)?strcmp(a->name, b->name):0; +void exit_nodes(void) { + hash_free(node_udp_cache); + splay_delete_tree(node_tree); } -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); -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(); + n->mtu = MTU; + n->maxmtu = MTU; + + return n; } -void exit_nodes(void) -{ -cp - avl_delete_tree(node_tree); - avl_delete_tree(node_udp_tree); -cp +void free_node(node_t *n) { + 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); + + if(timeout_initialized(&n->mtuevent)) + event_del(&n->mtuevent); + + if(n->hostname) + free(n->hostname); + + if(n->name) + free(n->name); + + if(n->late) + free(n->late); + + free(n); } -node_t *new_node(void) -{ - node_t *n = (node_t *)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); -cp - return n; +void node_add(node_t *n) { + splay_insert(node_tree, 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); - free(n); -cp +void node_del(node_t *n) { + for splay_each(subnet_t, s, n->subnet_tree) + subnet_del(n, s); + + for splay_each(edge_t, e, n->edge_tree) + edge_del(e); + + splay_delete(node_tree, n); } -void node_add(node_t *n) -{ -cp - avl_insert(node_tree, n); - avl_insert(node_udp_tree, n); -cp +node_t *lookup_node(char *name) { + node_t n = {NULL}; + + n.name = name; + + return splay_search(node_tree, &n); } -void node_del(node_t *n) -{ - avl_node_t *node, *next; - edge_t *e; - subnet_t *s; -cp - for(node = n->subnet_tree->head; node; node = next) - { - next = node->next; - s = (subnet_t *)node->data; - subnet_del(n, s); - } - - for(node = n->edge_tree->head; node; node = next) - { - next = node->next; - e = (edge_t *)node->data; - edge_del(e); - } -cp - avl_delete(node_tree, n); - avl_delete(node_udp_tree, n); -cp +node_t *lookup_node_udp(const sockaddr_t *sa) { + return hash_search(node_udp_cache, sa); } -node_t *lookup_node(char *name) -{ - node_t n; -cp - n.name = name; - return avl_search(node_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; + } + + hash_insert(node_udp_cache, &n->address, NULL); + + if(sa) { + n->address = *sa; + hash_insert(node_udp_cache, sa, n); + free(n->hostname); + n->hostname = sockaddr2hostname(&n->address); + logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname); + } } -node_t *lookup_node_udp(sockaddr_t *sa) -{ - node_t n; -cp - n.address = *sa; - n.name = NULL; +bool dump_nodes(connection_t *c) { + for splay_each(node_t, n, node_tree) + send_request(c, "%d %d %s %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", CONTROL, REQ_DUMP_NODES, + n->name, n->hostname ?: "unknown port unknown", 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, (long)n->last_state_change); - return avl_search(node_udp_tree, &n); + return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES); } -void dump_nodes(void) -{ - avl_node_t *node; - node_t *n; -cp - syslog(LOG_DEBUG, _("Nodes:")); - - for(node = node_tree->head; node; node = node->next) - { - n = (node_t *)node->data; - syslog(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:"-"); - } - - syslog(LOG_DEBUG, _("End of nodes.")); -cp +bool dump_traffic(connection_t *c) { + for splay_each(node_t, n, node_tree) + 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 send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC); }