From: Stefan Hajnoczi <stefanha@gmail.com>
Date: Mon, 18 Jan 2010 20:53:20 +0000 (+0000)
Subject: [tftp] Abort requests with error code 0
X-Git-Tag: v1.0.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0579ddc834b1ae9e52e930560a75c624cd8f36c2;p=thirdparty%2Fipxe.git

[tftp] Abort requests with error code 0

There is no defined error code for aborting a request but 0 is commonly
used.  This patch switches the abort request error code from
TFTP_ERR_UNKNOWN_TID (5) to 0.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
---

diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c
index e8d73abdb..3de2fb9b7 100644
--- a/src/net/udp/tftp.c
+++ b/src/net/udp/tftp.c
@@ -773,7 +773,7 @@ static int tftp_rx_oack ( struct tftp_request *tftp, void *buf, size_t len ) {
 	/* Abort request if only trying to determine file size */
 	if ( tftp->flags & TFTP_FL_SIZEONLY ) {
 		rc = 0;
-		tftp_send_error ( tftp, TFTP_ERR_UNKNOWN_TID, "TFTP Aborted" );
+		tftp_send_error ( tftp, 0, "TFTP Aborted" );
 		tftp_done ( tftp, rc );
 		return rc;
 	}
@@ -808,7 +808,7 @@ static int tftp_rx_data ( struct tftp_request *tftp,
 	if ( tftp->flags & TFTP_FL_SIZEONLY ) {
 		/* If we get here then server doesn't support SIZE option */
 		rc = -ENOTSUP;
-		tftp_send_error ( tftp, TFTP_ERR_UNKNOWN_TID, "TFTP Aborted" );
+		tftp_send_error ( tftp, 0, "TFTP Aborted" );
 		goto done;
 	}