X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fethernet.h;h=086f5727c77053c431017ef99a6df70e875fbcae;hb=refs%2Fheads%2F1.1;hp=6ee2d389c07df153636bbe8ac1637e783aa03ddd;hpb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;p=tinc

diff --git a/src/ethernet.h b/src/ethernet.h
index 6ee2d389..cb9d5274 100644
--- a/src/ethernet.h
+++ b/src/ethernet.h
@@ -21,6 +21,8 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#include "system.h"
+
 #ifndef ETH_ALEN
 #define ETH_ALEN 6
 #endif
@@ -59,22 +61,23 @@
 #endif
 
 #ifndef HAVE_STRUCT_ETHER_HEADER
-struct ether_header {
+PACKED(struct ether_header {
 	uint8_t ether_dhost[ETH_ALEN];
 	uint8_t ether_shost[ETH_ALEN];
 	uint16_t ether_type;
-} __attribute__ ((__gcc_struct__, __packed__));
+});
 #endif
 
+STATIC_ASSERT(sizeof(struct ether_header) == 14, "ether_header has incorrect size");
+
 #ifndef HAVE_STRUCT_ARPHDR
-struct arphdr {
+PACKED(struct arphdr {
 	uint16_t ar_hrd;
 	uint16_t ar_pro;
 	uint8_t ar_hln;
 	uint8_t ar_pln;
 	uint16_t ar_op;
-} __attribute__ ((__gcc_struct__, __packed__));
-
+});
 #define ARPOP_REQUEST 1
 #define ARPOP_REPLY 2
 #define ARPOP_RREQUEST 3
@@ -84,14 +87,16 @@ struct arphdr {
 #define ARPOP_NAK 10
 #endif
 
+STATIC_ASSERT(sizeof(struct arphdr) == 8, "arphdr has incorrect size");
+
 #ifndef HAVE_STRUCT_ETHER_ARP
-struct  ether_arp {
+PACKED(struct ether_arp {
 	struct  arphdr ea_hdr;
 	uint8_t arp_sha[ETH_ALEN];
 	uint8_t arp_spa[4];
 	uint8_t arp_tha[ETH_ALEN];
 	uint8_t arp_tpa[4];
-} __attribute__ ((__gcc_struct__, __packed__));
+});
 #define arp_hrd ea_hdr.ar_hrd
 #define arp_pro ea_hdr.ar_pro
 #define arp_hln ea_hdr.ar_hln
@@ -99,4 +104,6 @@ struct  ether_arp {
 #define arp_op ea_hdr.ar_op
 #endif
 
+STATIC_ASSERT(sizeof(struct ether_arp) == 28, "ether_arp has incorrect size");
+
 #endif