Add check for __Static_assert() and asserts on struct sizes

[tinc] / src / ipv6.h

diff --git a/src/ipv6.h b/src/ipv6.h
index cfa6f23..6f1e221 100644 (file)
--- a/src/ipv6.h
+++ b/src/ipv6.h
@@ -51,7 +51,7 @@ struct ip6_hdr {
        } ip6_ctlun;
        struct in6_addr ip6_src;
        struct in6_addr ip6_dst;
-} __attribute__((__gcc_struct__)) __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
@@ -60,6 +60,8 @@ struct ip6_hdr {
 #define ip6_hops ip6_ctlun.ip6_un1.ip6_un1_hlim
 #endif
 
+STATIC_ASSERT(sizeof(struct ip6_hdr) == 40, "ip6_hdr has incorrect size");
+
 #ifndef HAVE_STRUCT_ICMP6_HDR
 struct icmp6_hdr {
        uint8_t icmp6_type;
@@ -70,7 +72,7 @@ struct icmp6_hdr {
                uint16_t icmp6_un_data16[2];
                uint8_t icmp6_un_data8[4];
        } icmp6_dataun;
-} __attribute__((__gcc_struct__)) __attribute((__packed__));
+};
 #define ICMP6_DST_UNREACH_NOROUTE 0
 #define ICMP6_DST_UNREACH 1
 #define ICMP6_PACKET_TOO_BIG 2
@@ -86,11 +88,13 @@ struct icmp6_hdr {
 #define icmp6_mtu icmp6_data32[0]
 #endif
 
+STATIC_ASSERT(sizeof(struct icmp6_hdr) == 8, "icmp6_hdr has incorrect size");
+
 #ifndef HAVE_STRUCT_ND_NEIGHBOR_SOLICIT
 struct nd_neighbor_solicit {
        struct icmp6_hdr nd_ns_hdr;
        struct in6_addr nd_ns_target;
-} __attribute__((__gcc_struct__)) __attribute((__packed__));
+};
 #define ND_OPT_SOURCE_LINKADDR 1
 #define ND_OPT_TARGET_LINKADDR 2
 #define nd_ns_type nd_ns_hdr.icmp6_type
@@ -99,11 +103,15 @@ struct nd_neighbor_solicit {
 #define nd_ns_reserved nd_ns_hdr.icmp6_data32[0]
 #endif
 
+STATIC_ASSERT(sizeof(struct nd_neighbor_solicit) == 24, "nd_neighbor_solicit has incorrect size");
+
 #ifndef HAVE_STRUCT_ND_OPT_HDR
 struct nd_opt_hdr {
        uint8_t nd_opt_type;
        uint8_t nd_opt_len;
-} __attribute__((__gcc_struct__)) __attribute((__packed__));
+};
 #endif
 
+STATIC_ASSERT(sizeof(struct nd_opt_hdr) == 2, "nd_opt_hdr has incorrect size");
+
 #endif