X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=309ebe4e8fb699ebc23bfaaf2561770adebd84c6;hb=95a6974de173e0cb78611c6704ed09631d510dae;hp=9b60a31446143dd3cce7c0cafe4da41f6077cfb8;hpb=51099658c919794cde72ea1107b9d9b9c3cee926;p=tinc

diff --git a/src/net.c b/src/net.c
index 9b60a314..309ebe4e 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
@@ -68,7 +68,7 @@ static void purge(void) {
 			for(snode = n->subnet_tree->head; snode; snode = snext) {
 				snext = snode->next;
 				s = snode->data;
-				if(!tunnelserver)
+				if(!strictsubnets)
 					send_del_subnet(broadcast, s);
 				subnet_del(n, s);
 			}
@@ -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();