diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2010-07-22 22:15:23 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-07-25 16:59:41 +0200 |
| commit | c6d4f4e1799022247bc3846a3b29068f673655e1 (patch) | |
| tree | 310a7299d5ead3581471887632c1aef69d2d9777 /tcp_output.c | |
| parent | f46a46557d3fe72843a3b1bf2f18d48b44534862 (diff) | |
| download | slirp-c6d4f4e1799022247bc3846a3b29068f673655e1.zip slirp-c6d4f4e1799022247bc3846a3b29068f673655e1.tar.gz slirp-c6d4f4e1799022247bc3846a3b29068f673655e1.tar.bz2 | |
slirp: Replace u_int8_t, u_int16_t, u_int32_t, u_int64_t by standard int types
There is no need to have a second set of integral types.
Replace them by the standard types from stdint.h.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'tcp_output.c')
| -rw-r--r-- | tcp_output.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tcp_output.c b/tcp_output.c index 39d84d1..61b38c4 100644 --- a/tcp_output.c +++ b/tcp_output.c @@ -262,11 +262,11 @@ send: if (flags & TH_SYN) { tp->snd_nxt = tp->iss; if ((tp->t_flags & TF_NOOPT) == 0) { - u_int16_t mss; + uint16_t mss; opt[0] = TCPOPT_MAXSEG; opt[1] = 4; - mss = htons((u_int16_t)tcp_mss(tp, 0)); + mss = htons((uint16_t)tcp_mss(tp, 0)); memcpy((caddr_t)(opt + 2), (caddr_t)&mss, sizeof(mss)); optlen = 4; } @@ -363,10 +363,10 @@ send: win = (long)TCP_MAXWIN << tp->rcv_scale; if (win < (long)(tp->rcv_adv - tp->rcv_nxt)) win = (long)(tp->rcv_adv - tp->rcv_nxt); - ti->ti_win = htons((u_int16_t)(win >> tp->rcv_scale)); + ti->ti_win = htons((uint16_t)(win >> tp->rcv_scale)); if (SEQ_GT(tp->snd_up, tp->snd_una)) { - ti->ti_urp = htons((u_int16_t)(tp->snd_up - ntohl(ti->ti_seq))); + ti->ti_urp = htons((uint16_t)(tp->snd_up - ntohl(ti->ti_seq))); ti->ti_flags |= TH_URG; } else /* @@ -382,7 +382,7 @@ send: * checksum extended header and data. */ if (len + optlen) - ti->ti_len = htons((u_int16_t)(sizeof(struct tcphdr) + optlen + len)); + ti->ti_len = htons((uint16_t)(sizeof(struct tcphdr) + optlen + len)); ti->ti_sum = cksum(m, (int)(hdrlen + len)); /* |