sysmo-bts/barebox
9
0
Fork 0
Code Releases Activity

tftp_recv(): handle opcode field in a more natural way

Browse source 
RFC1350 uses the 'opcode' term for the first 2-bytes field
of TFTP packet. But the U-boot tftp code uses the 'proto' term
for the same thing.

The patch takes back original term and makes opcode calculation
more clear.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Antony Pavlov 2015-06-28 19:19:40 +03:00 committed by Sascha Hauer
parent fb6f3318de
commit 69957c5481
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs/tftp.c
View file

@ -256,22 +256,21 @@ static void tftp_timer_reset(struct file_priv *priv)
static void tftp_recv(struct file_priv *priv,
uint8_t *pkt, unsigned len, uint16_t uh_sport)
{
uint16_t proto;
uint16_t *s;
uint16_t opcode;
/* according to RFC1350 minimal tftp packet length is 4 bytes */
if (len < 4)
return;
opcode = ntohs(*(uint16_t *)pkt);
/* skip tftp opcode 2-byte field */
len -= 2;
pkt += 2;
s = (uint16_t *)pkt;
proto = *s++;
pkt = (unsigned char *)s;
debug("%s: opcode 0x%04x\n", __func__, opcode);
debug("%s: proto 0x%04x\n", __func__, proto);
switch (ntohs(proto)) {
switch (opcode) {
case TFTP_RRQ:
case TFTP_WRQ:
default: