X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=ee58ac0a0b943bf1f2e1c8e0f9bba3f179189925;hp=db8eae76e6cfab12d36fced9c28d43ad099b19de;hb=4a21aabada23d1d2c8a10f54dd7248171c4ec82f;hpb=32f5524c4b52a2d3a96bc48ee2437f8b9b4dbe10

diff --git a/src/net.c b/src/net.c
index db8eae76..ee58ac0a 100644
--- a/src/net.c
+++ b/src/net.c
@@ -44,6 +44,8 @@ bool do_purge = false;
 volatile bool running = false;
 
 time_t now = 0;
+int contradicting_add_edge = 0;
+int contradicting_del_edge = 0;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
@@ -297,7 +299,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 		if(FD_ISSET(c->socket, readset)) {
 			if(c->status.connecting) {
 				c->status.connecting = false;
-				getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+				getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
 
 				if(!result)
 					finish_connecting(c);
@@ -415,6 +417,19 @@ int main_loop(void) {
 				send_key_changed(broadcast, myself);
 				keyexpires = now + keylifetime;
 			}
+
+			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!");
+					running = false;
+					break;
+				}
+
+				contradicting_add_edge = 0;
+				contradicting_del_edge = 0;
+			}
 		}
 
 		if(sigalrm) {
@@ -506,11 +521,15 @@ int main_loop(void) {
 					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);
 					}
 				}
 			}