Cleanup:

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 4061d7a..7ebbbd0 100644 (file)
--- 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.172 2002/06/08 12:57:09 guus Exp $
 */
 
 #include "config.h"
@@ -26,8 +26,10 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#ifdef HAVE_LINUX
+#ifdef HAVE_NETINET_IP_H
  #include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
  #include <netinet/tcp.h>
 #endif
 #include <stdio.h>
@@ -68,40 +70,16 @@
 
 #include "system.h"
 
-int do_prune = 0;
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
+#endif
+
 int do_purge = 0;
 int sighup = 0;
 int sigalrm = 0;
 
 time_t now = 0;
 
-/*
-  put all file descriptors in an fd_set array
-*/
-void build_fdset(fd_set *fs)
-{
-  avl_node_t *node;
-  connection_t *c;
-  int i;
-cp
-  FD_ZERO(fs);
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      c = (connection_t *)node->data;
-      FD_SET(c->socket, fs);
-    }
-
-  for(i = 0; i < listen_sockets; i++)
-    {
-      FD_SET(tcp_socket[i], fs);
-      FD_SET(udp_socket[i], fs);
-    }
-
-  FD_SET(device_fd, fs);
-cp
-}
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
 void purge(void)
@@ -161,6 +139,43 @@ cp
 cp
 }
 
+/*
+  put all file descriptors in an fd_set array
+  While we're at it, purge stuff that needs to be removed.
+*/
+void build_fdset(fd_set *fs)
+{
+  avl_node_t *node, *next;
+  connection_t *c;
+  int i;
+cp
+  FD_ZERO(fs);
+
+  for(node = connection_tree->head; node; node = next)
+    {
+      next = node->next;
+      c = (connection_t *)node->data;
+
+      if(c->status.remove)
+        {
+         connection_del(c);
+          if(!connection_tree->head)
+            purge();
+        }
+      else
+        FD_SET(c->socket, fs);
+    }
+
+  for(i = 0; i < listen_sockets; i++)
+    {
+      FD_SET(listen_socket[i].tcp, fs);
+      FD_SET(listen_socket[i].udp, fs);
+    }
+
+  FD_SET(device_fd, fs);
+cp
+}
+
 /*
   Terminate a connection:
   - Close the socket
@@ -181,6 +196,10 @@ cp
            c->name, c->hostname);
 
   c->status.remove = 1;
+  c->status.active = 0;
+
+  if(c->node)
+    c->node->connection = NULL;
 
   if(c->socket)
     close(c->socket);
@@ -198,11 +217,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 */
 
@@ -211,13 +230,6 @@ cp
       retry_outgoing(c->outgoing);
       c->outgoing = NULL;
     }
-
-  /* Deactivate */
-
-  c->status.active = 0;
-  if(c->node)
-    c->node->connection = NULL;
-  do_prune = 1;
 cp
 }
 
@@ -285,20 +297,12 @@ cp
         route_outgoing(&packet);
     }
 
-  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]);
-    }
-
   for(node = connection_tree->head; node; node = node->next)
     {
       c = (connection_t *)node->data;
 
       if(c->status.remove)
-        return;
+        continue;
 
       if(FD_ISSET(c->socket, f))
         {
@@ -320,29 +324,18 @@ cp
           if(receive_meta(c) < 0)
             {
               terminate_connection(c, c->status.active);
-              return;
+              continue;
             }
         }
     }
-cp
-}
 
-void prune_connections(void)
-{
-  connection_t *c;
-  avl_node_t *node, *next;
-cp
-  for(node = connection_tree->head; node; node = next)
+  for(i = 0; i < listen_sockets; i++)
     {
-      next = node->next;
-      c = (connection_t *)node->data;
-
-      if(c->status.remove)
-        connection_del(c);
+      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);
     }
-
-  if(!connection_tree->head)
-    purge();
 cp
 }
 
@@ -355,7 +348,6 @@ void main_loop(void)
   struct timeval tv;
   int r;
   time_t last_ping_check;
-  int t;
   event_t *event;
 cp
   last_ping_check = now;
@@ -373,23 +365,20 @@ cp
 
       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));
+              cp_trace();
+             dump_connections();
               return;
             }
-        }
-
-      if(r > 0)
-        check_network_activity(&fset);
 
-      if(do_prune)
-        {
-          prune_connections();
-          do_prune = 0;
+         continue;
         }
 
-     if(do_purge)
+      check_network_activity(&fset);
+
+      if(do_purge)
         {
           purge();
           do_purge = 0;
@@ -405,6 +394,8 @@ cp
           if(routing_mode== RMODE_SWITCH)
            age_mac();
 
+          age_past_requests();
+
           /* Should we regenerate our key? */
 
           if(keyexpires < now)