X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=18a02a4ccf0c0355a60f35ec75b476097df04ccc;hb=19be9cf7150858311f7898fa3fb525d692d02f64;hp=0960ca761c32595b940103091459c0a8ec852090;hpb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;p=meshlink diff --git a/src/node.c b/src/node.c index 0960ca76..18a02a4c 100644 --- a/src/node.c +++ b/src/node.c @@ -1,6 +1,6 @@ /* node.c -- node tree management - Copyright (C) 2001-2006 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,15 +13,14 @@ 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 "control_common.h" #include "splay_tree.h" #include "logger.h" #include "net.h" @@ -42,8 +41,6 @@ static int node_compare(const node_t *a, const 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) @@ -53,28 +50,21 @@ static int node_udp_compare(const node_t *a, const node_t *b) { } 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); } void exit_nodes(void) { - cp(); - splay_delete_tree(node_udp_tree); splay_delete_tree(node_tree); } node_t *new_node(void) { - node_t *n = xmalloc_and_zero(sizeof(*n)); - - cp(); + 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->queue = list_alloc((list_action_t) free); - EVP_CIPHER_CTX_init(&n->packet_ctx); n->mtu = MTU; n->maxmtu = MTU; @@ -82,14 +72,6 @@ node_t *new_node(void) { } void free_node(node_t *n) { - cp(); - - if(n->queue) - list_delete_list(n->queue); - - if(n->key) - free(n->key); - if(n->subnet_tree) free_subnet_tree(n->subnet_tree); @@ -98,9 +80,16 @@ void free_node(node_t *n) { sockaddrfree(&n->address); - EVP_CIPHER_CTX_cleanup(&n->packet_ctx); + cipher_close(&n->incipher); + digest_close(&n->indigest); + cipher_close(&n->outcipher); + digest_close(&n->outdigest); - event_del(&n->mtuevent); + ecdh_free(&n->ecdh); + ecdsa_free(&n->ecdsa); + + if(timeout_initialized(&n->mtuevent)) + event_del(&n->mtuevent); if(n->hostname) free(n->hostname); @@ -108,12 +97,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); } @@ -122,8 +112,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; @@ -136,23 +124,20 @@ void node_del(node_t *n) { edge_del(e); } + splay_delete(node_udp_tree, n); splay_delete(node_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(); + node_t n = {NULL}; n.address = *sa; n.name = NULL; @@ -160,21 +145,54 @@ node_t *lookup_node_udp(const sockaddr_t *sa) { return splay_search(node_udp_tree, &n); } -int dump_nodes(struct evbuffer *out) { +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; + } + + splay_delete(node_udp_tree, n); + + if(n->hostname) + free(n->hostname); + + if(sa) { + n->address = *sa; + n->hostname = sockaddr2hostname(&n->address); + splay_insert(node_udp_tree, n); + 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); + } +} + +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 pmtu %d (min %d max %d)\n"), - n->name, n->hostname, n->cipher ? n->cipher->nid : 0, - n->digest ? n->digest->type : 0, n->maclength, n->compression, - n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-", - n->via ? n->via->name : "-", 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); }