X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=f9020b3b9aa8d4ab771167fa3cb5760ebe6f4211;hb=574b380dfc75ef13ee4accba1f2416165c58a5a2;hp=b299bf18ebfc2255415c612db8bed0e57a2d4bc7;hpb=33f241d97852d7a171f1aaf1bda7f66356ff889e;p=tinc

diff --git a/src/net.c b/src/net.c
index b299bf18..f9020b3b 100644
--- a/src/net.c
+++ b/src/net.c
@@ -39,6 +39,7 @@
 
 int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
+static int sleeptime = 10;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
@@ -116,9 +117,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);
@@ -193,19 +191,21 @@ 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;
+	if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
+		logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
+		usleep(sleeptime * 1000000LL);
+		sleeptime *= 2;
+		if(sleeptime < 0)
+			sleeptime = 3600;
+	} else {
+		sleeptime /= 2;
+		if(sleeptime < 10)
+			sleeptime = 10;
 	}
 
+	contradicting_add_edge = 0;
+	contradicting_del_edge = 0;
+
 	event_add(event, &(struct timeval){pingtimeout, 0});
 }
 
@@ -244,9 +244,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;
@@ -348,24 +354,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) {
@@ -373,12 +379,14 @@ 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
 
-	if(timeout_initialized(&timeout_event))
-		event_del(&timeout_event);
+	event_del(&timeout_event);
 
 	return 0;
 }