Corrected bitfields -- the smallest datatype required for each bitfield is now used, rather than relying on GCC to truncate unused bytes in bitfields (thanks to Walt Sacuta).

This commit is contained in:
Dean Camera 2009-03-26 03:22:02 +00:00
parent 1c9092a8a6
commit ca641bba83
4 changed files with 41 additions and 41 deletions

View file

@ -70,18 +70,18 @@
/** Type define of an IP packet header. */
typedef struct
{
unsigned int HeaderLength : 4; /**< Total length of the packet header, in 4-byte blocks */
unsigned int Version : 4; /**< IP protocol version */
unsigned int TypeOfService : 8; /**< Special service type identifier, indicating delay/throughput/reliability levels */
unsigned int TotalLength : 16; /**< Total length of the IP packet, in bytes */
unsigned char HeaderLength : 4; /**< Total length of the packet header, in 4-byte blocks */
unsigned char Version : 4; /**< IP protocol version */
uint8_t TypeOfService; /**< Special service type identifier, indicating delay/throughput/reliability levels */
uint16_t TotalLength; /**< Total length of the IP packet, in bytes */
unsigned int Identification : 16; /**< Idenfication value for identifying fragmented packets */
unsigned int FragmentOffset : 13; /**< Offset of this IP fragment */
unsigned int Flags : 3; /**< Fragment flags, to indicate if a packet is fragmented */
uint16_t Identification; /**< Idenfication value for identifying fragmented packets */
unsigned int FragmentOffset : 13; /**< Offset of this IP fragment */
unsigned int Flags : 3; /**< Fragment flags, to indicate if a packet is fragmented */
unsigned int TTL : 8; /**< Maximum allowable number of hops to reach the packet destination */
unsigned int Protocol : 8; /**< Encapsulated protocol type */
unsigned int HeaderChecksum : 16; /**< Ethernet checksum of the IP header */
uint8_t TTL; /**< Maximum allowable number of hops to reach the packet destination */
uint8_t Protocol; /**< Encapsulated protocol type */
uint16_t HeaderChecksum; /**< Ethernet checksum of the IP header */
IP_Address_t SourceAddress; /**< Source protocol IP address of the packet */
IP_Address_t DestinationAddress; /**< Destination protocol IP address of the packet */

View file

@ -221,8 +221,8 @@
uint32_t SequenceNumber; /**< Data sequence number of the packet */
uint32_t AcknowledgmentNumber; /**< Data acknowledgment number of the packet */
unsigned int Reserved : 4; /**< Reserved, must be all 0 */
unsigned int DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */
unsigned char Reserved : 4; /**< Reserved, must be all 0 */
unsigned char DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */
uint8_t Flags; /**< TCP packet flags */
uint16_t WindowSize; /**< Current data window size (bytes remaning in reception buffer) */