- Removed old encr stuff

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 3da023c..b52412d 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.49 2000/10/28 21:52:22 guus Exp $
+    $Id: net.c,v 1.35.4.53 2000/10/29 09:19:24 guus Exp $
 */
 
 #include "config.h"
@@ -38,6 +38,7 @@
 #include <sys/types.h>
 #include <syslog.h>
 #include <unistd.h>
+#include <sys/ioctl.h>
 
 #ifdef HAVE_TUNTAP
 #include LINUX_IF_TUN_H
@@ -47,7 +48,6 @@
 #include <xalloc.h>
 
 #include "conf.h"
-#include "encr.h"
 #include "net.h"
 #include "netutl.h"
 #include "protocol.h"
@@ -660,7 +660,6 @@ int setup_myself(void)
 {
   config_t const *cfg;
   subnet_t *net;
-  int i;
 cp
   myself = new_conn_list();
 
@@ -731,13 +730,21 @@ cp
 
 /* Read in all the subnets specified in the host configuration file */
 
-  for(cfg = myself->config; cfg = get_config_val(cfg, subnet); cfg = cfg->next)
+  for(cfg = myself->config; (cfg = get_config_val(cfg, subnet)); cfg = cfg->next)
     {
       net = new_subnet();
       net->type = SUBNET_IPV4;
       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,17 +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)
-       {
-         send_termreq(p);
-         shutdown(p->meta_socket, 0); /* No more receptions */
-          close(p->meta_socket);
-        }
+      p->status.active = 0;
+      terminate_connection(p);
     }
 
   if(myself)
@@ -879,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 */
@@ -1016,7 +1016,6 @@ cp
 int handle_incoming_vpn_data()
 {
   vpn_packet_t pkt;
-  int lenin;
   int x, l = sizeof(x);
   struct sockaddr from;
   socklen_t fromlen = sizeof(from);
@@ -1056,11 +1055,13 @@ cp
 void terminate_connection(conn_list_t *cl)
 {
   conn_list_t *p;
-
+  subnet_t *s;
 cp
   if(cl->status.remove)
     return;
 
+  cl->status.remove = 1;
+
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
            cl->name, cl->hostname);
@@ -1070,43 +1071,40 @@ cp
   if(cl->status.meta)
     close(cl->meta_socket);
 
-  cl->status.remove = 1;
-
-  /* If this cl isn't active, don't send any DEL_HOSTs. */
-
-/* FIXME: reprogram this.
-  if(cl->status.active)
-    notify_others(cl,NULL,send_del_host);
-*/
-    
 cp
   /* Find all connections that were lost because they were behind cl
      (the connection that was dropped). */
+
   if(cl->status.meta)
     for(p = conn_list; p != NULL; p = p->next)
-      {
-        if((p->nexthop == cl) && (p != cl))
-          {
-            if(cl->status.active && p->status.active)
-/* FIXME: reprogram this
-              notify_others(p,cl,send_del_host);
-*/;
-           if(cl->socket)
-             close(cl->socket);
-           p->status.active = 0;
-           p->status.remove = 1;
-          }
-      }
+      if((p->nexthop == cl) && (p != cl))
+        terminate_connection(p);       /* Sounds like recursion, but p does not have a meta connection :) */
+
+  /* Inform others of termination if it was still active */
+
+  if(cl->status.active)
+    for(p = conn_list; p != NULL; p = p->next)
+      if(p->status.meta && p->status.active && p!=cl)
+        send_del_host(p, cl);
+
+  /* Remove the associated subnets */
+
+  for(s = cl->subnets; s; s = s->next)
+    subnet_del(s);
+
+  /* Check if this was our outgoing connection */
     
-  cl->status.active = 0;
-  
-  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
 }
 
@@ -1126,8 +1124,6 @@ cp
   now = time(NULL);
   for(p = conn_list; p != NULL; p = p->next)
     {
-      if(p->status.remove)
-       continue;
       if(p->status.active && p->status.meta)
        {
           if(p->last_ping_time + timeout < now)
@@ -1178,9 +1174,7 @@ cp
       return 0;
     }
 
-  ncn->status.meta = 1;
-  ncn->next = conn_list;
-  conn_list = ncn;
+  conn_list_add(ncn);
 cp
   return 0;
 }
@@ -1239,8 +1233,6 @@ cp
 void handle_tap_input(void)
 {
   vpn_packet_t vp;
-  subnet_t *subnet;
-  ipv4_t dest;
   int lenin;
 cp  
   if(taptype == TAP_TYPE_TUNTAP)
@@ -1311,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;
         }