X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=2ffe03a7b39a7985fdb01a7ab1108880a62c0184;hp=8ee782145cbd9b28a5d12734b50022db2dffd7ce;hb=6834b882015a9323672e9fce8811aa4283f196f0;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b diff --git a/src/net.c b/src/net.c index 8ee78214..2ffe03a7 100644 --- a/src/net.c +++ b/src/net.c @@ -1,7 +1,8 @@ /* net.c -- most of the network code Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2009 Guus Sliepen + 2000-2010 Guus Sliepen + 2006 Scott Lamb 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 @@ -13,17 +14,13 @@ 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 - #include "utils.h" #include "splay_tree.h" #include "conf.h" @@ -39,6 +36,9 @@ #include "subnet.h" #include "xalloc.h" +int contradicting_add_edge = 0; +int contradicting_del_edge = 0; + /* Purge edges and subnets of unreachable nodes. Use carefully. */ void purge(void) { @@ -47,9 +47,7 @@ void purge(void) { edge_t *e; subnet_t *s; - cp(); - - ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes")); + ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes"); /* Remove all edges and subnets owned by unreachable nodes. */ @@ -58,15 +56,15 @@ void purge(void) { n = nnode->data; if(!n->status.reachable) { - ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name, + ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname); for(snode = n->subnet_tree->head; snode; snode = snext) { snext = snode->next; s = snode->data; - if(!tunnelserver) - send_del_subnet(broadcast, s); - subnet_del(n, s); + send_del_subnet(broadcast, s); + if(!strictsubnets) + subnet_del(n, s); } for(enode = n->edge_tree->head; enode; enode = enext) { @@ -94,7 +92,8 @@ void purge(void) { break; } - if(!enode) + if(!enode && (!strictsubnets || !n->subnet_tree->head)) + /* in strictsubnets mode do not delete nodes with subnets */ node_del(n); } } @@ -108,9 +107,7 @@ void purge(void) { - Deactivate the host */ void terminate_connection(connection_t *c, bool report) { - cp(); - - ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"), + ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname); c->status.active = false; @@ -160,13 +157,12 @@ 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(int fd, short events, void *event) { +static void timeout_handler(void *arg) { + event_t *event = arg; splay_node_t *node, *next; connection_t *c; time_t now = time(NULL); - cp(); - for(node = connection_tree->head; node; node = next) { next = node->next; c = node->data; @@ -174,7 +170,7 @@ static void timeout_handler(int fd, short events, void *event) { if(c->last_ping_time + pingtimeout < now) { if(c->status.active) { if(c->status.pinged) { - ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"), + ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, now - c->last_ping_time); terminate_connection(c, true); continue; @@ -184,12 +180,12 @@ static void timeout_handler(int fd, short events, void *event) { } else { if(c->status.connecting) { ifdebug(CONNECTIONS) - logger(LOG_WARNING, _("Timeout while connecting to %s (%s)"), c->name, c->hostname); + logger(LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname); c->status.connecting = false; closesocket(c->socket); do_outgoing_connection(c); } else { - ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), c->name, c->hostname); + ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname); terminate_connection(c, false); continue; } @@ -197,10 +193,24 @@ static void timeout_handler(int fd, short events, void *event) { } } - event_add(event, &(struct timeval){pingtimeout, 0}); + if(contradicting_del_edge && contradicting_add_edge) { + logger(LOG_WARNING, "Possible node with same Name as us!"); + + if(rand() % 3 == 0) { + logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!"); + abort(); + return; + } + + contradicting_add_edge = 0; + contradicting_del_edge = 0; + } + + event->time = now + pingtimeout; + event_add(event); } -void handle_meta_connection_data(int fd, short events, void *data) { +void handle_meta_connection_data(void *data) { connection_t *c = data; int result; socklen_t len = sizeof result; @@ -210,31 +220,37 @@ void handle_meta_connection_data(int fd, short events, void *data) { getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len); - if(!result) + if(!result) { + mutex_lock(&mutex); finish_connecting(c); - else { + mutex_unlock(&mutex); + } else { ifdebug(CONNECTIONS) logger(LOG_DEBUG, - _("Error while connecting to %s (%s): %s"), - c->name, c->hostname, strerror(result)); + "Error while connecting to %s (%s): %s", + c->name, c->hostname, sockstrerror(result)); closesocket(c->socket); + mutex_lock(&mutex); do_outgoing_connection(c); + mutex_unlock(&mutex); return; } } - if (!receive_meta(c)) { - terminate_connection(c, c->status.active); - return; + while(true) { + if (!receive_meta(c)) { + terminate_connection(c, c->status.active); + break; + } } } static void sigterm_handler(int signal, short events, void *data) { - logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); - event_loopexit(NULL); + logger(LOG_NOTICE, "Got %s signal", strsignal(signal)); + exit(0); } static void sighup_handler(int signal, short events, void *data) { - logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); + logger(LOG_NOTICE, "Got %s signal", strsignal(signal)); reload_configuration(); } @@ -251,8 +267,8 @@ int reload_configuration(void) { init_configuration(&config_tree); if(!read_server_config()) { - logger(LOG_ERR, _("Unable to reread configuration file, exitting.")); - event_loopexit(NULL); + logger(LOG_ERR, "Unable to reread configuration file, exitting."); + abort(); return EINVAL; } @@ -270,7 +286,7 @@ int reload_configuration(void) { c->outgoing = NULL; } - asprintf(&fname, "%s/hosts/%s", confbase, c->name); + xasprintf(&fname, "%s/hosts/%s", confbase, c->name); if(stat(fname, &s) || s.st_mtime > last_config_check) terminate_connection(c, c->status.active); free(fname); @@ -278,6 +294,37 @@ int reload_configuration(void) { last_config_check = time(NULL); + /* If StrictSubnet is set, expire deleted Subnets and read new ones in */ + + if(strictsubnets) { + subnet_t *subnet; + + + for(node = subnet_tree->head; node; node = node->next) { + subnet = node->data; + subnet->expires = 1; + } + + load_all_subnets(); + + for(node = subnet_tree->head; node; node = next) { + next = node->next; + subnet = node->data; + if(subnet->expires == 1) { + send_del_subnet(broadcast, 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(broadcast, subnet); + if(subnet->owner->status.reachable) + subnet_update(subnet->owner, subnet, true); + } + } + } + /* Try to make outgoing connections */ try_outgoing_connections(); @@ -293,8 +340,7 @@ void retry(void) { c = node->data; if(c->outgoing && !c->node) { - if(timeout_initialized(&c->outgoing->ev)) - event_del(&c->outgoing->ev); + event_del(&c->outgoing->ev); if(c->status.connecting) close(c->socket); c->outgoing->timeout = 0; @@ -308,29 +354,34 @@ void retry(void) { */ int main_loop(void) { struct event timeout_event; - struct event sighup_event; - struct event sigterm_event; - struct event sigquit_event; - - cp(); - - timeout_set(&timeout_event, timeout_handler, &timeout_event); - event_add(&timeout_event, &(struct timeval){pingtimeout, 0}); - signal_set(&sighup_event, SIGHUP, sighup_handler, NULL); - signal_add(&sighup_event, NULL); - signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL); - signal_add(&sigterm_event, NULL); - signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL); - signal_add(&sigquit_event, NULL); - - if(event_loop(0) < 0) { - logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno)); - return 1; + + timeout_event.time = time(NULL) + pingtimeout; + timeout_event.handler = timeout_handler; + timeout_event.data = &timeout_event; + + event_add(&timeout_event); + +#ifdef SIGHUP + signal(SIGHUP, sighup_handler); +#endif +#ifdef SIGTERM + signal(SIGTERM, sigterm_handler); +#endif +#ifdef SIGQUIT + signal(SIGQUIT, sigterm_handler); +#endif + + while(true) { + mutex_unlock(&mutex); + usleep(1000000); + mutex_lock(&mutex); + + struct event *event; + while((event = get_expired_event())) { + event->handler(event->data); + } } - signal_del(&sighup_event); - signal_del(&sigterm_event); - signal_del(&sigquit_event); event_del(&timeout_event); return 0;