X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.c;h=f1593b6e5f9ecebf70c3b29cb7db7df7dfbb05b9;hb=3a6200c1e39b61b249db3d1f9bcffa77351863bd;hp=adad410537128bfac04195509faccbc3fbe57f96;hpb=408ca91766088b6c2d38e198b0692bf394b41248;p=tinc

diff --git a/src/net.c b/src/net.c
index adad4105..f1593b6e 100644
--- 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.77 2000/11/20 19:12:12 guus Exp $
+    $Id: net.c,v 1.35.4.79 2000/11/20 22:13:03 guus Exp $
 */
 
 #include "config.h"
@@ -852,6 +852,9 @@ int setup_network_connections(void)
 {
   config_t const *cfg;
 cp
+  init_connections();
+  init_subnets();
+
   if((cfg = get_config_val(config, config_pingtimeout)) == NULL)
     timeout = 60;
   else
@@ -1110,7 +1113,7 @@ cp
 void terminate_connection(connection_t *cl)
 {
   connection_t *p;
-  subnet_t *s;
+  subnet_t *subnet;
   rbl_t *rbl;
 
 cp
@@ -1152,7 +1155,11 @@ cp
 
   /* Remove the associated subnets */
 
-  rbl_delete_rbltree(cl->subnet_tree);
+  RBL_FOREACH(cl->subnet_tree, rbl)
+    {
+      subnet = (subnet_t *)rbl->data;
+      subnet_del(subnet);
+    }
 
   /* Check if this was our outgoing connection */