tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 00:24:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

ShellPkg/TftpDynamicCommand: Clarify the retry count option in command.

Browse Source 
[-c <retry count>] is to define the number of times to transmit request
packets and wait for a response. The default value is 6. But it doesn't
specify the behavior of zero value. Here, The patch is to clear that:
Set to zero also means to use the default value.

Cc: Carsey Jaben <jaben.carsey@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Jiaxin Wu 2018-11-05 14:52:30 +08:00
parent fc5b790b39
commit 62ea70e312
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c
View File

@ -218,7 +218,7 @@ EFI_MTFTP4_CONFIG_DATA DefaultMtftp4ConfigData = {
{ { 0, 0, 0, 0 } }, // GatewayIp - Not relevant as UseDefaultSetting=TRUE { { 0, 0, 0, 0 } }, // GatewayIp - Not relevant as UseDefaultSetting=TRUE
{ { 0, 0, 0, 0 } }, // ServerIp - Not known yet { { 0, 0, 0, 0 } }, // ServerIp - Not known yet
69, // InitialServerPort - Standard TFTP server port 69, // InitialServerPort - Standard TFTP server port
6, // TryCount - Max number of retransmissions. 6, // TryCount - The number of times to transmit request packets and wait for a response.
4 // TimeoutValue - Retransmission timeout in seconds. 4 // TimeoutValue - Retransmission timeout in seconds.
}; };
@ -421,6 +421,10 @@ RunTftp (
if (!StringToUint16 (ValueStr, &Mtftp4ConfigData.TryCount)) { if (!StringToUint16 (ValueStr, &Mtftp4ConfigData.TryCount)) {
goto Error; goto Error;
} }
if (Mtftp4ConfigData.TryCount == 0) {
Mtftp4ConfigData.TryCount = 6;
}
} }
ValueStr = ShellCommandLineGetValue (CheckPackage, L"-t"); ValueStr = ShellCommandLineGetValue (CheckPackage, L"-t");

3
ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni
View File

@ -58,7 +58,8 @@
" and the port number is automatically assigned.\r\n" " and the port number is automatically assigned.\r\n"
" -r port - Specifies the remote port number. Default value is 69.\r\n" " -r port - Specifies the remote port number. Default value is 69.\r\n"
" -c <retry count> - The number of times to transmit request packets and\r\n" " -c <retry count> - The number of times to transmit request packets and\r\n"
" wait for a response. The default value is 6.\r\n" " wait for a response. The default value is 6. Set to zero\r\n"
" also means to use the default value.\r\n"
" -t <timeout> - The number of seconds to wait for a response after\r\n" " -t <timeout> - The number of seconds to wait for a response after\r\n"
" sending a request packet. Default value is 4s.\r\n" " sending a request packet. Default value is 4s.\r\n"
" -s <block size> - Specifies the TFTP blksize option as defined in RFC 2348.\r\n" " -s <block size> - Specifies the TFTP blksize option as defined in RFC 2348.\r\n"