[U-Boot] [PATCH v3] net: TFTP: add timer count environment variable

[Albert ARIBAUD (3ADEV)]

There already is an environment variable 'tftptimeout'
for setting individuabl block query timeout value, but
there is none for setting the maximum TFTP timeout count,
which can also help with unreliable network, TFTP server,
or client hardware.

Add environment variable 'tftptimeoutcountmax'. As per the
comments about the global variable tftp_timeout_count_max,
make sure tftptimeoutcountmax is nonnegative.

Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud at 3adev.fr>
---

Changes in v3:
- fixed mixup between tctp_timeout_count_max and timeout_count_max.

Changes in v2:
- fixed env var name in commit message

 README     |  8 ++++++++
 net/tftp.c | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/README b/README
index 4e0ff9f..56784b1 100644
--- a/README
+++ b/README
@@ -5477,6 +5477,14 @@ List of environment variables (most likely not complete):
 		  faster in networks with high packet loss rates or
 		  with unreliable TFTP servers.
 
+  tftptimeoutcountmax	- maximum count of TFTP timeouts (no
+          unit, minimum value = 0). Defines how many timeouts
+          can happen during a single file transfer before that
+          transfer is aborted. The default is 10, and 0 means
+          'no timeouts allowed'. Increasing this value may help
+          downloads succeed with high packet loss rates, or with
+          unreliable TFTP servers or client hardware.
+
   vlan		- When set to a value < 4095 the traffic over
 		  Ethernet is encapsulated/received over 802.1q
 		  VLAN tagged frames.
diff --git a/net/tftp.c b/net/tftp.c
index 3e99e73..715fe04 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -600,7 +600,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
 		}
 
 		tftp_prev_block = tftp_cur_block;
-		timeout_count_max = TIMEOUT_COUNT;
+		timeout_count_max = tftp_timeout_count_max;
 		net_set_timeout_handler(timeout_ms, tftp_timeout_handler);
 
 		store_block(tftp_cur_block - 1, pkt + 2, len);
@@ -715,6 +715,16 @@ void tftp_start(enum proto_t protocol)
 		timeout_ms = 1000;
 	}
 
+	ep = getenv("tftptimeoutcountmax");
+	if (ep != NULL)
+		tftp_timeout_count_max = simple_strtol(ep, NULL, 10);
+
+	if (tftp_timeout_count_max < 0) {
+		printf("TFTP timeout count max (%d ms) negative, set to 0\n",
+		       tftp_timeout_count_max);
+		tftp_timeout_count_max = 0;
+	}
+
 	debug("TFTP blocksize = %i, timeout = %ld ms\n",
 	      tftp_block_size_option, timeout_ms);
 
@@ -840,7 +850,7 @@ void tftp_start_server(void)
 
 	puts("Loading: *\b");
 
-	timeout_count_max = TIMEOUT_COUNT;
+	timeout_count_max = tftp_timeout_count_max;
 	timeout_count = 0;
 	timeout_ms = TIMEOUT;
 	net_set_timeout_handler(timeout_ms, tftp_timeout_handler);
-- 
2.1.4