diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-02 15:16:20 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-02 15:16:29 +0100 |
| commit | e619b14746e5d8c0e53061661fd0e1da01fd4d60 (patch) | |
| tree | 7ef36747afcc049baa1e5993f2c7d7f19bdc9c44 /slirp/tcp_var.h | |
| parent | 38bb54f323bf7c83496b6a044cfd28896e997a00 (diff) | |
| parent | eb5d4f5329df83ea15244b47f7fbca21adaae41b (diff) | |
| download | focaccia-qemu-e619b14746e5d8c0e53061661fd0e1da01fd4d60.tar.gz focaccia-qemu-e619b14746e5d8c0e53061661fd0e1da01fd4d60.zip | |
Merge remote-tracking branch 'sthibault/tags/samuel-thibault' into staging
slirp updates # gpg: Signature made Sat 29 Apr 2017 05:45:24 PM BST # gpg: using RSA key 0xB0A51BF58C9179C5 # gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" # gpg: aka "Samuel Thibault <sthibault@debian.org>" # gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" # gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" # gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" # Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6 # Subkey fingerprint: AEBF 7448 FAB9 453A 4552 390E B0A5 1BF5 8C91 79C5 * sthibault/tags/samuel-thibault: slirp: VMStatify remaining except for loop slirp: VMStatify socket level slirp: Common lhost/fhost union slirp: VMStatify sbuf slirp: VMState conversion; tcpcb slirp: fix pinging the virtual ipv4 DNS server slirp: tftp, copy sockaddr_size slirp/smb: Replace constant strings by glib string slirp: allow host port 0 for hostfwd Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'slirp/tcp_var.h')
| -rw-r--r-- | slirp/tcp_var.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/slirp/tcp_var.h b/slirp/tcp_var.h index 0f8f187c5c..895ef6df1e 100644 --- a/slirp/tcp_var.h +++ b/slirp/tcp_var.h @@ -48,7 +48,7 @@ struct tcpcb { short t_rxtcur; /* current retransmit value */ short t_dupacks; /* consecutive dup acks recd */ u_short t_maxseg; /* maximum segment size */ - char t_force; /* 1 if forcing out a byte */ + uint8_t t_force; /* 1 if forcing out a byte */ u_short t_flags; #define TF_ACKNOW 0x0001 /* ack peer immediately */ #define TF_DELACK 0x0002 /* ack, but try to delay it */ @@ -109,8 +109,8 @@ struct tcpcb { uint32_t max_sndwnd; /* largest window peer has offered */ /* out-of-band data */ - char t_oobflags; /* have some */ - char t_iobc; /* input character */ + uint8_t t_oobflags; /* have some */ + uint8_t t_iobc; /* input character */ #define TCPOOB_HAVEDATA 0x01 #define TCPOOB_HADDATA 0x02 short t_softerror; /* possible error not yet reported */ |