diff options
| author | Stefan Hajnoczi | 2017-05-30 15:14:57 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-05-30 15:14:57 +0200 |
| commit | 08f44282c1f6afe1ffdc31e45dae870ddbb32ed3 (patch) | |
| tree | 0527960faed0c2300c539a5931fd80bfa3180315 /slirp/tcp_input.c | |
| parent | Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging (diff) | |
| parent | Fix total IP header length in forwarded TCP packets (diff) | |
| download | qemu-08f44282c1f6afe1ffdc31e45dae870ddbb32ed3.tar.gz qemu-08f44282c1f6afe1ffdc31e45dae870ddbb32ed3.tar.xz qemu-08f44282c1f6afe1ffdc31e45dae870ddbb32ed3.zip | |
Merge remote-tracking branch 'sthibault/tags/samuel-thibault' into staging
slirp updates
# gpg: Signature made Sat 27 May 2017 10:36:33 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:
Fix total IP header length in forwarded TCP packets
slirp: fix leak
slirp: Fix wrong mss bug.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'slirp/tcp_input.c')
| -rw-r--r-- | slirp/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/tcp_input.c b/slirp/tcp_input.c index edb98f06f3..07bcbdb2dd 100644 --- a/slirp/tcp_input.c +++ b/slirp/tcp_input.c @@ -1587,11 +1587,11 @@ tcp_mss(struct tcpcb *tp, u_int offer) switch (so->so_ffamily) { case AF_INET: mss = MIN(IF_MTU, IF_MRU) - sizeof(struct tcphdr) - + sizeof(struct ip); + - sizeof(struct ip); break; case AF_INET6: mss = MIN(IF_MTU, IF_MRU) - sizeof(struct tcphdr) - + sizeof(struct ip6); + - sizeof(struct ip6); break; default: g_assert_not_reached(); |