Update missing definitions, structs describing headers get __packed__ attribute.

[tinc] / lib / ipv6.h

diff --git a/lib/ipv6.h b/lib/ipv6.h
index 8851d6d..6216cc0 100644 (file)
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -17,19 +17,12 @@
     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.2 2003/07/07 11:50:52 guus Exp $
+    $Id: ipv6.h,v 1.1.2.7 2003/10/08 11:34:55 guus Exp $
 */
 
 #ifndef __TINC_IPV6_H__
 #define __TINC_IPV6_H__
 
-#include "config.h"
-
-#include <netinet/in.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 #ifndef AF_INET6
 #define AF_INET6 10
 #endif
@@ -45,7 +38,7 @@ struct in6_addr {
                uint16_t u6_addr16[8];
                uint32_t u6_addr32[4];
        } in6_u;
-};
+} __attribute__ ((__packed__));
 #define s6_addr in6_u.u6_addr8
 #define s6_addr16 in6_u.u6_addr16
 #define s6_addr32 in6_u.u6_addr32
@@ -53,14 +46,22 @@ 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;
-};
+} __attribute__ ((__packed__));
+#endif
+
+#ifndef IN6_IS_ADDR_V4MAPPED
+#define IN6_IS_ADDR_V4MAPPED(a) \
+        ((((__const uint32_t *) (a))[0] == 0) \
+        && (((__const uint32_t *) (a))[1] == 0) \
+        && (((__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 {
@@ -73,14 +74,16 @@ struct ip6_hdr {
        } ip6_ctlun;
        struct in6_addr ip6_src;
        struct in6_addr ip6_dst;
-};
+} __attribute__ ((__packed__));
 #define ip6_vfc ip6_ctlun.ip6_un2_vfc
 #define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow
 #define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen
 #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;
@@ -90,24 +93,28 @@ struct icmp6_hdr {
                uint16_t icmp6_un_data16[2];
                uint8_t icmp6_un_data8[4];
        } icmp6_dataun;
-};
+} __attribute__ ((__packed__));
 #define ICMP6_DST_UNREACH_NOROUTE 0
 #define ICMP6_DST_UNREACH 1
 #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;
-};
+} __attribute__ ((__packed__));
 #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;
-};
+} __attribute__ ((__packed__));
 #endif
 
 #endif /* __TINC_IPV6_H__ */