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

Simplify code

Browse source
This commit is contained in:
Joseph C. Lehner 2017-01-06 22:05:18 +01:00
parent 79f3c1ff56
commit 448ede01f1
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tftp.c
View file

@ -58,9 +58,10 @@ static bool is_netascii(const char *str)
return true; return true;
} }
static inline void pkt_mknum(char *pkt, uint16_t n) static inline char *pkt_mknum(char *pkt, uint16_t n)
{ {
*(uint16_t*)pkt = htons(n); *(uint16_t*)pkt = htons(n);
return pkt + 2;
} }
static inline uint16_t pkt_num(char *pkt) static inline uint16_t pkt_num(char *pkt)
@ -143,8 +144,8 @@ static void pkt_mkwrq(char *pkt, const char *filename, unsigned blksize)
filename = "firmware"; filename = "firmware";
} }
pkt_mknum(pkt, WRQ); pkt = pkt_mknum(pkt, WRQ);
pkt = pkt_mkopt(pkt + 2, filename, "octet"); pkt = pkt_mkopt(pkt, filename, "octet");
if (blksize && blksize != 512) { if (blksize && blksize != 512) {
pkt = pkt_mkopt(pkt, "blksize", lltostr(blksize, 10)); pkt = pkt_mkopt(pkt, "blksize", lltostr(blksize, 10));
@ -365,7 +366,7 @@ int tftp_put(struct nmrpd_args *args)
} }
addr.sin_port = htons(args->port); addr.sin_port = htons(args->port);
blksize = 1468; blksize = 512;
block = 0; block = 0;
last_len = -1; last_len = -1;
len = 0; len = 0;
@ -373,25 +374,19 @@ int tftp_put(struct nmrpd_args *args)
/* Not really, but this way the loop sends our WRQ before receiving */ /* Not really, but this way the loop sends our WRQ before receiving */
timeout = 1; timeout = 1;
pkt_mkwrq(tx, file_remote, blksize); pkt_mkwrq(tx, file_remote, 1464);
while (!g_interrupted) { while (!g_interrupted) {
ackblock = -1; ackblock = -1;
op = pkt_num(rx); op = pkt_num(rx);
if (!timeout) { if (!timeout) {
if (pkt_num(rx) == ACK) { if (op == ACK) {
ackblock = pkt_num(rx + 2); ackblock = pkt_num(rx + 2);
if (!ackblock) { } else if (op == OACK) {
blksize = 512;
}
} else if (pkt_num(rx) == OACK) {
op = ACK;
ackblock = 0; ackblock = 0;
if ((p = pkt_optval(rx, "blksize"))) { if ((p = pkt_optval(rx, "blksize"))) {
blksize = atoi(p); blksize = atoi(p);
} else {
blksize = 512;
} }
} }
} }
@ -419,7 +414,7 @@ int tftp_put(struct nmrpd_args *args)
if (ret < 0) { if (ret < 0) {
goto cleanup; goto cleanup;
} }
} else if (op != ACK || ackblock > block) { } else if ((op != OACK && op != ACK) || ackblock > block) {
if (verbosity) { if (verbosity) {
fprintf(stderr, "Expected ACK(%d), got ", block); fprintf(stderr, "Expected ACK(%d), got ", block);
pkt_print(rx, stderr); pkt_print(rx, stderr);