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

diff --git a/src/net.c b/src/net.c
index 0e582364..67603f7d 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     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>
 
     This program is free software; you can redistribute it and/or modify
@@ -36,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) {
@@ -189,6 +192,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});
 }
 
@@ -275,6 +291,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;
@@ -358,7 +375,9 @@ int main_loop(void) {
 	signal_del(&sighup_event);
 	signal_del(&sigterm_event);
 	signal_del(&sigquit_event);
-	event_del(&timeout_event);
+
+	if(timeout_initialized(&timeout_event))
+		event_del(&timeout_event);
 
 	return 0;
 }