X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.c;h=12f2f33d7c48e921ced4558ef77b3e423dd5dee9;hb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;hp=3d17d3cfeb60777c49d37c46541b844f899e1aa4;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=meshlink diff --git a/src/net.c b/src/net.c index 3d17d3cf..12f2f33d 100644 --- a/src/net.c +++ b/src/net.c @@ -1,9 +1,6 @@ /* net.c -- most of the network code - Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2013 Guus Sliepen - 2006 Scott Lamb - 2011 Loïc Grenié + 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 @@ -25,43 +22,29 @@ #include "utils.h" #include "conf.h" #include "connection.h" -#include "device.h" #include "graph.h" #include "logger.h" +#include "meshlink_internal.h" #include "meta.h" -#include "names.h" #include "net.h" #include "netutl.h" -#include "process.h" #include "protocol.h" -#include "subnet.h" #include "xalloc.h" -int contradicting_add_edge = 0; -int contradicting_del_edge = 0; -static int sleeptime = 10; -time_t last_config_check = 0; - -/* Purge edges and subnets of unreachable nodes. Use carefully. */ +/* Purge edges of unreachable nodes. Use carefully. */ +// TODO: remove void purge(void) { logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes"); - /* Remove all edges and subnets owned by unreachable nodes. */ + /* Remove all edges owned by unreachable nodes. */ - for splay_each(node_t, n, node_tree) { + for splay_each(node_t, n, mesh->nodes) { if(!n->status.reachable) { logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname); - for splay_each(subnet_t, s, n->subnet_tree) { - send_del_subnet(everyone, s); - if(!strictsubnets) - subnet_del(n, s); - } - for splay_each(edge_t, e, n->edge_tree) { - if(!tunnelserver) - send_del_edge(everyone, e); + send_del_edge(mesh->everyone, e); edge_del(e); } } @@ -69,15 +52,11 @@ void purge(void) { /* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */ - for splay_each(node_t, n, node_tree) { + for splay_each(node_t, n, mesh->nodes) { if(!n->status.reachable) { - for splay_each(edge_t, e, edge_weight_tree) + for splay_each(edge_t, e, mesh->edges) if(e->to == n) return; - - if(!autoconnect && (!strictsubnets || !n->subnet_tree->head)) - /* in strictsubnets mode do not delete nodes with subnets */ - node_del(n); } } } @@ -98,8 +77,8 @@ void terminate_connection(connection_t *c, bool report) { c->node->connection = NULL; if(c->edge) { - if(report && !tunnelserver) - send_del_edge(everyone, c->edge); + if(report) + send_del_edge(mesh->everyone, c->edge); edge_del(c->edge); c->edge = NULL; @@ -112,10 +91,9 @@ void terminate_connection(connection_t *c, bool report) { if(report && !c->node->status.reachable) { edge_t *e; - e = lookup_edge(c->node, myself); + e = lookup_edge(c->node, mesh->self); if(e) { - if(!tunnelserver) - send_del_edge(everyone, e); + send_del_edge(mesh->everyone, e); edge_del(e); } } @@ -128,6 +106,12 @@ void terminate_connection(connection_t *c, bool report) { if(outgoing) do_outgoing_connection(outgoing); + +#ifndef HAVE_MINGW + /* Clean up dead proxy processes */ + + while(waitpid(-1, NULL, WNOHANG) > 0); +#endif } /* @@ -138,16 +122,13 @@ void terminate_connection(connection_t *c, bool report) { end does not reply in time, we consider them dead and close the connection. */ -static void timeout_handler(void *data) { - for list_each(connection_t, c, connection_list) { - if(c->status.control) - continue; - - if(c->last_ping_time + pingtimeout <= now.tv_sec) { +static void timeout_handler(event_loop_t *loop, void *data) { + for list_each(connection_t, c, mesh->connections) { + if(c->last_ping_time + mesh->pingtimeout <= now.tv_sec) { if(c->status.active) { if(c->status.pinged) { logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)now.tv_sec - c->last_ping_time); - } else if(c->last_ping_time + pinginterval <= now.tv_sec) { + } else if(c->last_ping_time + mesh->pinginterval <= now.tv_sec) { send_ping(c); continue; } else { @@ -163,37 +144,37 @@ static void timeout_handler(void *data) { } } - timeout_set(data, &(struct timeval){pingtimeout, rand() % 100000}); + timeout_set(&mesh->loop, data, &(struct timeval){mesh->pingtimeout, rand() % 100000}); } -static void periodic_handler(void *data) { +static void periodic_handler(event_loop_t *loop, void *data) { /* Check if there are too many contradicting ADD_EDGE and DEL_EDGE messages. This usually only happens when another node has the same Name as this node. If so, sleep for a short while to prevent a storm of contradicting messages. */ - if(contradicting_del_edge > 100 && contradicting_add_edge > 100) { - logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime); - usleep(sleeptime * 1000000LL); - sleeptime *= 2; - if(sleeptime < 0) - sleeptime = 3600; + if(mesh->contradicting_del_edge > 100 && mesh->contradicting_add_edge > 100) { + logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", mesh->sleeptime); + usleep(mesh->sleeptime * 1000000LL); + mesh->sleeptime *= 2; + if(mesh->sleeptime < 0) + mesh->sleeptime = 3600; } else { - sleeptime /= 2; - if(sleeptime < 10) - sleeptime = 10; + mesh->sleeptime /= 2; + if(mesh->sleeptime < 10) + mesh->sleeptime = 10; } - contradicting_add_edge = 0; - contradicting_del_edge = 0; + mesh->contradicting_add_edge = 0; + mesh->contradicting_del_edge = 0; /* If AutoConnect is set, check if we need to make or break connections. */ - if(autoconnect && node_tree->count > 1) { + if(autoconnect && mesh->nodes->count > 1) { /* Count number of active connections */ int nc = 0; - for list_each(connection_t, c, connection_list) { - if(c->status.active && !c->status.control) + for list_each(connection_t, c, mesh->connections) { + if(c->status.active) nc++; } @@ -203,10 +184,10 @@ static void periodic_handler(void *data) { and we are not already trying to make one, create an outgoing connection to this node. */ - int r = rand() % node_tree->count; + int r = rand() % mesh->nodes->count; int i = 0; - for splay_each(node_t, n, node_tree) { + for splay_each(node_t, n, mesh->nodes) { if(i++ != r) continue; @@ -215,7 +196,7 @@ static void periodic_handler(void *data) { bool found = false; - for list_each(outgoing_t, outgoing, outgoing_list) { + for list_each(outgoing_t, outgoing, mesh->outgoings) { if(!strcmp(outgoing->name, n->name)) { found = true; break; @@ -224,9 +205,9 @@ static void periodic_handler(void *data) { if(!found) { logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name); - outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing); + outgoing_t *outgoing = xzalloc(sizeof *outgoing); outgoing->name = xstrdup(n->name); - list_insert_tail(outgoing_list, outgoing); + list_insert_tail(mesh->outgoings, outgoing); setup_outgoing_connection(outgoing); } break; @@ -239,8 +220,8 @@ static void periodic_handler(void *data) { int r = rand() % nc; int i = 0; - for list_each(connection_t, c, connection_list) { - if(!c->status.active || c->status.control) + for list_each(connection_t, c, mesh->connections) { + if(!c->status.active) continue; if(i++ != r) @@ -250,7 +231,7 @@ static void periodic_handler(void *data) { break; logger(DEBUG_CONNECTIONS, LOG_INFO, "Autodisconnecting from %s", c->name); - list_delete(outgoing_list, c->outgoing); + list_delete(mesh->outgoings, c->outgoing); c->outgoing = NULL; terminate_connection(c, c->status.active); break; @@ -261,9 +242,9 @@ static void periodic_handler(void *data) { /* If we have enough active connections, remove any pending outgoing connections. */ - for list_each(outgoing_t, o, outgoing_list) { + for list_each(outgoing_t, o, mesh->outgoings) { bool found = false; - for list_each(connection_t, c, connection_list) { + for list_each(connection_t, c, mesh->connections) { if(c->outgoing == o) { found = true; break; @@ -271,211 +252,94 @@ static void periodic_handler(void *data) { } if(!found) { logger(DEBUG_CONNECTIONS, LOG_INFO, "Cancelled outgoing connection to %s", o->name); - list_delete_node(outgoing_list, node); + list_delete_node(mesh->outgoings, node); } } } } - timeout_set(data, &(struct timeval){5, rand() % 100000}); + timeout_set(&mesh->loop, data, &(struct timeval){5, rand() % 100000}); } void handle_meta_connection_data(connection_t *c) { - int result; - socklen_t len = sizeof result; - - if(c->status.connecting) { - c->status.connecting = false; - - getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len); - - if(!result) - finish_connecting(c); - else { - logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result)); - terminate_connection(c, false); - return; - } - } - if (!receive_meta(c)) { terminate_connection(c, c->status.active); return; } } -static void sigterm_handler(void *data) { - logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum)); - event_exit(); -} - -static void sighup_handler(void *data) { - logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum)); - reopenlogger(); - reload_configuration(); -} - -static void sigalrm_handler(void *data) { - logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum)); - retry(); -} - int reload_configuration(void) { - char *fname; + char filename[PATH_MAX]; /* Reread our own configuration file */ - exit_configuration(&config_tree); - init_configuration(&config_tree); + exit_configuration(&mesh->config); + init_configuration(&mesh->config); if(!read_server_config()) { - logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file, exitting."); - event_exit(); + logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file."); return EINVAL; } - read_config_options(config_tree, NULL); - - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, myself->name); - read_config_file(config_tree, fname); - free(fname); + snprintf(filename, PATH_MAX,"%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name); + read_config_file(mesh->config, filename); /* Parse some options that are allowed to be changed while tinc is running */ setup_myself_reloadable(); - /* If StrictSubnet is set, expire deleted Subnets and read new ones in */ - - if(strictsubnets) { - for splay_each(subnet_t, subnet, subnet_tree) - subnet->expires = 1; - - load_all_subnets(); - - for splay_each(subnet_t, subnet, subnet_tree) { - if(subnet->expires == 1) { - send_del_subnet(everyone, subnet); - if(subnet->owner->status.reachable) - subnet_update(subnet->owner, subnet, false); - subnet_del(subnet->owner, subnet); - } else if(subnet->expires == -1) { - subnet->expires = 0; - } else { - send_add_subnet(everyone, subnet); - if(subnet->owner->status.reachable) - subnet_update(subnet->owner, subnet, true); - } - } - } else { /* Only read our own subnets back in */ - for splay_each(subnet_t, subnet, myself->subnet_tree) - if(!subnet->expires) - subnet->expires = 1; - - config_t *cfg = lookup_config(config_tree, "Subnet"); - - while(cfg) { - subnet_t *subnet, *s2; - - if(!get_config_subnet(cfg, &subnet)) - continue; - - if((s2 = lookup_subnet(myself, subnet))) { - if(s2->expires == 1) - s2->expires = 0; - - free_subnet(subnet); - } else { - subnet_add(myself, subnet); - send_add_subnet(everyone, subnet); - subnet_update(myself, subnet, true); - } - - cfg = lookup_config_next(config_tree, cfg); - } - - for splay_each(subnet_t, subnet, myself->subnet_tree) { - if(subnet->expires == 1) { - send_del_subnet(everyone, subnet); - subnet_update(myself, subnet, false); - subnet_del(myself, subnet); - } - } - } - /* Try to make outgoing connections */ try_outgoing_connections(); /* Close connections to hosts that have a changed or deleted host config file */ - for list_each(connection_t, c, connection_list) { - if(c->status.control) - continue; - - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name); + for list_each(connection_t, c, mesh->connections) { + snprintf(filename, PATH_MAX,"%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name); struct stat s; - if(stat(fname, &s) || s.st_mtime > last_config_check) { + if(stat(filename, &s) || s.st_mtime > mesh->last_config_check) { logger(DEBUG_CONNECTIONS, LOG_INFO, "Host config file of %s has been changed", c->name); terminate_connection(c, c->status.active); } - free(fname); } - last_config_check = time(NULL); + mesh->last_config_check = now.tv_sec; return 0; } void retry(void) { - for list_each(connection_t, c, connection_list) { - if(c->outgoing && !c->node) { - timeout_del(&c->outgoing->ev); - if(c->status.connecting) - close(c->socket); - c->outgoing->timeout = 0; - terminate_connection(c, c->status.active); - } + /* Reset the reconnection timers for all outgoing connections */ + for list_each(outgoing_t, outgoing, mesh->outgoings) { + outgoing->timeout = 0; + if(outgoing->ev.cb) + timeout_set(&mesh->loop, &outgoing->ev, &(struct timeval){0, 0}); } + + /* Check for outgoing connections that are in progress, and reset their ping timers */ + for list_each(connection_t, c, mesh->connections) { + if(c->outgoing && !c->node) + c->last_ping_time = 0; + } + + /* Kick the ping timeout handler */ + timeout_set(&mesh->loop, &mesh->pingtimer, &(struct timeval){0, 0}); } /* this is where it all happens... */ int main_loop(void) { - timeout_t pingtimer = {{0}}; - timeout_t periodictimer = {{0}}; - - timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval){pingtimeout, rand() % 100000}); - timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval){pingtimeout, rand() % 100000}); + timeout_add(&mesh->loop, &mesh->pingtimer, timeout_handler, &mesh->pingtimer, &(struct timeval){mesh->pingtimeout, rand() % 100000}); + timeout_add(&mesh->loop, &mesh->periodictimer, periodic_handler, &mesh->periodictimer, &(struct timeval){mesh->pingtimeout, rand() % 100000}); -#ifndef HAVE_MINGW - signal_t sighup = {0}; - signal_t sigterm = {0}; - signal_t sigquit = {0}; - signal_t sigint = {0}; - signal_t sigalrm = {0}; - - signal_add(&sighup, sighup_handler, &sighup, SIGHUP); - signal_add(&sigterm, sigterm_handler, &sigterm, SIGTERM); - signal_add(&sigquit, sigterm_handler, &sigquit, SIGQUIT); - signal_add(&sigint, sigterm_handler, &sigint, SIGINT); - signal_add(&sigalrm, sigalrm_handler, &sigalrm, SIGALRM); -#endif - - if(!event_loop()) { + if(!event_loop_run(&mesh->loop)) { logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno)); return 1; } -#ifndef HAVE_MINGW - signal_del(&sighup); - signal_del(&sigalrm); - signal_del(&sigquit); - signal_del(&sigterm); -#endif - - timeout_del(&periodictimer); - timeout_del(&pingtimer); + timeout_del(&mesh->loop, &mesh->periodictimer); + timeout_del(&mesh->loop, &mesh->pingtimer); return 0; }