jocke@1737: diff -urN uClibc-0.9.30.1.orig/include/netinet/igmp.h uClibc-0.9.30.1/include/netinet/igmp.h jocke@1737: --- uClibc-0.9.30.1.orig/include/netinet/igmp.h 2009-04-08 09:00:10.926545132 +0200 jocke@1737: +++ uClibc-0.9.30.1/include/netinet/igmp.h 2009-04-08 09:00:26.242514273 +0200 jocke@1737: @@ -69,7 +69,7 @@ jocke@1737: u_int8_t igmp_code; /* routing code */ jocke@1737: u_int16_t igmp_cksum; /* checksum */ jocke@1737: struct in_addr igmp_group; /* group address */ jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: #define IGMP_MINLEN 8 jocke@1737: jocke@1737: diff -urN uClibc-0.9.30.1.orig/include/netinet/in.h uClibc-0.9.30.1/include/netinet/in.h jocke@1737: --- uClibc-0.9.30.1.orig/include/netinet/in.h 2009-04-08 09:00:10.926545132 +0200 jocke@1737: +++ uClibc-0.9.30.1/include/netinet/in.h 2009-04-08 09:00:26.242514273 +0200 jocke@1737: @@ -202,7 +202,7 @@ jocke@1737: #define s6_addr in6_u.u6_addr8 jocke@1737: #define s6_addr16 in6_u.u6_addr16 jocke@1737: #define s6_addr32 in6_u.u6_addr32 jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: extern const struct in6_addr in6addr_any; /* :: */ jocke@1737: extern const struct in6_addr in6addr_loopback; /* ::1 */ jocke@1737: @@ -229,7 +229,7 @@ jocke@1737: __SOCKADDR_COMMON_SIZE - jocke@1737: sizeof (in_port_t) - jocke@1737: sizeof (struct in_addr)]; jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: #endif jocke@1737: jocke@1737: /* Ditto, for IPv6. */ jocke@1737: @@ -240,7 +240,7 @@ jocke@1737: uint32_t sin6_flowinfo; /* IPv6 flow information */ jocke@1737: struct in6_addr sin6_addr; /* IPv6 address */ jocke@1737: uint32_t sin6_scope_id; /* IPv6 scope-id */ jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: jocke@1737: /* IPv4 multicast request. */ jocke@1737: @@ -251,7 +251,7 @@ jocke@1737: jocke@1737: /* Local IP address of interface. */ jocke@1737: struct in_addr imr_interface; jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: struct ip_mreq_source jocke@1737: { jocke@1737: @@ -263,7 +263,7 @@ jocke@1737: jocke@1737: /* IP address of interface. */ jocke@1737: struct in_addr imr_sourceaddr; jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: /* Likewise, for IPv6. */ jocke@1737: struct ipv6_mreq jocke@1737: @@ -273,7 +273,7 @@ jocke@1737: jocke@1737: /* local interface */ jocke@1737: unsigned int ipv6mr_interface; jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: jocke@1737: /* Multicast group request. */ jocke@1737: @@ -284,7 +284,7 @@ jocke@1737: jocke@1737: /* Group address. */ jocke@1737: struct sockaddr_storage gr_group; jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: struct group_source_req jocke@1737: { jocke@1737: @@ -296,7 +296,7 @@ jocke@1737: jocke@1737: /* Source address. */ jocke@1737: struct sockaddr_storage gsr_source; jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: jocke@1737: /* Full-state filter operations. */ jocke@1737: @@ -315,7 +315,7 @@ jocke@1737: uint32_t imsf_numsrc; jocke@1737: /* Source addresses. */ jocke@1737: struct in_addr imsf_slist[1]; jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: #define IP_MSFILTER_SIZE(numsrc) (sizeof (struct ip_msfilter) \ jocke@1737: - sizeof (struct in_addr) \ jocke@1737: @@ -336,7 +336,7 @@ jocke@1737: uint32_t gf_numsrc; jocke@1737: /* Source addresses. */ jocke@1737: struct sockaddr_storage gf_slist[1]; jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: #define GROUP_FILTER_SIZE(numsrc) (sizeof (struct group_filter) \ jocke@1737: - sizeof (struct sockaddr_storage) \ jocke@1737: @@ -460,14 +460,14 @@ jocke@1737: { jocke@1737: struct in6_addr ipi6_addr; /* src/dst IPv6 address */ jocke@1737: unsigned int ipi6_ifindex; /* send/recv interface index */ jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: /* IPv6 MTU information. */ jocke@1737: struct ip6_mtuinfo jocke@1737: { jocke@1737: struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */ jocke@1737: uint32_t ip6m_mtu; /* path MTU in host byte order */ jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: jocke@1737: #if 0 /*def __USE_GNU*/ jocke@1737: diff -urN uClibc-0.9.30.1.orig/include/netinet/ip.h uClibc-0.9.30.1/include/netinet/ip.h jocke@1737: --- uClibc-0.9.30.1.orig/include/netinet/ip.h 2009-04-08 09:00:10.926545132 +0200 jocke@1737: +++ uClibc-0.9.30.1/include/netinet/ip.h 2009-04-08 09:00:26.242514273 +0200 jocke@1737: @@ -63,7 +63,7 @@ jocke@1737: u_int32_t saddr; jocke@1737: u_int32_t daddr; jocke@1737: /*The options start here. */ jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: #ifdef __USE_BSD jocke@1737: /* jocke@1737: @@ -127,7 +127,7 @@ jocke@1737: u_int8_t ip_p; /* protocol */ jocke@1737: u_short ip_sum; /* checksum */ jocke@1737: struct in_addr ip_src, ip_dst; /* source and dest address */ jocke@1737: - }; jocke@1737: + } __attribute__ ((__packed__)); jocke@1737: jocke@1737: /* jocke@1737: * Time stamp option structure. jocke@1737: diff -urN uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h uClibc-0.9.30.1/include/netinet/ip_icmp.h jocke@1737: --- uClibc-0.9.30.1.orig/include/netinet/ip_icmp.h 2009-04-08 09:00:10.926545132 +0200 jocke@1737: +++ uClibc-0.9.30.1/include/netinet/ip_icmp.h 2009-04-08 09:00:26.242514273 +0200 jocke@1737: @@ -43,7 +43,7 @@ jocke@1737: u_int16_t mtu; jocke@1737: } frag; /* path mtu discovery */ jocke@1737: } un; jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: #define ICMP_ECHOREPLY 0 /* Echo Reply */ jocke@1737: #define ICMP_DEST_UNREACH 3 /* Destination Unreachable */ jocke@1737: @@ -199,7 +199,7 @@ jocke@1737: #define icmp_radv icmp_dun.id_radv jocke@1737: #define icmp_mask icmp_dun.id_mask jocke@1737: #define icmp_data icmp_dun.id_data jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: /* jocke@1737: * Lower bounds on packet lengths for various types. jocke@1737: diff -urN uClibc-0.9.30.1.orig/include/netinet/tcp.h uClibc-0.9.30.1/include/netinet/tcp.h jocke@1737: --- uClibc-0.9.30.1.orig/include/netinet/tcp.h 2009-04-08 09:00:10.926545132 +0200 jocke@1737: +++ uClibc-0.9.30.1/include/netinet/tcp.h 2009-04-08 09:00:26.242514273 +0200 jocke@1737: @@ -86,7 +86,7 @@ jocke@1737: u_int16_t th_win; /* window */ jocke@1737: u_int16_t th_sum; /* checksum */ jocke@1737: u_int16_t th_urp; /* urgent pointer */ jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: # else /* !__FAVOR_BSD */ jocke@1737: struct tcphdr jocke@1737: @@ -121,7 +121,7 @@ jocke@1737: u_int16_t window; jocke@1737: u_int16_t check; jocke@1737: u_int16_t urg_ptr; jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: # endif /* __FAVOR_BSD */ jocke@1737: jocke@1737: enum jocke@1737: @@ -226,7 +226,7 @@ jocke@1737: u_int32_t tcpi_rcv_space; jocke@1737: jocke@1737: u_int32_t tcpi_total_retrans; jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: jocke@1737: /* For TCP_MD5SIG socket option. */ jocke@1737: @@ -239,7 +239,7 @@ jocke@1737: u_int16_t tcpm_keylen; /* Key length. */ jocke@1737: u_int32_t __tcpm_pad2; /* Zero. */ jocke@1737: u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */ jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: #endif /* Misc. */ jocke@1737: jocke@1737: diff -urN uClibc-0.9.30.1.orig/include/netinet/udp.h uClibc-0.9.30.1/include/netinet/udp.h jocke@1737: --- uClibc-0.9.30.1.orig/include/netinet/udp.h 2009-04-08 09:00:10.926545132 +0200 jocke@1737: +++ uClibc-0.9.30.1/include/netinet/udp.h 2009-04-08 09:00:26.242514273 +0200 jocke@1737: @@ -61,7 +61,7 @@ jocke@1737: u_int16_t uh_dport; /* destination port */ jocke@1737: u_int16_t uh_ulen; /* udp length */ jocke@1737: u_int16_t uh_sum; /* udp checksum */ jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: jocke@1737: #else jocke@1737: jocke@1737: @@ -71,7 +71,7 @@ jocke@1737: u_int16_t dest; jocke@1737: u_int16_t len; jocke@1737: u_int16_t check; jocke@1737: -}; jocke@1737: +} __attribute__ ((__packed__)); jocke@1737: #endif jocke@1737: jocke@1737: #define SOL_UDP 17 /* sockopt level for UDP */