From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 11 Mar 2002 11:45:12 +0000 (+0000)
Subject: prune_connections() before build_fdset().
X-Git-Tag: release-1.0pre6~51
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=c2713ba7a5ff12e270d66a5d3188a3640873830e;p=tinc

prune_connections() before build_fdset().
---

diff --git a/src/net.c b/src/net.c
index 4061d7af..acba5ad3 100644
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.162 2002/03/11 11:23:04 guus Exp $
+    $Id: net.c,v 1.35.4.163 2002/03/11 11:45:12 guus Exp $
 */
 
 #include "config.h"
@@ -369,6 +369,12 @@ cp
       tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
       tv.tv_usec = 0;
 
+      if(do_prune)
+        {
+          prune_connections();
+          do_prune = 0;
+        }
+
       build_fdset(&fset);
 
       if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
@@ -383,13 +389,7 @@ cp
       if(r > 0)
         check_network_activity(&fset);
 
-      if(do_prune)
-        {
-          prune_connections();
-          do_prune = 0;
-        }
-
-     if(do_purge)
+      if(do_purge)
         {
           purge();
           do_purge = 0;