Fixes for definitions under Windows.

[tinc] / lib / ipv6.h

diff --git a/lib/ipv6.h b/lib/ipv6.h
index 6216cc0..d98001d 100644 (file)
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -1,7 +1,7 @@
 /*
     ipv6.h -- missing IPv6 related definitions
-    Copyright (C) 2003 Ivo Timmermans <ivo@o2w.nl>
-                  2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2005 Ivo Timmermans
+                  2006 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: ipv6.h,v 1.1.2.7 2003/10/08 11:34:55 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #ifndef __TINC_IPV6_H__
@@ -96,9 +94,15 @@ struct icmp6_hdr {
 } __attribute__ ((__packed__));
 #define ICMP6_DST_UNREACH_NOROUTE 0
 #define ICMP6_DST_UNREACH 1
+#define ICMP6_PACKET_TOO_BIG 2
+#define ICMP6_DST_UNREACH_ADMIN 1
 #define ICMP6_DST_UNREACH_ADDR 3
 #define ND_NEIGHBOR_SOLICIT 135
 #define ND_NEIGHBOR_ADVERT 136
+#define icmp6_data32 icmp6_dataun.icmp6_un_data32
+#define icmp6_data16 icmp6_dataun.icmp6_un_data16
+#define icmp6_data8 icmp6_dataun.icmp6_un_data8
+#define icmp6_mtu icmp6_data32[0]
 #endif
 
 #ifndef HAVE_STRUCT_ND_NEIGHBOR_SOLICIT
@@ -108,6 +112,10 @@ struct nd_neighbor_solicit {
 } __attribute__ ((__packed__));
 #define ND_OPT_SOURCE_LINKADDR 1
 #define ND_OPT_TARGET_LINKADDR 2
+#define nd_ns_type nd_ns_hdr.icmp6_type
+#define nd_ns_code nd_ns_hdr.icmp6_code
+#define nd_ns_cksum nd_ns_hdr.icmp6_cksum
+#define nd_ns_reserved nd_ns_hdr.icmp6_data32[0]
 #endif
 
 #ifndef HAVE_STRUCT_ND_OPT_HDR