From 1cb1a66aed921060fa34d161b52e95d05de18ec1 Mon Sep 17 00:00:00 2001 From: Milan Plzik Date: Thu, 7 Jan 2010 13:39:43 +0100 Subject: [PATCH] Qemu's internal TFTP server breaks lock-step-iness of TFTP According to RFC 1350 and RFC 2347, TFTP server should answer RRQ by either OACK or DATA packet. Qemu's internal TFTP server answers RRQ with additional options by sending both OACK and DATA packet, thus breaking the "lock-step" feature of the protocol, and also confuses client. Proposed solution would be to, in case of OACK packet, wait for ACK from client and just then start sending data. Attached patch implements this. Signed-off-by: Thomas Horsten Signed-off-by: Milan Plzik Signed-off-by: Anthony Liguori --- slirp/tftp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/slirp/tftp.c b/slirp/tftp.c index 12dd3444f8..96c0e0c673 100644 --- a/slirp/tftp.c +++ b/slirp/tftp.c @@ -368,6 +368,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp_t *tp, int pktlen) } tftp_send_oack(spt, "tsize", tsize, tp); + return; } }