- Let user choose whether keys are in the config files or separate

[tinc] / src / route.c

diff --git a/src/route.c b/src/route.c
index a958e1a..8ff2e39 100644 (file)
--- a/src/route.c
+++ b/src/route.c
@@ -17,72 +17,125 @@
     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.1 2000/10/23 13:52:54 guus Exp $
+    $Id: route.c,v 1.1.2.4 2001/01/05 23:53:53 guus Exp $
 */
 
 #include "config.h"
 
 #include <utils.h>
 #include <xalloc.h>
+#include <syslog.h>
 
 #include "net.h"
-#include "connlist.h"
+#include "connection.h"
+#include "subnet.h"
+#include "route.h"
 
 #include "system.h"
 
-int routing_mode = 0;  /* Will be used to determine if we route by MAC or by payload's protocol */
+int routing_mode = RMODE_ROUTER;       /* Will be used to determine if we route by MAC or by payload's protocol */
 
-conn_list_t *route_packet(vpn_packet_t *packet)
+connection_t *route_mac(connection_t *source, vpn_packet_t *packet)
 {
-  unsigned short type;
+  connection_t *oldsrc, *dst;
+  subnet_t *subnet;
 cp
-  type = ntohs(*((unsigned short*)(&packet.data[12])))
+  /* Learn source address */
 
-  switch(type)
+  oldsrc = lookup_subnet_mac((mac_t *)(&packet->data[0]))->owner;
+  
+  if(!oldsrc)
     {
-      case 0x0800:
-        return route_ipv4(packet);
-      case 0x86DD:
-        return route_ipv6(packet);
-/*
-      case 0x8137:
-        return route_ipx(packet);
-      case 0x0806:
-        return route_arp(packet);
-*/
-      default:
-        /* TODO: try MAC as last resort? */
-        if(debug_lvl >= DEBUG_TRAFFIC)
-          {
-            syslog(LOG_WARNING, _("Cannot route packet: unknown type %hx"), type);
-          }
-            return NULL;
-     }
+      subnet = new_subnet();
+      subnet->type = SUBNET_MAC;
+      memcpy(&subnet->net.mac.address, (mac_t *)(&packet->data[0]), sizeof(mac_t));
+      subnet_add(source, subnet);
+    }
+
+  /* FIXME: do ageing and roaming */
+  
+  /* 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]);
+      } 
+cp  
+  return dst;  
 }
 
-conn_list_t *route_ipv4(vpn_packet_t *packet)
+connection_t *route_ipv4(vpn_packet_t *packet)
 {
   ipv4_t dest;
-  conn_list_t *cl;
+  connection_t *cl;
 cp
-  dest = ntohl(*((unsigned long*)(&packet.data[30]);
+  dest = ntohl(*((unsigned long*)(&packet->data[30])));
   
-  cl = lookup_conn_list_ipv4(dest);
+  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]);
+               packet->data[30], packet->data[31], packet->data[32], packet->data[33]);
       } 
-  
-  return cl;  
 cp
+  return cl;  
 }
 
-conn_list_t *route_ipv6(vpn_packet_t *packet)
+connection_t *route_ipv6(vpn_packet_t *packet)
 {
 cp
-  syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not implemented yet"));
+  if(debug_lvl > DEBUG_NOTHING)
+    {
+      syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not implemented yet"));
+    } 
+cp
   return NULL;
+}
+
+connection_t *route_packet(connection_t *source, vpn_packet_t *packet)
+{
+  unsigned short int type;
 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);
+            case 0x86DD:
+              return route_ipv6(packet);
+      /*
+            case 0x8137:
+              return route_ipx(packet);
+            case 0x0806:
+              return route_arp(packet);
+      */
+            default:
+              if(debug_lvl >= DEBUG_TRAFFIC)
+                {
+                  syslog(LOG_WARNING, _("Cannot route packet: unknown type %hx"), type);
+                }
+              return NULL;
+           }
+    }
 }