X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fipv6.h;h=0db5d0111666dc8fa6fe7c13ac687afadd95d3f9;hp=92a0ae092ca94cb71b93f1482a6b9c87933c0c10;hb=3fd96ebec7e44a0a7288c60da1cdec2d4fe03e8c;hpb=e449d94caef963809d417f16497f6f978e10d731

diff --git a/lib/ipv6.h b/lib/ipv6.h
index 92a0ae09..0db5d011 100644
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -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: ipv6.h,v 1.1.2.4 2003/07/17 15:06:25 guus Exp $
+    $Id: ipv6.h,v 1.1.2.6 2003/07/21 13:14:02 guus Exp $
 */
 
 #ifndef __TINC_IPV6_H__
@@ -46,7 +46,8 @@ struct in6_addr {
 
 #ifndef HAVE_STRUCT_SOCKADDR_IN6
 struct sockaddr_in6 {
-	in_port_t sin6_port;
+	uint16_t sin6_family;
+	uint16_t sin6_port;
 	uint32_t sin6_flowinfo;
 	struct in6_addr sin6_addr;
 	uint32_t sin6_scope_id;
@@ -60,7 +61,7 @@ struct sockaddr_in6 {
         && (((__const uint32_t *) (a))[2] == htonl (0xffff)))
 #endif
 
-#ifndef HAVE_NETINET_IP6_H
+#ifndef HAVE_STRUCT_IP6_HDR
 struct ip6_hdr {
 	union {
 		struct ip6_hdrctl {
@@ -80,7 +81,9 @@ struct ip6_hdr {
 #define ip6_nxt ip6_ctlun.ip6_un1.ip6_un1_nxt
 #define ip6_hlim ip6_ctlun.ip6_un1.ip6_un1_hlim
 #define ip6_hops ip6_ctlun.ip6_un1.ip6_un1_hlim
+#endif
 
+#ifndef HAVE_STRUCT_ICMP6_HDR
 struct icmp6_hdr {
 	uint8_t icmp6_type;
 	uint8_t icmp6_code;
@@ -96,14 +99,18 @@ struct icmp6_hdr {
 #define ICMP6_DST_UNREACH_ADDR 3
 #define ND_NEIGHBOR_SOLICIT 135
 #define ND_NEIGHBOR_ADVERT 136
+#endif
 
+#ifndef HAVE_STRUCT_ND_NEIGHBOR_SOLICIT
 struct nd_neighbor_solicit {
 	struct icmp6_hdr nd_ns_hdr;
 	struct in6_addr nd_ns_target;
 };
 #define ND_OPT_SOURCE_LINKADDR 1
 #define ND_OPT_TARGET_LINKADDR 2
+#endif
 
+#ifndef HAVE_STRUCT_ND_OPT_HDR
 struct nd_opt_hdr {
 	uint8_t nd_opt_type;
 	uint8_t nd_opt_len;