X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=0a23c82168c258e943f997c1f9408cde21ceb9c5;hp=4061d7af7bf0e28191373256fbd12e83d76f9dff;hb=d699f3079c658e05f928c358d110d1d27849ea71;hpb=4fda4560bbdd41e217ce0e1a90ba98c79e4f3519

diff --git a/src/net.c b/src/net.c
index 4061d7af..0a23c821 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.167 2002/03/24 16:28:27 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)
@@ -298,7 +298,7 @@ cp
       c = (connection_t *)node->data;
 
       if(c->status.remove)
-        return;
+        continue;
 
       if(FD_ISSET(c->socket, f))
         {
@@ -369,13 +369,20 @@ 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)
         {
-          if(errno != EINTR) /* because of a signal */
+          if(errno != EINTR && errno != EAGAIN)
             {
               syslog(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+	      dump_connections();
               return;
             }
         }
@@ -383,13 +390,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 +406,8 @@ cp
           if(routing_mode== RMODE_SWITCH)
 	    age_mac();
 
+          age_past_requests();
+
           /* Should we regenerate our key? */
 
           if(keyexpires < now)