Small fixes to allow correct compilation under FreeBSD (tested with 4.3)
[tinc] / src / route.c
index 8ff2e39..1b6336d 100644 (file)
@@ -1,7 +1,7 @@
 /*
     route.c -- routing
-    Copyright (C) 2000 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: route.c,v 1.1.2.4 2001/01/05 23:53:53 guus Exp $
+    $Id: route.c,v 1.1.2.9 2001/05/28 08:21:43 guus Exp $
 */
 
 #include "config.h"
 
+#ifdef HAVE_FREEBSD
+ #include <sys/param.h>
+#else
+ #include <netinet/in.h>
+#endif
 #include <utils.h>
 #include <xalloc.h>
 #include <syslog.h>
 
 #include "system.h"
 
-int routing_mode = RMODE_ROUTER;       /* Will be used to determine if we route by MAC or by payload's protocol */
+int routing_mode = RMODE_ROUTER;
+subnet_t mymac;
 
-connection_t *route_mac(connection_t *source, vpn_packet_t *packet)
+void learn_mac(connection_t *source, mac_t *address)
 {
-  connection_t *oldsrc, *dst;
   subnet_t *subnet;
 cp
-  /* Learn source address */
-
-  oldsrc = lookup_subnet_mac((mac_t *)(&packet->data[0]))->owner;
+  subnet = lookup_subnet_mac(address);
   
-  if(!oldsrc)
+  if(!subnet)
     {
       subnet = new_subnet();
       subnet->type = SUBNET_MAC;
-      memcpy(&subnet->net.mac.address, (mac_t *)(&packet->data[0]), sizeof(mac_t));
+//      subnet->lasttime = gettimeofday();
+      memcpy(&subnet->net.mac.address, address, sizeof(mac_t));
       subnet_add(source, subnet);
+
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_DEBUG, _("Learned new MAC address %x:%x:%x:%x:%x:%x from %s (%s)"),
+               address->x[0],
+               address->x[1],
+               address->x[2],
+               address->x[3],
+               address->x[4],
+               address->x[5],
+               source->name, source->hostname);
+        }
     }
+}
+
+connection_t *route_mac(connection_t *source, vpn_packet_t *packet)
+{
+  subnet_t *subnet;
+cp
+  /* Learn source address */
 
-  /* FIXME: do ageing and roaming */
+  learn_mac(source, (mac_t *)(&packet->data[0]));
   
   /* Lookup destination address */
     
-  dst = lookup_subnet_mac((mac_t *)(&packet->data[6]))->owner;
-
-  if(!dst)
-    if(debug_lvl >= DEBUG_TRAFFIC)
-      {
-        syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"),
-               packet->data[6],
-               packet->data[7],
-               packet->data[8],
-               packet->data[9],
-               packet->data[10],
-               packet->data[11]);
-      } 
+  subnet = lookup_subnet_mac((mac_t *)(&packet->data[6]));
+
+  if(!subnet)
+    {
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %x:%x:%x:%x:%x:%x"),
+                 packet->data[6],
+                 packet->data[7],
+                 packet->data[8],
+                 packet->data[9],
+                 packet->data[10],
+                 packet->data[11]);
+        } 
+      return NULL;
+    }
 cp  
-  return dst;  
+  return subnet->owner;  
 }
 
 connection_t *route_ipv4(vpn_packet_t *packet)
 {
   ipv4_t dest;
-  connection_t *cl;
+  subnet_t *subnet;
 cp
   dest = ntohl(*((unsigned long*)(&packet->data[30])));
   
-  cl = lookup_subnet_ipv4(&dest)->owner;
-  if(!cl)
-    if(debug_lvl >= DEBUG_TRAFFIC)
-      {
-        syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %d.%d.%d.%d"),
-               packet->data[30], packet->data[31], packet->data[32], packet->data[33]);
-      } 
+  subnet = lookup_subnet_ipv4(&dest);
+
+  if(!subnet)
+    {
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_WARNING, _("Cannot route packet: unknown destination address %d.%d.%d.%d"),
+                 packet->data[30], packet->data[31], packet->data[32], packet->data[33]);
+        }
+
+      return NULL;
+    }
 cp
-  return cl;  
+  return subnet->owner;  
 }
 
 connection_t *route_ipv6(vpn_packet_t *packet)
@@ -96,46 +127,71 @@ connection_t *route_ipv6(vpn_packet_t *packet)
 cp
   if(debug_lvl > DEBUG_NOTHING)
     {
-      syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not implemented yet"));
+      syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not yet implemented"));
     } 
 cp
   return NULL;
 }
 
-connection_t *route_packet(connection_t *source, vpn_packet_t *packet)
+void route_outgoing(vpn_packet_t *packet)
 {
   unsigned short int type;
+  avl_node_t *node;
+  connection_t *cl;
 cp
   /* FIXME: multicast? */
 
   switch(routing_mode)
     {
-      case RMODE_HUB:
-        return broadcast;
-        
-      case RMODE_SWITCH:
-        return route_mac(source, packet);
-        
       case RMODE_ROUTER:
         type = ntohs(*((unsigned short*)(&packet->data[12])));
         switch(type)
           {
             case 0x0800:
-              return route_ipv4(packet);
+              cl = route_ipv4(packet);
+              break;
             case 0x86DD:
-              return route_ipv6(packet);
-      /*
-            case 0x8137:
-              return route_ipx(packet);
-            case 0x0806:
-              return route_arp(packet);
-      */
+              cl = route_ipv6(packet);
+              break;
             default:
               if(debug_lvl >= DEBUG_TRAFFIC)
                 {
                   syslog(LOG_WARNING, _("Cannot route packet: unknown type %hx"), type);
                 }
-              return NULL;
+              return;
            }
+         if(cl)
+           send_packet(cl, packet);
+         break;
+        
+      case RMODE_SWITCH:
+        cl = route_mac(myself, packet);
+        if(cl)
+          send_packet(cl, packet);
+        break;
+        
+      case RMODE_HUB:
+        for(node = connection_tree->head; node; node = node->next)
+          {
+            cl = (connection_t *)node->data;
+            if(cl->status.active)
+              send_packet(cl, packet);
+          }
+        break;
     }
 }
+
+void route_incoming(connection_t *source, vpn_packet_t *packet)
+{
+  switch(routing_mode)
+    {
+      case RMODE_ROUTER:
+        memcpy(packet->data, mymac.net.mac.address.x, 6);
+        break;
+      case RMODE_SWITCH:
+        learn_mac(source, (mac_t *)(&packet->data[0]));
+        break;
+    }
+  
+  accept_packet(packet);
+}