X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=8df87d6ef71e7e39b4aa2aa41b118a1a3fea5388;hb=303dd1e70219a7542921f6e63d9391ab326d434f;hp=0e5823641de349b1bb2321623be9820e0a37891c;hpb=79e46d08a46f2fef2ee4e8eac7ba487007160564;p=tinc

diff --git a/src/net.c b/src/net.c
index 0e582364..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-2010 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
+		  2011      Loïc Grenié <loic.grenie@gmail.com>
 
     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
@@ -36,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) {
@@ -112,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);
@@ -163,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 {
@@ -189,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});
 }
 
@@ -227,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;
@@ -275,6 +295,7 @@ int reload_configuration(void) {
 	if(strictsubnets) {
 		subnet_t *subnet;
 
+
 		for(node = subnet_tree->head; node; node = node->next) {
 			subnet = node->data;
 			subnet->expires = 1;
@@ -330,24 +351,24 @@ void retry(void) {
 */
 int main_loop(void) {
 	struct event timeout_event;
-	struct event sighup_event;
-	struct event sigterm_event;
-	struct event sigquit_event;
 
 	timeout_set(&timeout_event, timeout_handler, &timeout_event);
 	event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
 
-#ifdef SIGHUP
+#ifndef HAVE_MINGW
+	struct event sighup_event;
+	struct event sigterm_event;
+	struct event sigquit_event;
+	struct event sigalrm_event;
+
 	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
 	signal_add(&sighup_event, NULL);
-#endif
-#ifdef SIGTERM
 	signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
 	signal_add(&sigterm_event, NULL);
-#endif
-#ifdef SIGQUIT
 	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) {
@@ -355,9 +376,13 @@ int main_loop(void) {
 		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;