diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2011-08-21 19:19:29 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2011-08-21 19:19:29 +0000 |
commit | 6d03ca9ef16f3e65e5b9a09f58b805762d33deed (patch) | |
tree | 6fb157ccdc0002f9ffd983e8298cd2c0a5afd9d8 | |
parent | aaca322aba8518f3825506f48def7db30fd800d4 (diff) | |
parent | e16060a2f5dcd1dc7c2a1b9c9a09a534850256b1 (diff) | |
download | slirp-6d03ca9ef16f3e65e5b9a09f58b805762d33deed.zip slirp-6d03ca9ef16f3e65e5b9a09f58b805762d33deed.tar.gz slirp-6d03ca9ef16f3e65e5b9a09f58b805762d33deed.tar.bz2 |
Merge branch 'queues/slirp' of git://git.kiszka.org/qemu
* 'queues/slirp' of git://git.kiszka.org/qemu:
slirp: Fix bit field types in IP header structs
-rw-r--r-- | ip.h | 8 | ||||
-rw-r--r-- | tcp.h | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -74,10 +74,10 @@ typedef uint32_t n_long; /* long as received from the net */ */ struct ip { #ifdef HOST_WORDS_BIGENDIAN - u_int ip_v : 4, /* version */ + uint8_t ip_v : 4, /* version */ ip_hl : 4; /* header length */ #else - u_int ip_hl : 4, /* header length */ + uint8_t ip_hl : 4, /* header length */ ip_v : 4; /* version */ #endif 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_ptr; /* index of current entry */ #ifdef HOST_WORDS_BIGENDIAN - u_int ipt_oflw : 4, /* overflow counter */ + uint8_t ipt_oflw : 4, /* overflow counter */ ipt_flg : 4; /* flags, see below */ #else - u_int ipt_flg : 4, /* flags, see below */ + uint8_t ipt_flg : 4, /* flags, see below */ ipt_oflw : 4; /* overflow counter */ #endif union ipt_timestamp { @@ -51,10 +51,10 @@ struct tcphdr { tcp_seq th_seq; /* sequence number */ tcp_seq th_ack; /* acknowledgement number */ #ifdef HOST_WORDS_BIGENDIAN - u_int th_off : 4, /* data offset */ + uint8_t th_off : 4, /* data offset */ th_x2 : 4; /* (unused) */ #else - u_int th_x2 : 4, /* (unused) */ + uint8_t th_x2 : 4, /* (unused) */ th_off : 4; /* data offset */ #endif uint8_t th_flags; |