X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=feec8d6be238c51552c26635e0acd8cdbce9c90d;hb=3cb91d75f874e3398c35cd4280c1e0a1ceeedabc;hp=3f17083c192dec33ceb2fb5481513294263d6b8f;hpb=e00b44cb98e4d50a0d426048ba01dbd80bcb5941;p=tinc

diff --git a/src/net.c b/src/net.c
index 3f17083c..feec8d6b 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-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2010 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -374,11 +374,10 @@ int main_loop(void) {
 				dump_connections();
 				return 1;
 			}
-
-			continue;
 		}
 
-		check_network_activity(&readset, &writeset);
+		if(r > 0)
+			check_network_activity(&readset, &writeset);
 
 		if(do_purge) {
 			purge();
@@ -418,8 +417,13 @@ int main_loop(void) {
 		}
 
 		if(sigalrm) {
+			avl_node_t *node;
 			logger(LOG_INFO, "Flushing event queue");
 			expire_events();
+			for(node = connection_tree->head; node; node = node->next) {
+				connection_t *c = node->data;
+				send_ping(c);
+			}
 			sigalrm = false;
 		}