brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: tftp: fix progress marker for file transfer 

During packet sequence number wraparound the show_block_marker() API was
not called, as a result the progress marker doesn't stay within column
boundary. Use position in file instead of sequence number to align the
marker.

Signed-off-by: Ravik Hasija <rahasij@linux.microsoft.com>
Reviewed-By: Ramon Fried <rfried.dev@gmail.com>
This commit is contained in:
Ravik Hasija 2020-05-07 14:55:32 -07:00 committed by Tom Rini
parent 8882238cc4
commit de5468e660
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/tftp.c
View File

@ -233,9 +233,11 @@ static void tftp_timeout_handler(void);
static void show_block_marker(void) static void show_block_marker(void)
{ {
ulong pos;
#ifdef CONFIG_TFTP_TSIZE #ifdef CONFIG_TFTP_TSIZE
if (tftp_tsize) { if (tftp_tsize) {
ulong pos = tftp_cur_block * tftp_block_size + pos = tftp_cur_block * tftp_block_size +
tftp_block_wrap_offset; tftp_block_wrap_offset;
if (pos > tftp_tsize) if (pos > tftp_tsize)
pos = tftp_tsize; pos = tftp_tsize;
@ -247,9 +249,11 @@ static void show_block_marker(void)
} else } else
#endif #endif
{ {
if (((tftp_cur_block - 1) % 10) == 0) pos = (tftp_cur_block - 1) +
(tftp_block_wrap * TFTP_SEQUENCE_SIZE);
if ((pos % 10) == 0)
putc('#'); putc('#');
else if ((tftp_cur_block % (10 * HASHES_PER_LINE)) == 0) else if (((pos + 1) % (10 * HASHES_PER_LINE)) == 0)
puts("\n\t "); puts("\n\t ");
} }
} }
@ -282,9 +286,8 @@ static void update_block_number(void)
tftp_block_wrap++; tftp_block_wrap++;
tftp_block_wrap_offset += tftp_block_size * TFTP_SEQUENCE_SIZE; tftp_block_wrap_offset += tftp_block_size * TFTP_SEQUENCE_SIZE;
timeout_count = 0; /* we've done well, reset the timeout */ timeout_count = 0; /* we've done well, reset the timeout */
} else {
show_block_marker();
} }
show_block_marker();
} }
/* The TFTP get or put is complete */ /* The TFTP get or put is complete */
@ -518,8 +521,6 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
len -= 2; len -= 2;
tftp_cur_block = ntohs(*(__be16 *)pkt); tftp_cur_block = ntohs(*(__be16 *)pkt);
update_block_number();
if (tftp_state == STATE_SEND_RRQ) if (tftp_state == STATE_SEND_RRQ)
debug("Server did not acknowledge timeout option!\n"); debug("Server did not acknowledge timeout option!\n");
@ -545,6 +546,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
break; break;
} }
update_block_number();
tftp_prev_block = tftp_cur_block; tftp_prev_block = tftp_cur_block;
timeout_count_max = tftp_timeout_count_max; timeout_count_max = tftp_timeout_count_max;
net_set_timeout_handler(timeout_ms, tftp_timeout_handler); net_set_timeout_handler(timeout_ms, tftp_timeout_handler);