diff options
| author | Milan Plzik <milan.plzik@gmail.com> | 2010-01-07 13:39:43 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-13 17:22:57 -0600 |
| commit | 3999bf32440c1ea2ceb85eef008cc56a069af13f (patch) | |
| tree | 06de49dfb99e4d9e33e4f138eb36bc3351f9a69e | |
| parent | a3441a43a668c0dc31ca4c8b2d236e053d29b8da (diff) | |
| download | qemu-3999bf32440c1ea2ceb85eef008cc56a069af13f.tar.gz | |
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 <thomas@horsten.com>
Signed-off-by: Milan Plzik <milan.plzik@gmail.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 1cb1a66aed921060fa34d161b52e95d05de18ec1)
| -rw-r--r-- | slirp/tftp.c | 1 |
1 files changed, 1 insertions, 0 deletions
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; } } |