X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Froute.c;h=8df8128a116c2f49fce13c5d15d3075561f0b55e;hb=bf664c054fdabc30679367a752a27bb769655e4d;hp=fd18dfb823f431173fecaba018dd143ccae44df4;hpb=96ef7becdd71fc63c3489e3696117c1f137eade5;p=tinc

diff --git a/src/route.c b/src/route.c
index fd18dfb8..8df8128a 100644
--- a/src/route.c
+++ b/src/route.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: route.c,v 1.1.2.13 2001/06/06 19:12:38 guus Exp $
+    $Id: route.c,v 1.1.2.21 2001/11/16 17:40:50 zarq Exp $
 */
 
 #include "config.h"
@@ -27,21 +27,26 @@
 #endif
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <net/ethernet.h>
+#ifdef HAVE_SOLARIS
+ #include <net/if.h>
+ #define ETHER_ADDR_LEN 6
+#else
+ #include <net/ethernet.h>
+#endif
 #include <netinet/if_ether.h>
 #include <utils.h>
 #include <xalloc.h>
 #include <syslog.h>
+#include <string.h>
 
 #include <avl_tree.h>
 
 #include "net.h"
-#include "net/ethernet.h"
-#include "netinet/if_ether.h"
 #include "connection.h"
 #include "subnet.h"
 #include "route.h"
 #include "protocol.h"
+#include "device.h"
 
 #include "system.h"
 
@@ -52,7 +57,7 @@ void learn_mac(mac_t *address)
 {
   subnet_t *subnet;
   avl_node_t *node;
-  connection_t *p;
+  connection_t *c;
 cp
   subnet = lookup_subnet_mac(address);
 
@@ -73,14 +78,14 @@ cp
       
       for(node = connection_tree->head; node; node = node->next)
         {
-          p = (connection_t *)node->data;
-          if(p->status.meta && p->status.active && p!= myself)
-            send_add_subnet(p, subnet);
+          c = (connection_t *)node->data;
+          if(c->status.active)
+            send_add_subnet(c, subnet);
         }
     }
 }
 
-connection_t *route_mac(vpn_packet_t *packet)
+node_t *route_mac(vpn_packet_t *packet)
 {
   subnet_t *subnet;
 cp
@@ -98,21 +103,10 @@ cp
     return NULL;
 }
 
-connection_t *route_ipv4(vpn_packet_t *packet)
-{
-  ipv4_t dest;
-  subnet_t *subnet;
-cp
-  dest = ntohl(*((unsigned long*)(&packet->data[30])));
-  
-  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;
@@ -121,15 +115,27 @@ cp
   return subnet->owner;  
 }
 
-connection_t *route_ipv6(vpn_packet_t *packet)
+node_t *route_ip(vpn_packet_t *packet)
 {
+  struct addrinfo *dest;
+  subnet_t *subnet;
 cp
-  if(debug_lvl > DEBUG_NOTHING)
+#warning FIXME
+  memcpy(&dest, &packet->data[30], 0);
+
+  subnet = lookup_subnet_ip(&dest);
+cp
+  if(!subnet)
     {
-      syslog(LOG_WARNING, _("Cannot route packet: IPv6 routing not yet implemented"));
-    } 
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_WARNING, _("Cannot route packet: unknown IP destination address"));
+        }
+
+      return NULL;
+    }
 cp
-  return NULL;
+  return subnet->owner;  
 }
 
 void route_arp(vpn_packet_t *packet)
@@ -137,7 +143,7 @@ void route_arp(vpn_packet_t *packet)
   struct ether_arp *arp;
   subnet_t *subnet;
   unsigned char ipbuf[4];
-  ipv4_t dest;
+  struct addrinfo *dest;
 cp
   /* First, snatch the source address from the ARP packet */
 
@@ -166,9 +172,9 @@ cp
     }
 
   /* Check if the IP address exists on the VPN */
-
+#warning FIXME
   dest = ntohl(*((unsigned long*)(arp->arp_tpa)));
-  subnet = lookup_subnet_ipv4(&dest);
+  subnet = lookup_subnet_ip(&dest);
 
   if(!subnet)
     {
@@ -197,14 +203,14 @@ cp
   memcpy(arp->arp_sha, packet->data + ETHER_ADDR_LEN, ETHER_ADDR_LEN);	/* add fake source hard addr */
   arp->arp_op = htons(ARPOP_REPLY);
   
-  accept_packet(packet);
+  write_packet(packet);
 cp
 }
 
 void route_outgoing(vpn_packet_t *packet)
 {
   unsigned short int type;
-  connection_t *cl;
+  node_t *n;
 cp
   /* FIXME: multicast? */
 
@@ -215,10 +221,10 @@ cp
         switch(type)
           {
             case 0x0800:
-              cl = route_ipv4(packet);
+              n = route_ipv4(packet);
               break;
             case 0x86DD:
-              cl = route_ipv6(packet);
+              n = route_ipv6(packet);
               break;
             case 0x0806:
               route_arp(packet);
@@ -230,14 +236,14 @@ cp
                 }
               return;
            }
-         if(cl)
-           send_packet(cl, packet);
+         if(n)
+           send_packet(n, packet);
          break;
         
       case RMODE_SWITCH:
-        cl = route_mac(packet);
-        if(cl)
-          send_packet(cl, packet);
+        n = route_mac(packet);
+        if(n)
+          send_packet(n, packet);
         else
           broadcast_packet(myself, packet);
         break;
@@ -248,21 +254,37 @@ cp
     }
 }
 
-void route_incoming(connection_t *source, vpn_packet_t *packet)
+void route_incoming(node_t *source, vpn_packet_t *packet)
 {
   switch(routing_mode)
     {
       case RMODE_ROUTER:
         memcpy(packet->data, mymac.net.mac.address.x, 6);	/* Override destination address to make the kernel accept it */
+        write_packet(packet);
         break;
       case RMODE_SWITCH:
-        if(packet->data[0] & 0x01)				/* Broadcast? */
-          broadcast_packet(source, packet);			/* If yes, spread it on */
+        {
+          subnet_t *subnet;
+
+          subnet = lookup_subnet_mac((mac_t *)(&packet->data[0]));
+
+          if(subnet)
+            {
+              if(subnet->owner == myself)
+                write_packet(packet);
+              else
+                send_packet(subnet->owner, packet);
+            }
+          else
+            {
+              broadcast_packet(source, packet);
+              write_packet(packet);
+            }
+          }
         break;
       case RMODE_HUB:
-        broadcast_packet(source,packet);			/* Spread it on */
+        broadcast_packet(source, packet);			/* Spread it on */
+        write_packet(packet);
         break;
     }
-  
-  accept_packet(packet);
 }