Set ackblock to -1 on timeout
authorJoseph C. Lehner <joseph.c.lehner@gmail.com>
Mon, 8 Feb 2016 13:35:56 +0000 (14:35 +0100)
committerJoseph C. Lehner <joseph.c.lehner@gmail.com>
Mon, 8 Feb 2016 13:35:56 +0000 (14:35 +0100)
tftp.c

diff --git a/tftp.c b/tftp.c
index ec15c4b1d6f422c59b50541f55df14c249ed38f6..ae5b1a2a8d78c38dfb7a9d9f7ff37e184ebd8a69 100644 (file)
--- 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) {