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

diff --git a/src/net.c b/src/net.c
index ee58ac0a..e6a1166f 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
@@ -280,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;
+			}
 		}
 	}
 
@@ -418,7 +427,7 @@ int main_loop(void) {
 				keyexpires = now + keylifetime;
 			}
 
-			if(contradicting_del_edge && contradicting_add_edge) {
+			if(contradicting_del_edge > 10 && contradicting_add_edge > 10) {
 				logger(LOG_WARNING, "Possible node with same Name as us!");
 
 				if(rand() % 3 == 0) {