From: Joseph C. Lehner <joseph.c.lehner@gmail.com>
Date: Mon, 8 Feb 2016 13:35:56 +0000 (+0100)
Subject: Set ackblock to -1 on timeout
X-Git-Tag: v0.9~12
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15b30ad2e7698634be0651de31bf7d8cde6e544e;p=oweals%2Fnmrpflash.git

Set ackblock to -1 on timeout
---

diff --git a/tftp.c b/tftp.c
index ec15c4b..ae5b1a2 100644
--- a/tftp.c
+++ b/tftp.c
@@ -262,7 +262,11 @@ int tftp_put(struct nmrpd_args *args)
 	pkt_mkwrq(tx, args->filename);
 
 	do {
-		ackblock = pkt_num(rx) == ACK ? pkt_num(rx + 2) : -1;
+		if (!timeout && pkt_num(rx) == ACK) {
+			ackblock = pkt_num(rx + 2);
+		} else {
+			ackblock = -1;
+		}
 
 		if (timeout || ackblock == block) {
 			if (!timeout) {