X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=0e16565bbde40a9f115385647dd6a57cbe2e1d05;hp=c8de7a57a42f54aa2107857183ba13ac679ed423;hb=94b171b3051b999e619ae19e1c9c29d356606788;hpb=82e383710980534d38bb9a8ef22f20677cd85861

diff --git a/src/route.c b/src/route.c
index c8de7a57..0e16565b 100644
--- a/src/route.c
+++ b/src/route.c
@@ -1,7 +1,7 @@
 /*
     route.c -- routing
-    Copyright (C) 2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>,
-                  2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+    Copyright (C) 2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
+                  2000-2002 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
@@ -17,17 +17,17 @@
     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.19 2001/10/27 12:13:17 guus Exp $
+    $Id: route.c,v 1.1.2.22 2002/02/10 21:57:54 guus Exp $
 */
 
 #include "config.h"
 
-#ifdef HAVE_FREEBSD
+#if defined(HAVE_FREEBSD) || defined(HAVE_OPENBSD)
  #include <sys/param.h>
 #endif
 #include <sys/socket.h>
 #include <netinet/in.h>
-#ifdef HAVE_SOLARIS
+#if defined(HAVE_SOLARIS) || defined(HAVE_OPENBSD)
  #include <net/if.h>
  #define ETHER_ADDR_LEN 6
 #else
@@ -46,6 +46,7 @@
 #include "subnet.h"
 #include "route.h"
 #include "protocol.h"
+#include "device.h"
 
 #include "system.h"
 
@@ -65,7 +66,7 @@ cp
   if(!subnet || subnet->owner!=myself)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
-        syslog(LOG_INFO, _("Learned new MAC address %hhx:%hhx:%hhx:%hhx:%hhx:%hhx"),
+        syslog(LOG_INFO, _("Learned new MAC address %hx:%hx:%hx:%hx:%hx:%hx"),
                address->x[0], address->x[1], address->x[2], address->x[3],  address->x[4], address->x[5]);
                
       subnet = new_subnet();
@@ -132,18 +133,23 @@ cp
 
 node_t *route_ipv6(vpn_packet_t *packet)
 {
-  ipv6_t dest;
   subnet_t *subnet;
 cp
-  memcpy(&dest, &packet->data[30], sizeof(ipv6_t));
-
-  subnet = lookup_subnet_ipv6(&dest);
+  subnet = lookup_subnet_ipv6((ipv6_t *)&packet->data[38]);
 cp
   if(!subnet)
     {
       if(debug_lvl >= DEBUG_TRAFFIC)
         {
-          syslog(LOG_WARNING, _("Cannot route packet: unknown IPv6 destination address"));
+          syslog(LOG_WARNING, _("Cannot route packet: unknown IPv6 destination address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
+	    ntohs(*(short unsigned int *)&packet->data[38]),
+	    ntohs(*(short unsigned int *)&packet->data[40]),
+	    ntohs(*(short unsigned int *)&packet->data[42]),
+	    ntohs(*(short unsigned int *)&packet->data[44]),
+	    ntohs(*(short unsigned int *)&packet->data[46]),
+	    ntohs(*(short unsigned int *)&packet->data[48]),
+	    ntohs(*(short unsigned int *)&packet->data[50]),
+	    ntohs(*(short unsigned int *)&packet->data[52]));
         }
 
       return NULL;
@@ -217,7 +223,7 @@ 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
 }
 
@@ -274,7 +280,7 @@ void route_incoming(node_t *source, vpn_packet_t *packet)
     {
       case RMODE_ROUTER:
         memcpy(packet->data, mymac.net.mac.address.x, 6);	/* Override destination address to make the kernel accept it */
-        accept_packet(packet);
+        write_packet(packet);
         break;
       case RMODE_SWITCH:
         {
@@ -285,20 +291,20 @@ void route_incoming(node_t *source, vpn_packet_t *packet)
           if(subnet)
             {
               if(subnet->owner == myself)
-                accept_packet(packet);
+                write_packet(packet);
               else
                 send_packet(subnet->owner, packet);
             }
           else
             {
               broadcast_packet(source, packet);
-              accept_packet(packet);
+              write_packet(packet);
             }
           }
         break;
       case RMODE_HUB:
         broadcast_packet(source, packet);			/* Spread it on */
-        accept_packet(packet);
+        write_packet(packet);
         break;
     }
 }