X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Froute.c;h=94c3d576715b6089407f33b3513c24eabc28d657;hp=4e41cdff7ca6fcb68fc61adffe8b7ac624179596;hb=2be8e69ca16e1558463c39c48af76d3d4a4674b7;hpb=0e93f0aa02274481c16fc9f30b795d4f063bd1c3

diff --git a/src/route.c b/src/route.c
index 4e41cdff..94c3d576 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.34 2002/03/15 15:08:21 guus Exp $
+    $Id: route.c,v 1.1.2.38 2002/04/19 14:06:40 guus Exp $
 */
 
 #include "config.h"
@@ -40,6 +40,7 @@
 #include <xalloc.h>
 #include <syslog.h>
 #include <string.h>
+#include <stdint.h>
 
 #include <avl_tree.h>
 
@@ -264,8 +265,8 @@ cp
       if(debug_lvl >= DEBUG_TRAFFIC)
         {
           syslog(LOG_WARNING, _("Cannot route packet: neighbor solicitation request for unknown address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
-                 ntohs(ns->nd_ns_target.s6_addr16[0]), ntohs(ns->nd_ns_target.s6_addr16[1]), ntohs(ns->nd_ns_target.s6_addr16[2]), ntohs(ns->nd_ns_target.s6_addr16[3]),
-                 ntohs(ns->nd_ns_target.s6_addr16[4]), ntohs(ns->nd_ns_target.s6_addr16[5]), ntohs(ns->nd_ns_target.s6_addr16[6]), ntohs(ns->nd_ns_target.s6_addr16[7]));
+                 ntohs(((uint16_t *)&ns->nd_ns_target)[0]), ntohs(((uint16_t *)&ns->nd_ns_target)[1]), ntohs(((uint16_t *)&ns->nd_ns_target)[2]), ntohs(((uint16_t *)&ns->nd_ns_target)[3]),
+                 ntohs(((uint16_t *)&ns->nd_ns_target)[4]), ntohs(((uint16_t *)&ns->nd_ns_target)[5]), ntohs(((uint16_t *)&ns->nd_ns_target)[6]), ntohs(((uint16_t *)&ns->nd_ns_target)[7]));
         }
 
       return;
@@ -305,7 +306,7 @@ cp
   checksum = inet_checksum((unsigned short int *)&pseudo, sizeof(pseudo)/2, ~0);
   checksum = inet_checksum((unsigned short int *)ns, sizeof(*ns)/2 + 4, checksum);
 
-  ns->nd_ns_hdr.icmp6_cksum = checksum;
+  ns->nd_ns_hdr.icmp6_cksum = htons(checksum);
 
   write_packet(packet);
 cp
@@ -395,12 +396,12 @@ cp
               n = route_ipv4(packet);
               break;
             case 0x86DD:
-              n = route_ipv6(packet);
-	      if(!n && packet->data[0] == 0x33 && packet->data[1] == 0x33 && packet->data[2] == 0xff)
+              if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT)
 	        {
 	          route_neighborsol(packet);
 		  return;
 		}
+              n = route_ipv6(packet);
               break;
             case 0x0806:
               route_arp(packet);