j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge remote-tracking branch 'dechamps/winmtu' into 1.1

Browse source
This commit is contained in:
Guus Sliepen 2015-04-12 15:35:50 +02:00
commit 417981462a
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ethernet.h
View file

@ -50,7 +50,7 @@ struct ether_header {
uint8_t ether_dhost[ETH_ALEN]; uint8_t ether_dhost[ETH_ALEN];
uint8_t ether_shost[ETH_ALEN]; uint8_t ether_shost[ETH_ALEN];
uint16_t ether_type; uint16_t ether_type;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#endif #endif
#ifndef HAVE_STRUCT_ARPHDR #ifndef HAVE_STRUCT_ARPHDR
@ -60,7 +60,7 @@ struct arphdr {
uint8_t ar_hln; uint8_t ar_hln;
uint8_t ar_pln; uint8_t ar_pln;
uint16_t ar_op; uint16_t ar_op;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#define ARPOP_REQUEST 1 #define ARPOP_REQUEST 1
#define ARPOP_REPLY 2 #define ARPOP_REPLY 2
@ -78,7 +78,7 @@ struct ether_arp {
uint8_t arp_spa[4]; uint8_t arp_spa[4];
uint8_t arp_tha[ETH_ALEN]; uint8_t arp_tha[ETH_ALEN];
uint8_t arp_tpa[4]; uint8_t arp_tpa[4];
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#define arp_hrd ea_hdr.ar_hrd #define arp_hrd ea_hdr.ar_hrd
#define arp_pro ea_hdr.ar_pro #define arp_pro ea_hdr.ar_pro
#define arp_hln ea_hdr.ar_hln #define arp_hln ea_hdr.ar_hln

4
src/ipv4.h
View file

@ -81,7 +81,7 @@ struct ip {
uint8_t ip_p; uint8_t ip_p;
uint16_t ip_sum; uint16_t ip_sum;
struct in_addr ip_src, ip_dst; struct in_addr ip_src, ip_dst;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#endif #endif
#ifndef IP_OFFMASK #ifndef IP_OFFMASK
@ -143,7 +143,7 @@ struct icmp {
#define icmp_radv icmp_dun.id_radv #define icmp_radv icmp_dun.id_radv
#define icmp_mask icmp_dun.id_mask #define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data #define icmp_data icmp_dun.id_data
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#endif #endif
#endif /* __TINC_IPV4_H__ */ #endif /* __TINC_IPV4_H__ */

12
src/ipv6.h
View file

@ -36,7 +36,7 @@ struct in6_addr {
uint16_t u6_addr16[8]; uint16_t u6_addr16[8];
uint32_t u6_addr32[4]; uint32_t u6_addr32[4];
} in6_u; } in6_u;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#define s6_addr in6_u.u6_addr8 #define s6_addr in6_u.u6_addr8
#define s6_addr16 in6_u.u6_addr16 #define s6_addr16 in6_u.u6_addr16
#define s6_addr32 in6_u.u6_addr32 #define s6_addr32 in6_u.u6_addr32
@ -49,7 +49,7 @@ struct sockaddr_in6 {
uint32_t sin6_flowinfo; uint32_t sin6_flowinfo;
struct in6_addr sin6_addr; struct in6_addr sin6_addr;
uint32_t sin6_scope_id; uint32_t sin6_scope_id;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#endif #endif
#ifndef IN6_IS_ADDR_V4MAPPED #ifndef IN6_IS_ADDR_V4MAPPED
@ -72,7 +72,7 @@ struct ip6_hdr {
} ip6_ctlun; } ip6_ctlun;
struct in6_addr ip6_src; struct in6_addr ip6_src;
struct in6_addr ip6_dst; struct in6_addr ip6_dst;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#define ip6_vfc ip6_ctlun.ip6_un2_vfc #define ip6_vfc ip6_ctlun.ip6_un2_vfc
#define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow #define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow
#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen #define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen
@ -91,7 +91,7 @@ struct icmp6_hdr {
uint16_t icmp6_un_data16[2]; uint16_t icmp6_un_data16[2];
uint8_t icmp6_un_data8[4]; uint8_t icmp6_un_data8[4];
} icmp6_dataun; } icmp6_dataun;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#define ICMP6_DST_UNREACH_NOROUTE 0 #define ICMP6_DST_UNREACH_NOROUTE 0
#define ICMP6_DST_UNREACH 1 #define ICMP6_DST_UNREACH 1
#define ICMP6_PACKET_TOO_BIG 2 #define ICMP6_PACKET_TOO_BIG 2
@ -111,7 +111,7 @@ struct icmp6_hdr {
struct nd_neighbor_solicit { struct nd_neighbor_solicit {
struct icmp6_hdr nd_ns_hdr; struct icmp6_hdr nd_ns_hdr;
struct in6_addr nd_ns_target; struct in6_addr nd_ns_target;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#define ND_OPT_SOURCE_LINKADDR 1 #define ND_OPT_SOURCE_LINKADDR 1
#define ND_OPT_TARGET_LINKADDR 2 #define ND_OPT_TARGET_LINKADDR 2
#define nd_ns_type nd_ns_hdr.icmp6_type #define nd_ns_type nd_ns_hdr.icmp6_type
@ -124,7 +124,7 @@ struct nd_neighbor_solicit {
struct nd_opt_hdr { struct nd_opt_hdr {
uint8_t nd_opt_type; uint8_t nd_opt_type;
uint8_t nd_opt_len; uint8_t nd_opt_len;
} __attribute__ ((__packed__)); } __attribute__ ((__gcc_struct__, __packed__));
#endif #endif
#endif /* __TINC_IPV6_H__ */ #endif /* __TINC_IPV6_H__ */