X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=b52412d8f5a10e6b6cecc4365e1b592ee8c16a28;hp=8b243a5cbd031fb4acaf3e4f26951287c708b929;hb=8fa9bc017d89b53798903df3fa98311067d4de90;hpb=35932fe6c8cb481eb687f98424776ce429570c21

diff --git a/src/net.c b/src/net.c
index 8b243a5c..b52412d8 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.50 2000/10/29 00:02:18 guus Exp $
+    $Id: net.c,v 1.35.4.53 2000/10/29 09:19:24 guus Exp $
 */
 
 #include "config.h"
@@ -48,7 +48,6 @@
 #include <xalloc.h>
 
 #include "conf.h"
-#include "encr.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -738,6 +737,14 @@ cp
       net->net.ipv4.address = cfg->data.ip->address;
       net->net.ipv4.mask = cfg->data.ip->mask;
       
+      /* Teach newbies what subnets are... */
+      
+      if((net->net.ipv4.address & net->net.ipv4.mask) != net->net.ipv4.address)
+        {
+          syslog(LOG_ERR, _("Network address and subnet mask do not match!"));
+          return -1;
+        }        
+      
       subnet_add(myself, net);
     }
     
@@ -861,16 +868,8 @@ void close_network_connections(void)
 cp
   for(p = conn_list; p != NULL; p = p->next)
     {
-      if(p->status.dataopen)
-	{
-	  shutdown(p->socket, 0); /* No more receptions */
-	  close(p->socket);
-	}
-      if(p->status.meta)
-	{
-	  shutdown(p->meta_socket, 0); /* No more receptions */
-          close(p->meta_socket);
-        }
+      p->status.active = 0;
+      terminate_connection(p);
     }
 
   if(myself)
@@ -878,6 +877,8 @@ cp
       {
 	close(myself->meta_socket);
 	close(myself->socket);
+        free_conn_list(myself);
+        myself = NULL;
       }
 
   /* Execute tinc-down script right before shutting down the interface */
@@ -1057,9 +1058,7 @@ void terminate_connection(conn_list_t *cl)
   subnet_t *s;
 cp
   if(cl->status.remove)
-    {
-      return;
-    }
+    return;
 
   cl->status.remove = 1;
 
@@ -1093,19 +1092,19 @@ cp
   for(s = cl->subnets; s; s = s->next)
     subnet_del(s);
 
-  /* Inactivate */
-
-  cl->status.active = 0;
-
   /* Check if this was our outgoing connection */
     
-  if(cl->status.outgoing)
+  if(cl->status.outgoing && cl->status.active)
     {
       signal(SIGALRM, sigalrm_handler);
       seconds_till_retry = 5;
       alarm(seconds_till_retry);
       syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in 5 seconds"));
     }
+
+  /* Inactivate */
+
+  cl->status.active = 0;
 cp
 }
 
@@ -1304,20 +1303,22 @@ cp
 
       if(sighup)
         {
+          syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
           sighup = 0;
-/* FIXME: reprogram this.
-	  if(debug_lvl > 1)
-	    syslog(LOG_INFO, _("Rereading configuration file"));
           close_network_connections();
-          clear_config();
-          if(read_config_file(&config, configfilename))
+          clear_config(&config);
+
+          if(read_server_config())
             {
               syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
               exit(0);
             }
+
           sleep(5);
-          setup_network_connections();
-*/
+          
+          if(setup_network_connections())
+            return;
+            
           continue;
         }