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

diff --git a/src/net.c b/src/net.c
index 41767d8f..ca70886f 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.175 2002/09/03 20:43:25 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>
@@ -60,7 +65,6 @@
 #include "process.h"
 #include "protocol.h"
 #include "subnet.h"
-#include "graph.h"
 #include "process.h"
 #include "route.h"
 #include "device.h"
@@ -68,19 +72,22 @@
 
 #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;
 
 time_t now = 0;
 
-/* Purge edges and subnets of unreachable nodes. Use carefully. */
+/* Purge subnets of unreachable nodes. Use carefully. */
 
 void purge(void)
 {
-  avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext, *cnode;
+  avl_node_t *nnode, *nnext, *snode, *snext, *cnode;
   node_t *n;
-  edge_t *e;
   subnet_t *s;
   connection_t *c;
 cp
@@ -112,21 +119,6 @@ cp
         subnet_del(n, s);
       }
 
-      for(enode = n->edge_tree->head; enode; enode = enext)
-      {
-        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);
-        }
-
-        edge_del(e);
-      }
-
       node_del(n);
     }
   }
@@ -151,14 +143,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);
@@ -172,14 +165,15 @@ cp
 /*
   Terminate a connection:
   - Close the socket
-  - Remove associated edge and tell other connections about it if report = 1
+  - Tell other connections about it if report = 1
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
 void terminate_connection(connection_t *c, int report)
 {
-  avl_node_t *node;
+  avl_node_t *node, *node2;
   connection_t *other;
+  node_t *n;
 cp
   if(c->status.remove)
     return;
@@ -192,30 +186,31 @@ cp
   c->status.active = 0;
 
   if(c->node)
-    c->node->connection = NULL;
-
-  if(c->socket)
-    close(c->socket);
-
-  if(c->edge)
     {
-      if(report)
+      if(report && c->node->connection)
         {
           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);
+              if(other == c)
+                continue;
+              for(node2 = node_tree->head; node2; node2 = node2->next)
+                {
+                  n = (node_t *)node2->data;
+                  if(n->nexthop == c->node)
+                    {
+                      send_del_node(other, n);
+                      n->status.reachable = 0;
+                    }
+                }
             }
         }
-
-      edge_del(c->edge);
-
-      /* Run MST and SSSP algorithms */
-
-      graph();
+      c->node->connection = NULL;
     }
 
+  if(c->socket)
+    close(c->socket);
+
   /* Check if this was our outgoing connection */
 
   if(c->outgoing)
@@ -236,14 +231,13 @@ cp
 */
 void check_dead_connections(void)
 {
-  avl_node_t *node, *next;
+  avl_node_t *node;
   connection_t *c;
 cp
-  for(node = connection_tree->head; node; node = next)
+  for(node = connection_tree->head; node; node = node->next)
     {
-      next = node->next;
       c = (connection_t *)node->data;
-      if(c->last_ping_time + pingtimeout < now)
+      if(c->last_ping_time + pingtimeout < now && !c->status.remove)
         {
           if(c->status.active)
             {
@@ -365,6 +359,8 @@ cp
 	      dump_connections();
               return;
             }
+
+	  continue;
         }
 
       check_network_activity(&fset);