June 2020 - U-Boot

[PATCH 1/1] log: clean up Kconfig
by Heinrich Schuchardt 13 Jun '20

13 Jun '20

LOG_DEFAULT_LEVEL has been chosen as 6. Adjust the default of LOG_MAX_LEVEL to this value. Use ranges to clamp log levels to reasonable values. Group output options by main U-Boot, SPL, TPL, followed by other logging options. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/Kconfig | 159 ++++++++++++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 74 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 2d86dd7e63..7872bc46cd 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -647,28 +647,12 @@ config LOG discarded if not needed. Logging supports various categories and levels of severity. -config SPL_LOG - bool "Enable logging support in SPL" - depends on LOG - help - This enables support for logging of status and debug messages. These - can be displayed on the console, recorded in a memory buffer, or - discarded if not needed. Logging supports various categories and - levels of severity. - -config TPL_LOG - bool "Enable logging support in TPL" - depends on LOG - help - This enables support for logging of status and debug messages. These - can be displayed on the console, recorded in a memory buffer, or - discarded if not needed. Logging supports various categories and - levels of severity. +if LOG config LOG_MAX_LEVEL int "Maximum log level to record" - depends on LOG - default 5 + default 6 + range 0 9 help This selects the maximum log level that will be recorded. Any value higher than this will be ignored. If possible log statements below @@ -685,14 +669,15 @@ config LOG_MAX_LEVEL 8 - debug content 9 - debug hardware I/O -config SPL_LOG_MAX_LEVEL - int "Maximum log level to record in SPL" - depends on SPL_LOG - default 3 +config LOG_DEFAULT_LEVEL + int "Default logging level to display" + default LOG_MAX_LEVEL + range 0 LOG_MAX_LEVEL help - This selects the maximum log level that will be recorded. Any value - higher than this will be ignored. If possible log statements below - this level will be discarded at build time. Levels: + This is the default logging level set when U-Boot starts. It can + be adjusted later using the 'log level' command. Note that setting + this to a value above LOG_MAX_LEVEL will be ineffective, since the + higher levels are not compiled in to U-Boot. 0 - emergency 1 - alert @@ -705,10 +690,38 @@ config SPL_LOG_MAX_LEVEL 8 - debug content 9 - debug hardware I/O -config TPL_LOG_MAX_LEVEL - int "Maximum log level to record in TPL" - depends on TPL_LOG +config LOG_CONSOLE + bool "Allow log output to the console" + default y + help + Enables a log driver which writes log records to the console. + Generally the console is the serial port or LCD display. Only the + log message is shown - other details like level, category, file and + line number are omitted. + +config LOG_SYSLOG + bool "Log output to syslog server" + depends on NET + help + Enables a log driver which broadcasts log records via UDP port 514 + to syslog servers. + +config SPL_LOG + bool "Enable logging support in SPL" + depends on LOG + help + This enables support for logging of status and debug messages. These + can be displayed on the console, recorded in a memory buffer, or + discarded if not needed. Logging supports various categories and + levels of severity. + +if SPL_LOG + +config SPL_LOG_MAX_LEVEL + int "Maximum log level to record in SPL" + depends on SPL_LOG default 3 + range 0 9 help This selects the maximum log level that will be recorded. Any value higher than this will be ignored. If possible log statements below @@ -725,14 +738,37 @@ config TPL_LOG_MAX_LEVEL 8 - debug content 9 - debug hardware I/O -config LOG_DEFAULT_LEVEL - int "Default logging level to display" - default 6 +config SPL_LOG_CONSOLE + bool "Allow log output to the console in SPL" + default y help - This is the default logging level set when U-Boot starts. It can - be adjusted later using the 'log level' command. Note that setting - this to a value above LOG_MAX_LEVEL will be ineffective, since the - higher levels are not compiled in to U-Boot. + Enables a log driver which writes log records to the console. + Generally the console is the serial port or LCD display. Only the + log message is shown - other details like level, category, file and + line number are omitted. + +endif + +config TPL_LOG + bool "Enable logging support in TPL" + depends on LOG + help + This enables support for logging of status and debug messages. These + can be displayed on the console, recorded in a memory buffer, or + discarded if not needed. Logging supports various categories and + levels of severity. + +if TPL_LOG + +config TPL_LOG_MAX_LEVEL + int "Maximum log level to record in TPL" + depends on TPL_LOG + default 3 + range 0 9 + help + This selects the maximum log level that will be recorded. Any value + higher than this will be ignored. If possible log statements below + this level will be discarded at build time. Levels: 0 - emergency 1 - alert @@ -745,29 +781,8 @@ config LOG_DEFAULT_LEVEL 8 - debug content 9 - debug hardware I/O -config LOG_CONSOLE - bool "Allow log output to the console" - depends on LOG - default y - help - Enables a log driver which writes log records to the console. - Generally the console is the serial port or LCD display. Only the - log message is shown - other details like level, category, file and - line number are omitted. - -config SPL_LOG_CONSOLE - bool "Allow log output to the console in SPL" - depends on SPL_LOG - default y - help - Enables a log driver which writes log records to the console. - Generally the console is the serial port or LCD display. Only the - log message is shown - other details like level, category, file and - line number are omitted. - config TPL_LOG_CONSOLE bool "Allow log output to the console in TPL" - depends on TPL_LOG default y help Enables a log driver which writes log records to the console. @@ -775,26 +790,10 @@ config TPL_LOG_CONSOLE log message is shown - other details like level, category, file and line number are omitted. -config LOG_SYSLOG - bool "Log output to syslog server" - depends on LOG && NET - help - Enables a log driver which broadcasts log records via UDP port 514 - to syslog servers. - -config LOG_TEST - bool "Provide a test for logging" - depends on LOG && UNIT_TEST - default y if SANDBOX - help - This enables a 'log test' command to test logging. It is normally - executed from a pytest and simply outputs logging information - in various different ways to test that the logging system works - correctly with various settings. +endif config LOG_ERROR_RETURN bool "Log all functions which return an error" - depends on LOG help When an error is returned in U-Boot it is sometimes difficult to figure out the root cause. For example, reading from SPI flash may @@ -805,6 +804,18 @@ config LOG_ERROR_RETURN You can add log_ret() to all functions which return an error code. +config LOG_TEST + bool "Provide a test for logging" + depends on UNIT_TEST + default y if SANDBOX + help + This enables a 'log test' command to test logging. It is normally + executed from a pytest and simply outputs logging information + in various different ways to test that the logging system works + correctly with various settings. + +endif + endmenu config SUPPORT_RAW_INITRD -- 2.26.2

3 2

[PATCH 1/1] log: check argument of 'log level' command
by Heinrich Schuchardt 13 Jun '20

13 Jun '20

Check that the argument provided to the 'log level' command is in the range between zero and CONFIG_LOG_MAX_LEVEL. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/log.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cmd/log.c b/cmd/log.c index 664f7bd7ac..78352b2cb9 100644 --- a/cmd/log.c +++ b/cmd/log.c @@ -14,10 +14,18 @@ static char log_fmt_chars[LOGF_COUNT] = "clFLfm"; static int do_log_level(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - if (argc > 1) - gd->default_log_level = simple_strtol(argv[1], NULL, 10); - else + if (argc > 1) { + long log_level = simple_strtol(argv[1], NULL, 10); + + if (log_level < 0 || log_level > _LOG_MAX_LEVEL) { + printf("Only log levels <= %d are supported\n", + _LOG_MAX_LEVEL); + return CMD_RET_FAILURE; + } + gd->default_log_level = log_level; + } else { printf("Default log level: %d\n", gd->default_log_level); + } return 0; } -- 2.20.1

3 2

[PATCH v7 0/2] dm: uclass: don't assign aliased seq numbers
by Michael Walle 13 Jun '20

13 Jun '20

If there are aliases for an uclass, set the base for the "dynamically" allocated numbers next to the highest alias. The actual patch is 3, the first two patches will fix some breakage which would be introduced with patch 3. changes since v6: - added new patch to fix dev_read_alias_highest_id() changes since v5: - added test cases for usb dt node patch changes since v4: - new patch to fix the ethernet0 alias on Raspberry Pis. This has never been working, but wasn't a problem until recently. Patch 3 changes the allocation of the numbers and reserves possible aliases. changes since v3: - dev_read_alias_highest_id() is only available if CONFIG_OF_CONTROL is set. Thus added an additional condition "CONFIG_IS_ENABLED(OF_CONTROL)", thanks Simon. changes since v2: - adapt/new test cases, thanks Simon changes since v1: - move notice about superfluous commits from commit message to this section. - fix the comment style Michael Walle (3): usb: provide a device tree node to USB devices dm: core: fix dev_read_alias_highest_id() without libfdt dm: uclass: don't assign aliased seq numbers arch/sandbox/dts/test.dts | 13 +++++++++-- drivers/core/uclass.c | 21 +++++++++++++----- drivers/usb/host/usb-uclass.c | 41 ++++++++++++++++++++++++++++++----- include/configs/sandbox.h | 6 ++--- include/dm/read.h | 2 ++ test/dm/eth.c | 14 ++++++------ test/dm/test-fdt.c | 22 ++++++++++++++----- test/dm/usb.c | 22 +++++++++++++++++++ 8 files changed, 113 insertions(+), 28 deletions(-) -- 2.20.1

3 7

[PATCH v2] doc: driver-model: fix typo in design.rst
by Dario Binacchi 13 Jun '20

13 Jun '20

Fix the 'memeber' typo in doc/driver-model/design.rst. Signed-off-by: Dario Binacchi <dariobin(a)libero.it> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Add the commit message doc/driver-model/design.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/driver-model/design.rst b/doc/driver-model/design.rst index 635effcef6..1bd2a22672 100644 --- a/doc/driver-model/design.rst +++ b/doc/driver-model/design.rst @@ -628,7 +628,7 @@ parent device which is a bus, causes the device to start behaving like a bus device, regardless of its own views on the matter. The uclass for the device can also contain data private to that uclass. -But note that each device on the bus may be a memeber of a different +But note that each device on the bus may be a member of a different uclass, and this data has nothing to do with the child data for each child on the bus. It is the bus' uclass that controls the child with respect to the bus. -- 2.17.1

2 1

[PATCH v2] common: fdt: Remove additional 4k space for fdt allocation
by Michal Simek 13 Jun '20

13 Jun '20

From: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> There is no technical reason to add additional 4k space for FDT. This space is completely unused and just increase memory requirements. This is problematic on systems with limited memory resources as Xilinx Zynq CSE/ZynqMP mini and Versal mini configurations. The patch is removing additional 4k space and also increasing alignment to 64 to be aligned with 64bit systems. EFI code is using copy_fdt() which copy FDT to different location. And all boot commands in case of using U-Boot's FDT pointed by $fdtcontroladdr are copying FDT to different locations by image_setup_libfdt(). That's why in proper flow none should modified DTB used by U-Boot that's why there is no need for additional space. Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Change subject (was: common: Add Kconfig option for FDT mem alignment) - Remove Kconfig symbol - Extend description I have tested it on zcu104 --- common/board_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/board_f.c b/common/board_f.c index 01194eaa0e4d..7e99b2425a62 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -537,7 +537,7 @@ static int reserve_fdt(void) * will be relocated with other data. */ if (gd->fdt_blob) { - gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob) + 0x1000, 32); + gd->fdt_size = ALIGN(fdt_totalsize(gd->fdt_blob), 64); gd->start_addr_sp = reserve_stack_aligned(gd->fdt_size); gd->new_fdt = map_sysmem(gd->start_addr_sp, gd->fdt_size); -- 2.27.0

4 6

[PATCHv5][ 1/7] board: tbs2910: disable loadb and loads commands
by Denis 'GNUtoo' Carikli 12 Jun '20

12 Jun '20

The loadb and loads commands are not needed for booting. There are also more reliable and faster alternatives to loadb and loads that can be used with the current configuration. As that the resulting image is already very close to the size limit, removing the loadb and loads commands shouldn't hurt. With arm-linux-gnueabi-gcc 9.2.0-1 from the Parabola GNU/Linux distribution we have the following size reduction: - text: 6733 bytes - data: 116 bytes - bss: 1172 bytes - total: 8021 bytes Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)cyberdimension.org> Acked-by: Soeren Moch <smoch(a)web.de> --- Changelog since v4: ------------------- - Fixed Acked-by location in the commit message as requested by Soeren Moch. --- configs/tbs2910_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 2ff0e160f7..2623eb73cd 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -28,6 +28,8 @@ CONFIG_SYS_MEMTEST_START=0x10000000 CONFIG_SYS_MEMTEST_END=0x2f400000 CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y CONFIG_CMD_PART=y CONFIG_CMD_PCI=y -- 2.26.2

4 21

[PATCH] net: move random_port() to dns
by Baruch Siach 12 Jun '20

12 Jun '20

The random_port() routine is not used anywhere else. Make it local to dns.c to reduce code clutter, and shrink generated code a little. Signed-off-by: Baruch Siach <baruch(a)tkos.co.il> --- include/net.h | 3 --- net/dns.c | 10 ++++++++++ net/net.c | 14 -------------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/include/net.h b/include/net.h index 82500eeb30f7..a5030b395fb6 100644 --- a/include/net.h +++ b/include/net.h @@ -890,9 +890,6 @@ int is_serverip_in_cmd(void); */ int net_parse_bootfile(struct in_addr *ipaddr, char *filename, int max_len); -/* get a random source port */ -unsigned int random_port(void); - /** * update_tftp - Update firmware over TFTP (via DFU) * diff --git a/net/dns.c b/net/dns.c index 67d761d7c0f5..dfcd0b85c875 100644 --- a/net/dns.c +++ b/net/dns.c @@ -35,6 +35,16 @@ char *net_dns_env_var; /* The envvar to store the answer in */ static int dns_our_port; +/* + * make port a little random (1024-17407) + * This keeps the math somewhat trivial to compute, and seems to work with + * all supported protocols/clients/servers + */ +static unsigned int random_port(void) +{ + return 1024 + (get_timer(0) % 0x4000); +} + static void dns_send(void) { struct header *header; diff --git a/net/net.c b/net/net.c index a76e16b41654..0a42db0a19fb 100644 --- a/net/net.c +++ b/net/net.c @@ -1539,20 +1539,6 @@ int net_parse_bootfile(struct in_addr *ipaddr, char *filename, int max_len) return 1; } -#if defined(CONFIG_CMD_NFS) || \ - defined(CONFIG_CMD_SNTP) || \ - defined(CONFIG_CMD_DNS) -/* - * make port a little random (1024-17407) - * This keeps the math somewhat trivial to compute, and seems to work with - * all supported protocols/clients/servers - */ -unsigned int random_port(void) -{ - return 1024 + (get_timer(0) % 0x4000); -} -#endif - void ip_to_string(struct in_addr x, char *s) { x.s_addr = ntohl(x.s_addr); -- 2.26.2

2 1

[PATCH] net: tftp: fix option validation as per RFCs
by Ravik Hasija 12 Jun '20

12 Jun '20

RFC2348, RFC2349: - Option string is case in-sensitive. - Client must generate ERR pkt in case option value mismatch in server OACK - Fix debug print for options Signed-off-by: Ravik Hasija <rahasij(a)linux.microsoft.com> --- net/tftp.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/net/tftp.c b/net/tftp.c index be24e63075..14621e2441 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -68,6 +68,7 @@ enum { TFTP_ERR_UNEXPECTED_OPCODE = 4, TFTP_ERR_UNKNOWN_TRANSFER_ID = 5, TFTP_ERR_FILE_ALREADY_EXISTS = 6, + TFTP_ERR_OPTION_NEGOTIATION = 8, }; static struct in_addr tftp_remote_ip; @@ -111,6 +112,7 @@ static int tftp_put_final_block_sent; #define STATE_OACK 5 #define STATE_RECV_WRQ 6 #define STATE_SEND_WRQ 7 +#define STATE_INVALID_OPTION 8 /* default TFTP block size */ #define TFTP_BLOCK_SIZE 512 @@ -313,6 +315,7 @@ static void tftp_send(void) uchar *xp; int len = 0; ushort *s; + bool err_pkt = false; /* * We will always be sending some sort of packet, so @@ -383,6 +386,7 @@ static void tftp_send(void) strcpy((char *)pkt, "File too large"); pkt += 14 /*strlen("File too large")*/ + 1; len = pkt - xp; + err_pkt = true; break; case STATE_BAD_MAGIC: @@ -394,11 +398,28 @@ static void tftp_send(void) strcpy((char *)pkt, "File has bad magic"); pkt += 18 /*strlen("File has bad magic")*/ + 1; len = pkt - xp; + err_pkt = true; + break; + + case STATE_INVALID_OPTION: + xp = pkt; + s = (ushort *)pkt; + *s++ = htons(TFTP_ERROR); + *s++ = htons(TFTP_ERR_OPTION_NEGOTIATION); + pkt = (uchar *)s; + strcpy((char *)pkt, "Option Negotiation Failed"); + /* strlen("Option Negotiation Failed") + NULL*/ + pkt += 25 + 1; + len = pkt - xp; + err_pkt = true; break; } net_send_udp_packet(net_server_ethaddr, tftp_remote_ip, tftp_remote_port, tftp_our_port, len); + + if (err_pkt) + net_set_state(NETLOOP_FAIL); } #ifdef CONFIG_CMD_TFTPPUT @@ -419,6 +440,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, __be16 proto; __be16 *s; int i; + u16 timeout_val_rcvd; if (dest != tftp_our_port) { return; @@ -475,8 +497,14 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, #endif case TFTP_OACK: - debug("Got OACK: %s %s\n", - pkt, pkt + strlen((char *)pkt) + 1); + debug("Got OACK: "); + for (i = 0; i < len; i++) { + if (pkt[i] == '\0') + debug(" "); + else + debug("%c", pkt[i]); + } + debug("\n"); tftp_state = STATE_OACK; tftp_remote_port = src; /* @@ -485,15 +513,32 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, * something like "len-8" may give a *huge* number */ for (i = 0; i+8 < len; i++) { - if (strcmp((char *)pkt + i, "blksize") == 0) { + if (strcasecmp((char *)pkt + i, "blksize") == 0) { tftp_block_size = (unsigned short) simple_strtoul((char *)pkt + i + 8, NULL, 10); - debug("Blocksize ack: %s, %d\n", + debug("Blocksize oack: %s, %d\n", (char *)pkt + i + 8, tftp_block_size); + if (tftp_block_size > tftp_block_size_option) { + printf("Invalid blk size(=%d)\n", + tftp_block_size); + tftp_state = STATE_INVALID_OPTION; + } + } + if (strcasecmp((char *)pkt + i, "timeout") == 0) { + timeout_val_rcvd = (unsigned short) + simple_strtoul((char *)pkt + i + 8, + NULL, 10); + debug("Timeout oack: %s, %d\n", + (char *)pkt + i + 8, timeout_val_rcvd); + if (timeout_val_rcvd != (timeout_ms / 1000)) { + printf("Invalid timeout val(=%d s)\n", + timeout_val_rcvd); + tftp_state = STATE_INVALID_OPTION; + } } #ifdef CONFIG_TFTP_TSIZE - if (strcmp((char *)pkt+i, "tsize") == 0) { + if (strcasecmp((char *)pkt + i, "tsize") == 0) { tftp_tsize = simple_strtoul((char *)pkt + i + 6, NULL, 10); debug("size = %s, %d\n", @@ -502,7 +547,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, #endif } #ifdef CONFIG_CMD_TFTPPUT - if (tftp_put_active) { + if (tftp_put_active && tftp_state == STATE_OACK) { /* Get ready to send the first block */ tftp_state = STATE_DATA; tftp_cur_block++; @@ -519,7 +564,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, update_block_number(); if (tftp_state == STATE_SEND_RRQ) - debug("Server did not acknowledge timeout option!\n"); + debug("Server did not acknowledge any options!\n"); if (tftp_state == STATE_SEND_RRQ || tftp_state == STATE_OACK || tftp_state == STATE_RECV_WRQ) { -- 2.17.1

3 2

[PATCH 01/10] net: rtl8139: Factor out device name assignment
by Marek Vasut 12 Jun '20

12 Jun '20

Pull the device name setting into a separate function, as this will be shared between DM/non-DM variants. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/rtl8139.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index 1f08397291..adee618543 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -521,6 +521,11 @@ static int rtl8139_bcast_addr(struct eth_device *dev, const u8 *bcast_mac, return 0; } +static void rtl8139_name(char *str, int card_number) +{ + sprintf(str, "RTL8139#%u", card_number); +} + static struct pci_device_id supported[] = { { PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139 }, { PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_8139 }, @@ -553,7 +558,7 @@ int rtl8139_initialize(bd_t *bis) } memset(dev, 0, sizeof(*dev)); - sprintf(dev->name, "RTL8139#%d", card_number); + rtl8139_name(dev->name, card_number); dev->priv = (void *)devno; dev->iobase = (int)bus_to_phys(iobase); -- 2.25.1

2 19

[PATCH] net: tftp: fix progress marker for file transfer
by Ravik Hasija 12 Jun '20

12 Jun '20

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(a)linux.microsoft.com> --- net/tftp.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/net/tftp.c b/net/tftp.c index 34488b76c8..8039694ef2 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -229,9 +229,11 @@ static void tftp_timeout_handler(void); static void show_block_marker(void) { + ulong pos; + #ifdef CONFIG_TFTP_TSIZE if (tftp_tsize) { - ulong pos = tftp_cur_block * tftp_block_size + + pos = tftp_cur_block * tftp_block_size + tftp_block_wrap_offset; if (pos > tftp_tsize) pos = tftp_tsize; @@ -243,9 +245,11 @@ static void show_block_marker(void) } else #endif { - if (((tftp_cur_block - 1) % 10) == 0) + pos = (tftp_cur_block - 1) + + (tftp_block_wrap * TFTP_SEQUENCE_SIZE); + if ((pos % 10) == 0) putc('#'); - else if ((tftp_cur_block % (10 * HASHES_PER_LINE)) == 0) + else if (((pos + 1) % (10 * HASHES_PER_LINE)) == 0) puts("\n\t "); } } @@ -278,9 +282,8 @@ static void update_block_number(void) tftp_block_wrap++; tftp_block_wrap_offset += tftp_block_size * TFTP_SEQUENCE_SIZE; timeout_count = 0; /* we've done well, reset the timeout */ - } else { - show_block_marker(); } + show_block_marker(); } /* The TFTP get or put is complete */ @@ -514,8 +517,6 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, len -= 2; tftp_cur_block = ntohs(*(__be16 *)pkt); - update_block_number(); - if (tftp_state == STATE_SEND_RRQ) debug("Server did not acknowledge timeout option!\n"); @@ -541,6 +542,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, break; } + update_block_number(); tftp_prev_block = tftp_cur_block; timeout_count_max = tftp_timeout_count_max; net_set_timeout_handler(timeout_ms, tftp_timeout_handler); -- 2.17.1

3 2