X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=d6809d5f549b72dc3aa88d49d4ce4cca8f141941;hp=722e8ccdb5aff8131b18d4d0c6c373bd1ff10e19;hb=cbd8133ab4a2ea8a0c46224a5f1ae79e92819e5f;hpb=ab90fa9bd1a653a330be7ef11293000721a0e7b4

diff --git a/src/net.c b/src/net.c
index 722e8ccd..d6809d5f 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.161 2002/03/01 14:25:10 guus Exp $
+    $Id: net.c,v 1.35.4.166 2002/03/23 20:13:56 guus Exp $
 */
 
 #include "config.h"
@@ -94,8 +94,8 @@ cp
 
   for(i = 0; i < listen_sockets; i++)
     {
-      FD_SET(tcp_socket[i], fs);
-      FD_SET(udp_socket[i], fs);
+      FD_SET(listen_socket[i].tcp, fs);
+      FD_SET(listen_socket[i].udp, fs);
     }
 
   FD_SET(device_fd, fs);
@@ -198,11 +198,11 @@ cp
         }
 
       edge_del(c->edge);
-    }
 
-  /* Run MST and SSSP algorithms */
+      /* Run MST and SSSP algorithms */
 
-  graph();
+      graph();
+    }
 
   /* Check if this was our outgoing connection */
 
@@ -287,10 +287,10 @@ cp
 
   for(i = 0; i < listen_sockets; i++)
     {
-      if(FD_ISSET(udp_socket[i], f))
-	handle_incoming_vpn_data(udp_socket[i]);
-      if(FD_ISSET(tcp_socket[i], f))
-	handle_new_meta_connection(tcp_socket[i]);
+      if(FD_ISSET(listen_socket[i].udp, f))
+	handle_incoming_vpn_data(listen_socket[i].udp);
+      if(FD_ISSET(listen_socket[i].tcp, f))
+	handle_new_meta_connection(listen_socket[i].tcp);
     }
 
   for(node = connection_tree->head; node; node = node->next)
@@ -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;
@@ -405,6 +405,8 @@ cp
           if(routing_mode== RMODE_SWITCH)
 	    age_mac();
 
+          age_past_requests();
+
           /* Should we regenerate our key? */
 
           if(keyexpires < now)
@@ -444,14 +446,14 @@ cp
           close_network_connections();
           exit_configuration(&config_tree);
 
-          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
+          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds..."));
           sleep(5);
 
           init_configuration(&config_tree);
 
           if(read_server_config())
             {
-              syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+              syslog(LOG_ERR, _("Unable to reread configuration file, exitting."));
               exit(1);
             }