Generalized request broadcasting/forwarding.
[tinc] / src / net.c
index d6809d5..13933d9 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
-    Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
+                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.166 2002/03/23 20:13:56 guus Exp $
+    $Id: net.c,v 1.35.4.177 2002/09/04 16:26:44 guus Exp $
 */
 
 #include "config.h"
 #include <fcntl.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#ifdef HAVE_LINUX
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
  #include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
  #include <netinet/tcp.h>
 #endif
 #include <stdio.h>
 
 #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(listen_socket[i].tcp, fs);
-      FD_SET(listen_socket[i].udp, fs);
-    }
-
-  FD_SET(device_fd, fs);
-cp
-}
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
 void purge(void)
 {
-  avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext, *cnode;
+  avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
   node_t *n;
   edge_t *e;
   subnet_t *s;
-  connection_t *c;
 cp
   if(debug_lvl >= DEBUG_PROTOCOL)
     syslog(LOG_DEBUG, _("Purging unreachable nodes"));
@@ -129,14 +109,7 @@ cp
       {
         snext = snode->next;
         s = (subnet_t *)snode->data;
-
-        for(cnode = connection_tree->head; cnode; cnode = cnode->next)
-        {
-          c = (connection_t *)cnode->data;
-          if(c->status.active)
-            send_del_subnet(c, s);
-        }
-
+       send_del_subnet(broadcast, s);
         subnet_del(n, s);
       }
 
@@ -144,14 +117,7 @@ cp
       {
         enext = enode->next;
         e = (edge_t *)enode->data;
-
-        for(cnode = connection_tree->head; cnode; cnode = cnode->next)
-        {
-          c = (connection_t *)cnode->data;
-          if(c->status.active)
-            send_del_edge(c, e);
-        }
-
+       send_del_edge(broadcast, e);
         edge_del(e);
       }
 
@@ -161,6 +127,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
@@ -170,8 +173,6 @@ cp
 */
 void terminate_connection(connection_t *c, int report)
 {
-  avl_node_t *node;
-  connection_t *other;
 cp
   if(c->status.remove)
     return;
@@ -181,6 +182,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);
@@ -188,14 +193,7 @@ cp
   if(c->edge)
     {
       if(report)
-        {
-          for(node = connection_tree->head; node; node = node->next)
-            {
-              other = (connection_t *)node->data;
-              if(other->status.active && other != c)
-                send_del_edge(other, c->edge);
-            }
-        }
+        send_del_edge(broadcast, c->edge);
 
       edge_del(c->edge);
 
@@ -211,13 +209,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 +276,12 @@ cp
         route_outgoing(&packet);
     }
 
-  for(i = 0; i < listen_sockets; 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)
     {
       c = (connection_t *)node->data;
 
       if(c->status.remove)
-        return;
+        continue;
 
       if(FD_ISSET(c->socket, f))
         {
@@ -320,29 +303,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 +327,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;
@@ -369,25 +340,22 @@ 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));
+              cp_trace();
+             dump_connections();
               return;
             }
+
+         continue;
         }
 
-      if(r > 0)
-        check_network_activity(&fset);
+      check_network_activity(&fset);
 
       if(do_purge)
         {
@@ -415,7 +383,7 @@ cp
                 syslog(LOG_INFO, _("Regenerating symmetric key"));
 
               RAND_pseudo_bytes(myself->key, myself->keylength);
-              send_key_changed(myself->connection, myself);
+              send_key_changed(broadcast, myself);
               keyexpires = now + keylifetime;
             }
         }