Commit 7edaf997 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging 



slirp updates

# gpg: Signature made Thu 09 Nov 2017 18:00:07 GMT
# gpg:                using RSA key 0x9E511E01C737F075
# 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>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: 9A37 3D36 64A8 DC62 DA0A  34FD 9E51 1E01 C737 F075

* remotes/thibault/tags/samuel-thibault:
  slirp: don't zero the whole ti_i when m == NULL

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f291910d 990132cd

slirp/tcp_subr.c

+10 −1
Original line number Diff line number Diff line
@@ -148,7 +148,16 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m, 
		m->m_data += IF_MAXLINKHDR;

		*mtod(m, struct tcpiphdr *) = *ti;

		ti = mtod(m, struct tcpiphdr *);

		memset(&ti->ti, 0, sizeof(ti->ti));

		switch (af) {

		case AF_INET:

		    ti->ti.ti_i4.ih_x1 = 0;

		    break;

		case AF_INET6:

		    ti->ti.ti_i6.ih_x1 = 0;

		    break;

		default:

		    g_assert_not_reached();

		}

		flags = TH_ACK;

	} else {

		/*