Always close all sockets in terminate_connection().

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index dc2d65d..9bdc4b3 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.122 2001/07/20 13:54:19 guus Exp $
+    $Id: net.c,v 1.35.4.125 2001/07/21 15:46:34 guus Exp $
 */
 
 #include "config.h"
@@ -247,7 +247,7 @@ cp
   if((cl->options | myself->options) & OPTION_TCPONLY)
     {
       if(send_tcppacket(cl, packet))
-        terminate_connection(cl);
+        terminate_connection(cl, 1);
     }
   else
     send_udppacket(cl, packet);
@@ -885,10 +885,10 @@ cp
 
   keyexpires = time(NULL) + keylifetime;
 cp
-
-  /* Activate ourselves */
+  /* Done */
 
   myself->status.active = 1;
+  id_add(myself);
 
   syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
 cp
@@ -1001,30 +1001,24 @@ cp
 */
 void close_network_connections(void)
 {
-  avl_node_t *node;
+  avl_node_t *node, *next;
   connection_t *p;
 cp
-  for(node = connection_tree->head; node; node = node->next)
+  for(node = connection_tree->head; node; node = next)
     {
+      next = node->next;
       p = (connection_t *)node->data;
       p->status.outgoing = 0;
-      p->status.active = 0;
-      terminate_connection(p);
+      terminate_connection(p, 0);
     }
 
-  if(myself)
-    if(myself->status.active)
-      {
-       close(myself->meta_socket);
-        free_connection(myself);
-        myself = NULL;
-      }
+  terminate_connection(myself, 0);
+
+  destroy_trees();
 
   execute_script("tinc-down");
 
   close(tap_fd);
-
-  destroy_connection_tree();
 cp
   return;
 }
@@ -1137,10 +1131,14 @@ cp
 }
 
 /*
-  terminate a connection and notify the other
-  end before closing the sockets
+  Terminate a connection:
+  - Close the sockets
+  - Remove associated hosts and subnets
+  - Deactivate the host
+  - Since it might still be referenced, put it on the prune list.
+  - If report == 1, then send DEL_HOST messages to the other tinc daemons.
 */
-void terminate_connection(connection_t *cl)
+void terminate_connection(connection_t *cl, int report)
 {
   connection_t *p;
   subnet_t *subnet;
@@ -1148,41 +1146,47 @@ void terminate_connection(connection_t *cl)
 cp
   if(cl->status.remove)
     return;
-
-  if(debug_lvl >= DEBUG_CONNECTIONS)
-    syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
-           cl->name, cl->hostname);
-
-  cl->status.remove = 1;
+  else
+    cl->status.remove = 1;
 
   if(cl->socket)
     close(cl->socket);
-  if(cl->status.meta)
+  if(cl->meta_socket)
     close(cl->meta_socket);
 
+  connection_del(cl);
+
   if(cl->status.meta)
     {
-      /* Find all connections that were lost because they were behind cl
-         (the connection that was dropped). */
-
-        for(node = active_tree->head; node; node = node->next)
-          {
-            p = (connection_t *)node->data;
-            if(p->nexthop == cl && p != cl)
-              terminate_connection(p);
-          }
-
-      /* Inform others of termination if it was still active */
+      if(debug_lvl >= DEBUG_CONNECTIONS)
+        syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
+               cl->name, cl->hostname);
 
       if(cl->status.active)
-        for(node = connection_tree->head; node; node = node->next)
-          {
-            p = (connection_t *)node->data;
-            if(p->status.active && p != cl)
-              send_del_host(p, cl);    /* Sounds like recursion, but p does not have a meta connection :) */
-          }
+        {
+          /* Find all connections that were lost because they were behind cl
+             (the connection that was dropped). */
+
+          for(node = active_tree->head; node; node = next)
+            {
+              next = node->next;
+              p = (connection_t *)node->data;
+              if(p->nexthop == cl)
+                terminate_connection(p, report);
+            }
+        }
     }
 
+  /* Inform others of termination if needed */
+
+  if(report)
+    for(node = connection_tree->head; node; node = node->next)
+      {
+        p = (connection_t *)node->data;
+        if(p->status.active)
+          send_del_host(p, cl);        /* Sounds like recursion, but p does not have a meta connection :) */
+      }
+
   /* Remove the associated subnets */
 
   for(node = cl->subnet_tree->head; node; node = next)
@@ -1201,11 +1205,10 @@ cp
       alarm(seconds_till_retry);
       syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
     }
-
-  /* Deactivate */
-
-  cl->status.active = 0;
 cp
+  /* Schedule it for pruning */
+
+  prune_add(cl);
 }
 
 /*
@@ -1237,7 +1240,7 @@ cp
                    syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
                           cl->name, cl->hostname);
                  cl->status.timeout = 1;
-                 terminate_connection(cl);
+                 terminate_connection(cl, 1);
                 }
               else
                 {
@@ -1302,7 +1305,7 @@ cp
       if(FD_ISSET(p->meta_socket, f))
        if(receive_meta(p) < 0)
          {
-           terminate_connection(p);
+           terminate_connection(p, 1);
            return;
          }
     }
@@ -1376,7 +1379,7 @@ cp
       tv.tv_sec = timeout;
       tv.tv_usec = 0;
 
-      prune_connection_tree();
+      prune_flush();
       build_fdset(&fset);
 
       if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)