X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=32c66e8781054fdf07edaae72c28889eaad833b9;hp=81b302960c2b3206b9f002ffe4e1fc3da12dbe30;hb=3b9802a542f1fa439321d3386763ec33989194b5;hpb=8738c007b15eea024bc4ca6ee0f972b2f5bf259f

diff --git a/src/net.c b/src/net.c
index 81b30296..32c66e87 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.48 2000/10/28 21:25:20 guus Exp $
+    $Id: net.c,v 1.35.4.51 2000/10/29 00:46:43 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
@@ -52,6 +53,8 @@
 #include "netutl.h"
 #include "protocol.h"
 #include "meta.h"
+#include "connlist.h"
+#include "subnet.h"
 
 #include "system.h"
 
@@ -67,6 +70,8 @@ static int seconds_till_retry;
 
 char *unknown = NULL;
 
+subnet_t mymac;
+
 /*
   strip off the MAC adresses of an ethernet frame
 */
@@ -145,9 +150,9 @@ cp
   outlen = outpkt.len+2;
   memcpy(&outpkt, inpkt, outlen);
      
-  /* FIXME sometime
-  add_mac_addresses(&outpkt);
-  */
+  /* Fix mac address */
+
+  memcpy(outpkt.data, mymac.net.mac.address.x, 6);
 
   if(taptype == TAP_TYPE_TUNTAP)
     {
@@ -381,7 +386,16 @@ cp
 cp
   tap_fd = nfd;
 
+  /* Set default MAC address for ethertap devices */
+  
   taptype = TAP_TYPE_ETHERTAP;
+  mymac.type = SUBNET_MAC;
+  mymac.net.mac.address.x[0] = 0xfe;
+  mymac.net.mac.address.x[1] = 0xfd;
+  mymac.net.mac.address.x[2] = 0x00;
+  mymac.net.mac.address.x[3] = 0x00;
+  mymac.net.mac.address.x[4] = 0x00;
+  mymac.net.mac.address.x[5] = 0x00;
 
 #ifdef HAVE_TUNTAP
   /* Ok now check if this is an old ethertap or a new tun/tap thingie */
@@ -395,11 +409,6 @@ cp
   { 
     syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname);
     taptype = TAP_TYPE_TUNTAP;
-
-    if((cfg = get_config_val(config, tapsubnet)) == NULL)
-      syslog(LOG_INFO, _("tun/tap device will be left unconfigured"));
-    else
-      /* Setup inetaddr/netmask etc */;
   }
 #endif
 
@@ -652,7 +661,6 @@ int setup_myself(void)
 {
   config_t const *cfg;
   subnet_t *net;
-  int i;
 cp
   myself = new_conn_list();
 
@@ -723,13 +731,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);
     }
     
@@ -860,7 +876,6 @@ cp
 	}
       if(p->status.meta)
 	{
-	  send_termreq(p);
 	  shutdown(p->meta_socket, 0); /* No more receptions */
           close(p->meta_socket);
         }
@@ -1008,7 +1023,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);
@@ -1048,10 +1062,14 @@ cp
 void terminate_connection(conn_list_t *cl)
 {
   conn_list_t *p;
-
+  subnet_t *s;
 cp
   if(cl->status.remove)
-    return;
+    {
+      return;
+    }
+
+  cl->status.remove = 1;
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
     syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
@@ -1062,36 +1080,33 @@ 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);
+
+  /* Inactivate */
+
   cl->status.active = 0;
-  
+
+  /* Check if this was our outgoing connection */
+    
   if(cl->status.outgoing)
     {
       signal(SIGALRM, sigalrm_handler);
@@ -1118,8 +1133,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)
@@ -1170,9 +1183,7 @@ cp
       return 0;
     }
 
-  ncn->status.meta = 1;
-  ncn->next = conn_list;
-  conn_list = ncn;
+  conn_list_add(ncn);
 cp
   return 0;
 }
@@ -1231,8 +1242,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)