X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnode.c;h=b8caed6c7e06ca182f671fd046f8be4d44d76611;hp=e67b9b97fd51fe8b556bdecb125be1ff518777a1;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=70a1a5594af5d4e6a364186b42ba4e34c676009b diff --git a/src/node.c b/src/node.c index e67b9b97..b8caed6c 100644 --- a/src/node.c +++ b/src/node.c @@ -1,7 +1,6 @@ /* node.c -- node tree management - Copyright (C) 2001-2012 Guus Sliepen , - 2001-2005 Ivo Timmermans + Copyright (C) 2014 Guus Sliepen , 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 @@ -20,9 +19,9 @@ #include "system.h" -#include "control_common.h" #include "hash.h" #include "logger.h" +#include "meshlink_internal.h" #include "net.h" #include "netutl.h" #include "node.h" @@ -30,127 +29,147 @@ #include "utils.h" #include "xalloc.h" -splay_tree_t *node_tree; -static hash_t *node_udp_cache; - -node_t *myself; - static int node_compare(const node_t *a, const node_t *b) { return strcmp(a->name, b->name); } -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)); +void init_nodes(meshlink_handle_t *mesh) { + mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node); + mesh->node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t)); } -void exit_nodes(void) { - hash_free(node_udp_cache); - splay_delete_tree(node_tree); +void exit_nodes(meshlink_handle_t *mesh) { + if(mesh->node_udp_cache) { + hash_free(mesh->node_udp_cache); + } + + if(mesh->nodes) { + splay_delete_tree(mesh->nodes); + } + + mesh->node_udp_cache = NULL; + mesh->nodes = NULL; } node_t *new_node(void) { - node_t *n = xmalloc_and_zero(sizeof *n); + node_t *n = xzalloc(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; + n->devclass = DEV_CLASS_UNKNOWN; return n; } void free_node(node_t *n) { - if(n->subnet_tree) - free_subnet_tree(n->subnet_tree); + n->status.destroyed = true; - if(n->edge_tree) + utcp_exit(n->utcp); + + 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); + 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->mtutimeout.cb) { + abort(); + } - if(n->late) - free(n->late); + free(n->name); + free(n->canonical_address); free(n); } -void node_add(node_t *n) { - splay_insert(node_tree, n); +void node_add(meshlink_handle_t *mesh, node_t *n) { + n->mesh = mesh; + splay_insert(mesh->nodes, n); } -void node_del(node_t *n) { - for splay_each(subnet_t, s, n->subnet_tree) - subnet_del(n, s); +void node_del(meshlink_handle_t *mesh, node_t *n) { + timeout_del(&mesh->loop, &n->mtutimeout); - for splay_each(edge_t, e, n->edge_tree) - edge_del(e); + for splay_each(edge_t, e, n->edge_tree) { + edge_del(mesh, e); + } - splay_delete(node_tree, n); + splay_delete(mesh->nodes, n); } -node_t *lookup_node(char *name) { - node_t n = {NULL}; +node_t *lookup_node(meshlink_handle_t *mesh, const char *name) { + const node_t n = {.name = (char *)name}; + node_t *result; - n.name = name; + result = splay_search(mesh->nodes, &n); - return splay_search(node_tree, &n); + return result; } -node_t *lookup_node_udp(const sockaddr_t *sa) { - return hash_search(node_udp_cache, sa); +node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) { + return hash_search(mesh->node_udp_cache, sa); } -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!"); +void update_node_udp(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) { + if(n == mesh->self) { + logger(mesh, MESHLINK_WARNING, "Trying to update UDP address of mesh->self!"); return; } - hash_insert(node_udp_cache, &n->address, NULL); + hash_insert(mesh->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); + n->sock = 0; + + for(int i = 0; i < mesh->listen_sockets; i++) { + if(mesh->listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) { + n->sock = i; + break; + } + } + + hash_insert(mesh->node_udp_cache, sa, n); + + node_add_recent_address(mesh, n, sa); + + if(mesh->log_level <= MESHLINK_DEBUG) { + char *hostname = sockaddr2hostname(&n->address); + logger(mesh, MESHLINK_DEBUG, "UDP address of %s set to %s", n->name, hostname); + free(hostname); + } } } -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); +bool node_add_recent_address(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) { + (void)mesh; + bool found = false; + int i; + + /* Check if we already know this address */ + for(i = 0; i < MAX_RECENT && n->recent[i].sa.sa_family; i++) { + if(!sockaddrcmp(&n->recent[i], sa)) { + found = true; + break; + } + } - return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES); -} + if(found && i == 0) { + /* It's already the most recent address, nothing to do. */ + return false; + } + + if(i >= MAX_RECENT) { + i = MAX_RECENT - 1; + } -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); + memmove(n->recent + 1, n->recent, i * sizeof(*n->recent)); + memcpy(n->recent, sa, SALEN(sa->sa)); - return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC); + n->status.dirty = true; + return !found; }