X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=0c9033ca0fb0c4516f9878c64d09b2196f621602;hp=5307ea666dfb996f2c292df06db7b5c48abc87b9;hb=ff946d0423fe547ea42bb11acfb3035c3b8aee4e;hpb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36 diff --git a/src/node.c b/src/node.c index 5307ea66..0c9033ca 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-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,157 +17,190 @@ 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.8 2002/02/10 21:57:54 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#include +#include "system.h" -#include -#include "node.h" +#include "avl_tree.h" +#include "logger.h" #include "net.h" -#include -#include - -#include "system.h" +#include "netutl.h" +#include "node.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 */ +avl_tree_t *node_tree; /* Known nodes, sorted by name */ +avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */ node_t *myself; -int node_compare(node_t *a, node_t *b) +static int node_compare(const node_t *a, const node_t *b) { - return strcmp(a->name, b->name); + return strcmp(a->name, b->name); } -int node_udp_compare(node_t *a, node_t *b) +static int node_udp_compare(const node_t *a, const node_t *b) { - if(a->address < b->address) - return -1; - if (a->address > b->address) - return 1; - if (a->port < b->port) - return -1; - if (a->port > b->port) - return 1; - return (a->name && b->name)?strcmp(a->name, b->name):0; + return sockaddrcmp(&a->address, &b->address); } 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 + 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 exit_nodes(void) { -cp - avl_delete_tree(node_tree); - avl_delete_tree(node_udp_tree); -cp + cp(); + + avl_delete_tree(node_udp_tree); + avl_delete_tree(node_tree); } 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; + node_t *n = xmalloc_and_zero(sizeof(*n)); + + cp(); + + n->subnet_tree = new_subnet_tree(); + n->edge_tree = new_edge_tree(); + EVP_CIPHER_CTX_init(&n->inctx); + EVP_CIPHER_CTX_init(&n->outctx); + n->mtu = MTU; + n->maxmtu = MTU; + + return 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 + cp(); + + if(n->inkey) + free(n->inkey); + + if(n->outkey) + free(n->outkey); + + if(n->subnet_tree) + free_subnet_tree(n->subnet_tree); + + if(n->edge_tree) + free_edge_tree(n->edge_tree); + + sockaddrfree(&n->address); + + EVP_CIPHER_CTX_cleanup(&n->inctx); + EVP_CIPHER_CTX_cleanup(&n->outctx); + + if(n->mtuevent) + event_del(n->mtuevent); + + if(n->hostname) + free(n->hostname); + + if(n->name) + free(n->name); + + free(n); } void node_add(node_t *n) { -cp - avl_insert(node_tree, n); - avl_insert(node_udp_tree, n); -cp + cp(); + + avl_insert(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->subnet_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 + 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 = node->data; + subnet_del(n, s); + } + + for(node = n->edge_tree->head; node; node = next) { + next = node->next; + e = node->data; + edge_del(e); + } + + avl_delete(node_udp_tree, n); + avl_delete(node_tree, n); } node_t *lookup_node(char *name) { - node_t n; -cp - n.name = name; - return avl_search(node_tree, &n); + node_t n = {0}; + + cp(); + + n.name = name; + + return avl_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 avl_search(node_udp_tree, &n); } -node_t *lookup_node_udp(ipv4_t address, port_t port) +void update_node_udp(node_t *n, const sockaddr_t *sa) { - node_t n; -cp - n.name = NULL; - n.address = address; - n.port = port; - return avl_search(node_udp_tree, &n); + avl_delete(node_udp_tree, n); + + if(n->hostname) + free(n->hostname); + + if(sa) { + n->address = *sa; + n->hostname = sockaddr2hostname(&n->address); + avl_delete(node_udp_tree, n); + avl_insert(node_udp_tree, n); + ifdebug(PROTOCOL) 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); + } } 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 port %hd cipher %d digest %d maclength %d options %ld status %04x nexthop %s via %s"), - n->name, n->hostname, n->port, n->cipher?n->cipher->nid:0, n->digest?n->digest->type:0, n->maclength, n->options, - n->status, n->nexthop?n->nexthop->name:"-", n->via?n->via->name:"-"); - } - - syslog(LOG_DEBUG, _("End of nodes.")); -cp + avl_node_t *node; + node_t *n; + + cp(); + + logger(LOG_DEBUG, _("Nodes:")); + + 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->outcipher ? n->outcipher->nid : 0, + n->outdigest ? n->outdigest->type : 0, n->outmaclength, n->outcompression, + n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-", + n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu); + } + + logger(LOG_DEBUG, _("End of nodes.")); }