RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Remove BYTE_PACK.

Browse Source 
Add __packed.
Partial update from FreeBSD.
This commit is contained in:
Ralf Corsepius
2005-05-24 04:24:59 +00:00
parent 5d25da936e
commit 7adcf0377f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cpukit/libnetworking/netinet/ip.h
View File

@@ -37,14 +37,20 @@
#ifndef _NETINET_IP_H_ #ifndef _NETINET_IP_H_
#define _NETINET_IP_H_ #define _NETINET_IP_H_
#include <sys/cdefs.h>
/* /*
* Definitions for internet protocol version 4. * Definitions for internet protocol version 4.
* Per RFC 791, September 1981. * Per RFC 791, September 1981.
*/ */
#define IPVERSION 4 #define IPVERSION 4
#ifndef BYTE_PACK #ifndef __packed
#define BYTE_PACK __attribute__((packed)) #if defined(__GNUC__)
#define __packed __attribute__((packed))
#else
#define __packed
#endif
#endif #endif
/* /*
@@ -64,19 +70,18 @@ struct ip {
#endif #endif
#endif /* not _IP_VHL */ #endif /* not _IP_VHL */
u_char ip_tos; /* type of service */ u_char ip_tos; /* type of service */
u_short ip_len BYTE_PACK; /* total length */ u_short ip_len; /* total length */
u_short ip_id BYTE_PACK; /* identification */ u_short ip_id; /* identification */
u_short ip_off BYTE_PACK; /* fragment offset field */ u_short ip_off; /* fragment offset field */
#define IP_RF 0x8000 /* reserved fragment flag */ #define IP_RF 0x8000 /* reserved fragment flag */
#define IP_DF 0x4000 /* dont fragment flag */ #define IP_DF 0x4000 /* dont fragment flag */
#define IP_MF 0x2000 /* more fragments flag */ #define IP_MF 0x2000 /* more fragments flag */
#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ #define IP_OFFMASK 0x1fff /* mask for fragmenting bits */
u_char ip_ttl; /* time to live */ u_char ip_ttl; /* time to live */
u_char ip_p; /* protocol */ u_char ip_p; /* protocol */
u_short ip_sum BYTE_PACK; /* checksum */ u_short ip_sum; /* checksum */
struct in_addr ip_src BYTE_PACK; /* source address */ struct in_addr ip_src,ip_dst; /* source and dest address */
struct in_addr ip_dst BYTE_PACK; /* dest address */ } __packed;
};
#ifdef _IP_VHL #ifdef _IP_VHL
#define IP_MAKE_VHL(v, hl) ((v) << 4 | (hl)) #define IP_MAKE_VHL(v, hl) ((v) << 4 | (hl))