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

Better handling of extra upload requests

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-17 12:42:20 +01:00
parent 68501ff596
commit 57a275312c
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nmrp.c
View file

@ -349,7 +349,7 @@ int nmrp_do(struct nmrpd_args *args)
char *filename; char *filename;
struct in_addr ipaddr, ipmask; struct in_addr ipaddr, ipmask;
time_t beg; time_t beg;
int i, status, ulreqs, expect, unexpected; int i, status, ulreqs, expect, upload_ok;
struct ethsock *sock; struct ethsock *sock;
void (*sigh_orig)(int); void (*sigh_orig)(int);
@ -433,6 +433,7 @@ int nmrp_do(struct nmrpd_args *args)
msg_hton(&tx.msg); msg_hton(&tx.msg);
i = 0; i = 0;
upload_ok = 0;
beg = time(NULL); beg = time(NULL);
while (1) { while (1) {
@ -469,9 +470,6 @@ int nmrp_do(struct nmrpd_args *args)
if (expect != NMRP_C_NONE && rx.msg.code != expect) { if (expect != NMRP_C_NONE && rx.msg.code != expect) {
fprintf(stderr, "Received %s while waiting for %s!\n", fprintf(stderr, "Received %s while waiting for %s!\n",
msg_code_str(rx.msg.code), msg_code_str(expect)); msg_code_str(rx.msg.code), msg_code_str(expect));
unexpected = 1;
} else {
unexpected = 0;
} }
tx.msg.code = NMRP_C_NONE; tx.msg.code = NMRP_C_NONE;
@ -521,7 +519,7 @@ int nmrp_do(struct nmrpd_args *args)
break; break;
case NMRP_C_TFTP_UL_REQ: case NMRP_C_TFTP_UL_REQ:
if (!unexpected) { if (!upload_ok) {
if (++ulreqs > 5) { if (++ulreqs > 5) {
printf("Bailing out after %d upload requests.\n", printf("Bailing out after %d upload requests.\n",
ulreqs); ulreqs);
@ -588,6 +586,7 @@ int nmrp_do(struct nmrpd_args *args)
if (!status) { if (!status) {
printf("OK\nWaiting for remote to respond.\n"); printf("OK\nWaiting for remote to respond.\n");
upload_ok = 1;
ethsock_set_timeout(sock, args->ul_timeout); ethsock_set_timeout(sock, args->ul_timeout);
expect = NMRP_C_NONE; expect = NMRP_C_NONE;
} else if (status == -2) { } else if (status == -2) {