X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=8df87d6ef71e7e39b4aa2aa41b118a1a3fea5388;hp=1c267f64801a5dc161021b674cfb93d3833834ed;hb=d1cd3c81455ecb32149cbaa424b7870075b2b2fc;hpb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf diff --git a/src/net.c b/src/net.c index 1c267f64..8df87d6e 100644 --- a/src/net.c +++ b/src/net.c @@ -1,8 +1,9 @@ /* net.c -- most of the network code Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2009 Guus Sliepen + 2000-2011 Guus Sliepen 2006 Scott Lamb + 2011 Loïc Grenié 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 @@ -21,8 +22,6 @@ #include "system.h" -#include - #include "utils.h" #include "splay_tree.h" #include "conf.h" @@ -38,6 +37,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) { @@ -61,9 +63,9 @@ void purge(void) { 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) { @@ -91,7 +93,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); } } @@ -113,9 +116,6 @@ void terminate_connection(connection_t *c, bool report) { if(c->node) c->node->connection = NULL; - if(c->socket) - closesocket(c->socket); - if(c->edge) { if(report && !tunnelserver) send_del_edge(broadcast, c->edge); @@ -164,14 +164,14 @@ static void timeout_handler(int fd, short events, void *event) { next = node->next; c = node->data; - if(c->last_ping_time + pingtimeout < now) { + 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", c->name, c->hostname, now - c->last_ping_time); terminate_connection(c, true); continue; - } else if(c->last_ping_time + pinginterval < now) { + } else if(c->last_ping_time + pinginterval <= now) { send_ping(c); } } else { @@ -190,6 +190,19 @@ static void timeout_handler(int fd, short events, void *event) { } } + 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!"); + event_loopexit(NULL); + return; + } + + contradicting_add_edge = 0; + contradicting_del_edge = 0; + } + event_add(event, &(struct timeval){pingtimeout, 0}); } @@ -208,7 +221,7 @@ void handle_meta_connection_data(int fd, short events, void *data) { else { ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Error while connecting to %s (%s): %s", - c->name, c->hostname, strerror(result)); + c->name, c->hostname, sockstrerror(result)); closesocket(c->socket); do_outgoing_connection(c); return; @@ -228,9 +241,15 @@ static void sigterm_handler(int signal, short events, void *data) { static void sighup_handler(int signal, short events, void *data) { logger(LOG_NOTICE, "Got %s signal", strsignal(signal)); + reopenlogger(); reload_configuration(); } +static void sigalrm_handler(int signal, short events, void *data) { + logger(LOG_NOTICE, "Got %s signal", strsignal(signal)); + retry(); +} + int reload_configuration(void) { connection_t *c; splay_node_t *node, *next; @@ -271,6 +290,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(); @@ -301,27 +351,38 @@ void retry(void) { */ int main_loop(void) { struct event timeout_event; + + timeout_set(&timeout_event, timeout_handler, &timeout_event); + event_add(&timeout_event, &(struct timeval){pingtimeout, 0}); + +#ifndef HAVE_MINGW struct event sighup_event; struct event sigterm_event; struct event sigquit_event; + struct event sigalrm_event; - 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); + signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL); + signal_add(&sigalrm_event, NULL); +#endif if(event_loop(0) < 0) { logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno)); return 1; } +#ifndef HAVE_MINGW signal_del(&sighup_event); signal_del(&sigterm_event); signal_del(&sigquit_event); + signal_del(&sigalrm_event); +#endif + event_del(&timeout_event); return 0;