X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=13933d9a4bc4c33c9e3c2d0dd7728d86c91a2d12;hp=41767d8f239ea4fe2b928d94b064de2f2f2839ae;hb=8b2b67e26c5b971761f5015764d5e188f6343bc4;hpb=0e7136027ce05bfeca977f2f64f3b228ea4fda87

diff --git a/src/net.c b/src/net.c
index 41767d8f..13933d9a 100644
--- 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.168 2002/03/27 14:02:36 guus Exp $
+    $Id: net.c,v 1.35.4.177 2002/09/04 16:26:44 guus Exp $
 */
 
 #include "config.h"
@@ -26,8 +26,13 @@
 #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>
@@ -68,6 +73,10 @@
 
 #include "system.h"
 
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
+#endif
+
 int do_purge = 0;
 int sighup = 0;
 int sigalrm = 0;
@@ -78,11 +87,10 @@ time_t now = 0;
 
 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"));
@@ -101,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);
       }
 
@@ -116,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);
       }
 
@@ -151,14 +145,15 @@ cp
       c = (connection_t *)node->data;
 
       if(c->status.remove)
-        connection_del(c);
+        {
+	  connection_del(c);
+          if(!connection_tree->head)
+            purge();
+        }
       else
         FD_SET(c->socket, fs);
     }
 
-  if(!connection_tree->head)
-    purge();
-
   for(i = 0; i < listen_sockets; i++)
     {
       FD_SET(listen_socket[i].tcp, fs);
@@ -178,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;
@@ -200,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);
 
@@ -365,6 +351,8 @@ cp
 	      dump_connections();
               return;
             }
+
+	  continue;
         }
 
       check_network_activity(&fset);
@@ -395,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;
             }
         }