X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.c;h=f2bb39907188c97ff365565ca029859288668a5b;hp=6dba7f2814d20dd3e8cc0262a5d8068bd7c930ae;hb=5a7fc58012da10b96073804994777255463d1b8d;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a diff --git a/src/node.c b/src/node.c index 6dba7f28..f2bb3990 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,7 @@ /* node.c -- node tree management - Copyright (C) 2001-2003 Guus Sliepen , - 2001-2003 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,53 +17,39 @@ 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.22 2003/07/12 17:41:46 guus Exp $ + $Id$ */ -#include "config.h" - -#include +#include "system.h" -#include -#include "node.h" -#include "netutl.h" -#include "net.h" +#include "avl_tree.h" #include "logger.h" - -#include -#include - -#include "system.h" +#include "net.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 */ node_t *myself; -static 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); } -static int node_udp_compare(node_t *a, 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) - return result; - - 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_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); } @@ -71,20 +57,22 @@ void exit_nodes(void) { cp(); - avl_delete_tree(node_tree); 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)); + node_t *n = 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); - EVP_CIPHER_CTX_init(&n->packet_ctx); + EVP_CIPHER_CTX_init(&n->inctx); + EVP_CIPHER_CTX_init(&n->outctx); + n->mtu = MTU; + n->maxmtu = MTU; return n; } @@ -93,17 +81,11 @@ 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->inkey) + free(n->inkey); - if(n->key) - free(n->key); + if(n->outkey) + free(n->outkey); if(n->subnet_tree) free_subnet_tree(n->subnet_tree); @@ -111,8 +93,20 @@ void free_node(node_t *n) if(n->edge_tree) free_edge_tree(n->edge_tree); - EVP_CIPHER_CTX_cleanup(&n->packet_ctx); + 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); } @@ -121,7 +115,6 @@ void node_add(node_t *n) cp(); avl_insert(node_tree, n); - avl_insert(node_udp_tree, n); } void node_del(node_t *n) @@ -134,38 +127,63 @@ void node_del(node_t *n) for(node = n->subnet_tree->head; node; node = next) { next = node->next; - s = (subnet_t *) node->data; + s = node->data; subnet_del(n, s); } for(node = n->edge_tree->head; node; node = next) { next = node->next; - e = (edge_t *) node->data; + e = node->data; edge_del(e); } - avl_delete(node_tree, n); avl_delete(node_udp_tree, n); + avl_delete(node_tree, n); } node_t *lookup_node(char *name) { - node_t n; + node_t n = {0}; + cp(); + n.name = name; + return avl_search(node_tree, &n); } -node_t *lookup_node_udp(sockaddr_t *sa) +node_t *lookup_node_udp(const sockaddr_t *sa) { - node_t n; + node_t n = {0}; + cp(); + n.address = *sa; n.name = NULL; return avl_search(node_udp_tree, &n); } +void update_node_udp(node_t *n, const sockaddr_t *sa) +{ + 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; @@ -176,12 +194,12 @@ void dump_nodes(void) logger(LOG_DEBUG, _("Nodes:")); for(node = node_tree->head; node; node = node->next) { - n = (node_t *) node->data; - logger(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 : "-"); + 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, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-", + n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu); } logger(LOG_DEBUG, _("End of nodes."));