X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=08e3cad3ee1bf03a950748209703c47cdc943b7e;hp=528e046b9464a9903a79bad73aceaccc8d123cbf;hb=66b7aea294896a99df289231143a506b422b994c;hpb=9f53ab209d8a6a7622a49ed03cef735b6e3f3eeb

diff --git a/src/net.c b/src/net.c
index 528e046b..08e3cad3 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. */
 
@@ -278,12 +280,21 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 	int result, i;
 	socklen_t len = sizeof(result);
 	vpn_packet_t packet;
+	static int errors = 0;
 
 	/* check input from kernel */
 	if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
 		if(read_packet(&packet)) {
+			errors = 0;
 			packet.priority = 0;
 			route(myself, &packet);
+		} else {
+			usleep(errors * 50000);
+			errors++;
+			if(errors > 10) {
+				logger(LOG_ERR, "Too many errors from %s, exiting!", device);
+				running = false;
+			}
 		}
 	}
 
@@ -297,7 +308,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 +426,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,10 +530,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) {
-						send_add_subnet(broadcast, subnet);
 						subnet->expires = 0;
+					} else {
+						send_add_subnet(broadcast, subnet);
+						if(subnet->owner->status.reachable)
+							subnet_update(subnet->owner, subnet, true);
 					}
 				}
 			}