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

Adjust tftp_put return values

Browse source
This commit is contained in:
Joseph C. Lehner 2016-02-08 11:55:25 +01:00
parent cac4275e60
commit 917b2d9578
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nmrp.c
View file

@ -436,8 +436,9 @@ int nmrp_do(struct nmrpd_args *args)
printf("OK\nWaiting for remote to respond.\n"); printf("OK\nWaiting for remote to respond.\n");
ethsock_set_timeout(sock, args->ul_timeout); ethsock_set_timeout(sock, args->ul_timeout);
expect = NMRP_C_CLOSE_REQ; expect = NMRP_C_CLOSE_REQ;
} else if (err == -2) {
expect = NMRP_C_TFTP_UL_REQ;
} else { } else {
printf("\n");
goto out; goto out;
} }

10
tftp.c
View file

@ -149,12 +149,12 @@ static ssize_t tftp_recvfrom(int sock, char *pkt, uint16_t* port,
* at offset 0. The limit of 32 chars is arbitrary. * at offset 0. The limit of 32 chars is arbitrary.
*/ */
fprintf(stderr, "Error: %.32s\n", pkt); fprintf(stderr, "Error: %.32s\n", pkt);
return -3; return -2;
} else if (!opcode || opcode > ERR) { } else if (!opcode || opcode > ERR) {
fprintf(stderr, "Received invalid packet: "); fprintf(stderr, "Received invalid packet: ");
pkt_print(pkt, stderr); pkt_print(pkt, stderr);
fprintf(stderr, ".\n"); fprintf(stderr, ".\n");
return -2; return -1;
} }
if (verbosity > 2) { if (verbosity > 2) {
@ -307,8 +307,12 @@ int tftp_put(struct nmrpd_args *args)
} else if (!ret) { } else if (!ret) {
if (++timeout < 5) { if (++timeout < 5) {
continue; continue;
} else if (block) {
fprintf(stderr, "Timeout while waiting for ACK(%d).\n", block);
} else {
fprintf(stderr, "Timeout while waiting for initial reply.\n");
} }
fprintf(stderr, "Timeout while waiting for ACK(%d).\n", block); ret = -1;
goto cleanup; goto cleanup;
} else { } else {
timeout = 0; timeout = 0;