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

Warn about TFTP block rollover

Browse source
This commit is contained in:
Joseph C. Lehner 2019-09-05 15:38:29 +02:00
parent f5d0a4ffe1
commit 0373577005
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tftp.c
View file

@ -314,6 +314,7 @@ 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 rollover;
sock = -1; sock = -1;
ret = -1; ret = -1;
@ -373,6 +374,7 @@ int tftp_put(struct nmrpd_args *args)
last_len = -1; last_len = -1;
len = 0; len = 0;
errors = 0; errors = 0;
rollover = false;
/* Not really, but this way the loop sends our WRQ before receiving */ /* Not really, but this way the loop sends our WRQ before receiving */
timeouts = 1; timeouts = 1;
@ -394,6 +396,10 @@ int tftp_put(struct nmrpd_args *args)
ret = -1; ret = -1;
goto cleanup; goto cleanup;
} }
if (verbosity) {
printf("Remote accepted blksize option: %d b\n", blksize);
}
} }
} }
} }
@ -401,8 +407,10 @@ int tftp_put(struct nmrpd_args *args)
if (timeouts || ackblock == block) { if (timeouts || ackblock == block) {
if (!timeouts) { if (!timeouts) {
if (++block == 0) { if (++block == 0) {
// rollover; skip to block 1 if (!rollover) {
block = 1; printf("Warning: TFTP block rollover. Upload might fail!\n");
rollover = true;
}
} }
pkt_mknum(tx, DATA); pkt_mknum(tx, DATA);