mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'queues/slirp' of git://git.kiszka.org/qemu

Browse Source 
* 'queues/slirp' of git://git.kiszka.org/qemu:
  slirp: Fix bit field types in IP header structs
This commit is contained in:
Blue Swirl 2011-08-21 19:19:29 +00:00
commit aec7c6dc68
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slirp/ip.h
View File

@ -74,10 +74,10 @@ typedef uint32_t n_long; /* long as received from the net */
*/ */
struct ip { struct ip {
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
u_int ip_v:4, /* version */ uint8_t ip_v:4, /* version */
ip_hl:4; /* header length */ ip_hl:4; /* header length */
#else #else
u_int ip_hl:4, /* header length */ uint8_t ip_hl:4, /* header length */
ip_v:4; /* version */ ip_v:4; /* version */
#endif #endif
uint8_t ip_tos; /* type of service */ uint8_t ip_tos; /* type of service */
@ -140,10 +140,10 @@ struct ip_timestamp {
uint8_t ipt_len; /* size of structure (variable) */ uint8_t ipt_len; /* size of structure (variable) */
uint8_t ipt_ptr; /* index of current entry */ uint8_t ipt_ptr; /* index of current entry */
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
u_int ipt_oflw:4, /* overflow counter */ uint8_t ipt_oflw:4, /* overflow counter */
ipt_flg:4; /* flags, see below */ ipt_flg:4; /* flags, see below */
#else #else
u_int ipt_flg:4, /* flags, see below */ uint8_t ipt_flg:4, /* flags, see below */
ipt_oflw:4; /* overflow counter */ ipt_oflw:4; /* overflow counter */
#endif #endif
union ipt_timestamp { union ipt_timestamp {

4
slirp/tcp.h
View File

@ -51,10 +51,10 @@ struct tcphdr {
tcp_seq th_seq; /* sequence number */ tcp_seq th_seq; /* sequence number */
tcp_seq th_ack; /* acknowledgement number */ tcp_seq th_ack; /* acknowledgement number */
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
u_int th_off:4, /* data offset */ uint8_t th_off:4, /* data offset */
th_x2:4; /* (unused) */ th_x2:4; /* (unused) */
#else #else
u_int th_x2:4, /* (unused) */ uint8_t th_x2:4, /* (unused) */
th_off:4; /* data offset */ th_off:4; /* data offset */
#endif #endif
uint8_t th_flags; uint8_t th_flags;