X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=cb74832cbec503843fc34e8a9c7c6f5049d780ab;hp=1b6336dcd168488886aaff62b1c17140126be4b4;hb=fa376fbd4e5151ae43e86441a1e99073eeaf46a5;hpb=65247c063b36a76dd68156fe17b017c7460d982f

diff --git a/src/route.c b/src/route.c
index 1b6336dc..cb74832c 100644
--- a/src/route.c
+++ b/src/route.c
@@ -17,21 +17,25 @@
     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.9 2001/05/28 08:21:43 guus Exp $
+    $Id: route.c,v 1.1.2.12 2001/06/05 16:31:59 guus Exp $
 */
 
 #include "config.h"
 
 #ifdef HAVE_FREEBSD
  #include <sys/param.h>
-#else
- #include <netinet/in.h>
 #endif
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <net/ethernet.h>
+#include <netinet/if_ether.h>
 #include <utils.h>
 #include <xalloc.h>
 #include <syslog.h>
 
 #include "net.h"
+#include "net/ethernet.h"
+#include "netinet/if_ether.h"
 #include "connection.h"
 #include "subnet.h"
 #include "route.h"
@@ -75,28 +79,16 @@ connection_t *route_mac(connection_t *source, vpn_packet_t *packet)
 cp
   /* Learn source address */
 
-  learn_mac(source, (mac_t *)(&packet->data[0]));
+  learn_mac(source, (mac_t *)(&packet->data[6]));
   
   /* Lookup destination address */
     
-  subnet = lookup_subnet_mac((mac_t *)(&packet->data[6]));
+  subnet = lookup_subnet_mac((mac_t *)(&packet->data[0]));
 
-  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 subnet->owner;  
+  if(subnet)
+    return subnet->owner;
+  else
+    return NULL;
 }
 
 connection_t *route_ipv4(vpn_packet_t *packet)
@@ -133,10 +125,78 @@ cp
   return NULL;
 }
 
+void route_arp(vpn_packet_t *packet)
+{
+  struct ether_arp *arp;
+  subnet_t *subnet;
+  unsigned char ipbuf[4];
+  ipv4_t dest;
+cp
+  /* First, snatch the source address from the ARP packet */
+
+  memcpy(mymac.net.mac.address.x, packet->data + 6, 6);
+
+  /* This routine generates replies to ARP requests.
+     You don't need to set NOARP flag on the interface anymore (which is broken on FreeBSD).
+     Most of the code here is taken from choparp.c by Takamichi Tateoka (tree@mma.club.uec.ac.jp)
+   */
+
+  arp = (struct ether_arp *)(packet->data + 14);
+
+  /* Check if this is a valid ARP request */
+
+  if(ntohs(arp->arp_hrd) != ARPHRD_ETHER ||
+     ntohs(arp->arp_pro) != ETHERTYPE_IP ||
+     (int) (arp->arp_hln) != ETHER_ADDR_LEN ||
+     (int) (arp->arp_pln) != 4 ||
+     ntohs(arp->arp_op) != ARPOP_REQUEST )
+    {
+      if(debug_lvl > DEBUG_TRAFFIC)
+        {
+          syslog(LOG_WARNING, _("Cannot route packet: received unknown type ARP request"));
+        } 
+      return;
+    }
+
+  /* Check if the IP address exists on the VPN */
+
+  dest = ntohl(*((unsigned long*)(arp->arp_tpa)));
+  subnet = lookup_subnet_ipv4(&dest);
+
+  if(!subnet)
+    {
+      if(debug_lvl >= DEBUG_TRAFFIC)
+        {
+          syslog(LOG_WARNING, _("Cannot route packet: ARP request for unknown address %d.%d.%d.%d"),
+                 arp->arp_tpa[0], arp->arp_tpa[1], arp->arp_tpa[2], arp->arp_tpa[3]);
+        }
+
+      return;
+    }
+
+  /* Check if it is for our own subnet */
+  
+  if(subnet->owner == myself)
+    return;	/* silently ignore */
+
+  memcpy(packet->data, packet->data + ETHER_ADDR_LEN, ETHER_ADDR_LEN);	/* copy destination address */
+  packet->data[ETHER_ADDR_LEN*2 - 1] ^= 0xFF;				/* mangle source address so it looks like it's not from us */
+
+  memcpy(ipbuf, arp->arp_tpa, 4);					/* save protocol addr */
+  memcpy(arp->arp_tpa, arp->arp_spa, 4);				/* swap destination and source protocol address */
+  memcpy(arp->arp_spa, ipbuf, 4);					/* ... */
+
+  memcpy(arp->arp_tha, arp->arp_sha, 10);				/* set target hard/proto addr */
+  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);
+cp
+}
+
 void route_outgoing(vpn_packet_t *packet)
 {
   unsigned short int type;
-  avl_node_t *node;
   connection_t *cl;
 cp
   /* FIXME: multicast? */
@@ -153,6 +213,9 @@ cp
             case 0x86DD:
               cl = route_ipv6(packet);
               break;
+            case 0x0806:
+              route_arp(packet);
+              return;
             default:
               if(debug_lvl >= DEBUG_TRAFFIC)
                 {
@@ -168,15 +231,12 @@ cp
         cl = route_mac(myself, packet);
         if(cl)
           send_packet(cl, packet);
+        else
+          broadcast_packet(myself, 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);
-          }
+        broadcast_packet(myself, packet);
         break;
     }
 }
@@ -186,10 +246,16 @@ 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);
+        memcpy(packet->data, mymac.net.mac.address.x, 6);	/* Override destination address to make the kernel accept it */
         break;
       case RMODE_SWITCH:
-        learn_mac(source, (mac_t *)(&packet->data[0]));
+        if((packet->data[0] & packet->data[1]) == 0xFF)		/* Broadcast? */
+          broadcast_packet(source, packet);			/* If yes, spread it on */
+        else
+          learn_mac(source, (mac_t *)(&packet->data[6]));
+        break;
+      case RMODE_HUB:
+        broadcast_packet(source,packet);			/* Spread it on */
         break;
     }