[PATCH net-pu] tftp: fix get

[Sascha Hauer]

On Sun, Jun 27, 2010 at 08:14:46AM +0300, Baruch Siach wrote:
> Hi Sascha,
> 
> On Thu, Jun 24, 2010 at 05:59:07PM +0200, Sascha Hauer wrote:
> > On Thu, Jun 24, 2010 at 04:26:16PM +0300, Baruch Siach wrote:
> > > With this patch tftp start requesting block 0 instead of 1. This fixes
> > > tftp get on i.MX25 based board with tftpd-hpa server.
> > 
> > This is strange. In case of tftp get this variable is not used for
> > sending packets. We do not request blocks with a certain number, we only
> > request a file and ack incoming packets. If you look at 'case TFTP_DATA'
> > in tftp_handler(), you'll see tftp_block getting overwritten by the
> > block number of the incoming packet.
> 
> The code that sends the first acknowledgement (in my case, i.e. tftpd-hpa) is 
> at 'case STATE_OACK', in response to the "Option Acknowledgement" of the 
> 'timeout=5' option. This code does not initialize tftp_block.

How about the following. This works for me with the hpa server in get
and push mode.


diff --git a/net/tftp.c b/net/tftp.c
index c0d3278..4b74dca 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -185,10 +185,21 @@ static void tftp_handler(char *packet, unsigned len)
 
 	case TFTP_OACK:
 		debug("Got OACK: %s %s\n", pkt, pkt + strlen(pkt) + 1);
-		tftp_state = STATE_OACK;
 		tftp_server_port = ntohs(udp->uh_sport);
 		tftp_con->udp->uh_dport = udp->uh_sport;
-		tftp_send(); /* Send ACK */
+
+		if (tftp_put) {
+			/* send first block */
+			tftp_state = STATE_WDATA;
+			tftp_block = 1;
+		} else {
+			/* send ACK */
+			tftp_state = STATE_OACK;
+			tftp_block = 0;
+		}
+
+		tftp_send();
+
 		break;
 	case TFTP_DATA:
 		if (len < 2)

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |