From 73a1c11f4f42a7232fed7eba9065b5677f489c91 Mon Sep 17 00:00:00 2001 From: "Joseph C. Lehner" Date: Thu, 5 Sep 2019 15:26:01 +0200 Subject: [PATCH] Revert "Conditionally enable TFTP block rollover hack" This reverts commit b3ba1c016b8fb2c970da9aae3fcb48fb4c255c94. --- tftp.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/tftp.c b/tftp.c index 1e0dd73..f81f877 100644 --- a/tftp.c +++ b/tftp.c @@ -314,7 +314,6 @@ int tftp_put(struct nmrpd_args *args) char rx[2048], tx[2048]; const char *file_remote = args->file_remote; char *val, *end; - bool freeze_block = false; sock = -1; ret = -1; @@ -401,7 +400,7 @@ int tftp_put(struct nmrpd_args *args) if (timeouts || ackblock == block) { if (!timeouts) { - if (!freeze_block) { + if (block < UINT16_MAX) { ++block; } @@ -433,20 +432,9 @@ int tftp_put(struct nmrpd_args *args) } if (ackblock != -1 && ++errors > 5) { - if (ackblock == UINT16_MAX && block == 0 && !freeze_block) { - /* work around the 32 MiB limit if block rollover is not - * supported, by transmitting all remaining packets as - * block #65535 - reported working on a Netgear D7000. - */ - block = UINT16_MAX; - freeze_block = true; - errors = 0; - printf("Transmitting rest of file as block %d.\n", block); - } else { - fprintf(stderr, "Protocol error; bailing out.\n"); - ret = -1; - goto cleanup; - } + fprintf(stderr, "Protocol error; bailing out.\n"); + ret = -1; + goto cleanup; } }