pogmommy/nmrpflash
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Conditionally enable TFTP block rollover hack"

Browse source 
This reverts commit b3ba1c016b.
This commit is contained in:
Joseph C. Lehner 2019-09-05 15:26:01 +02:00
parent 68fb396869
commit 73a1c11f4f
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tftp.c
View file

@ -314,7 +314,6 @@ int tftp_put(struct nmrpd_args *args)
char rx[2048], tx[2048]; char rx[2048], tx[2048];
const char *file_remote = args->file_remote; const char *file_remote = args->file_remote;
char *val, *end; char *val, *end;
bool freeze_block = false;
sock = -1; sock = -1;
ret = -1; ret = -1;
@ -401,7 +400,7 @@ int tftp_put(struct nmrpd_args *args)
if (timeouts || ackblock == block) { if (timeouts || ackblock == block) {
if (!timeouts) { if (!timeouts) {
if (!freeze_block) { if (block < UINT16_MAX) {
++block; ++block;
} }
@ -433,20 +432,9 @@ int tftp_put(struct nmrpd_args *args)
} }
if (ackblock != -1 && ++errors > 5) { if (ackblock != -1 && ++errors > 5) {
if (ackblock == UINT16_MAX && block == 0 && !freeze_block) { fprintf(stderr, "Protocol error; bailing out.\n");
/* work around the 32 MiB limit if block rollover is not ret = -1;
* supported, by transmitting all remaining packets as goto cleanup;
* 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;
}
} }
} }