From: Paul Fox <pgf@brightstareng.com>
Date: Wed, 20 Jul 2005 19:49:15 +0000 (-0000)
Subject: applying fix for:
X-Git-Tag: 1_1_0~886
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d4c88c8a5d2c8ffed5555c79d2c654f1287ddd8;p=oweals%2Fbusybox.git

applying fix for:
    0000271: [PATCH] tftp -g fails if a TFTP_ACK is lost
---

diff --git a/networking/tftp.c b/networking/tftp.c
index 334d03b6a..9b9747785 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -320,7 +320,7 @@ static inline int tftp(const int cmd, const struct hostent *host,
 			FD_ZERO(&rfds);
 			FD_SET(socketfd, &rfds);
 
-			switch (select(FD_SETSIZE, &rfds, NULL, NULL, &tv)) {
+			switch (select(socketfd + 1, &rfds, NULL, NULL, &tv)) {
 			case 1:
 				len = recvfrom(socketfd, buf, tftp_bufsize, 0,
 						(struct sockaddr *) &from, &fromlen);
@@ -463,6 +463,11 @@ static inline int tftp(const int cmd, const struct hostent *host,
 				--block_nr;
 				opcode = TFTP_ACK;
 				continue;
+			} else if (tmp + 1 == block_nr) {
+				/* Server lost our TFTP_ACK.  Resend it */
+				block_nr = tmp;
+				opcode = TFTP_ACK;
+				continue;
 			}
 		}