From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=siyuan.fu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5926221189F88 for ; Mon, 5 Nov 2018 22:51:18 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Nov 2018 22:51:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,470,1534834800"; d="scan'208";a="97957625" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga003.jf.intel.com with ESMTP; 05 Nov 2018 22:51:17 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 5 Nov 2018 22:51:17 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.161]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.102]) with mapi id 14.03.0415.000; Tue, 6 Nov 2018 14:51:16 +0800 From: "Fu, Siyuan" To: "Wu, Jiaxin" , "edk2-devel@lists.01.org" CC: "Carsey, Jaben" , "Ye, Ting" Thread-Topic: [PATCH v1] ShellPkg/TftpDynamicCommand: Clarify the retry count option in command. Thread-Index: AQHUdNUHCq+KcmcjD0yTsg1IwpuS86VCUIbw Date: Tue, 6 Nov 2018 06:51:16 +0000 Message-ID: References: <20181105065830.16192-1-Jiaxin.wu@intel.com> <20181105065830.16192-2-Jiaxin.wu@intel.com> In-Reply-To: <20181105065830.16192-2-Jiaxin.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTZkYzk0ZmQtYTIyNy00NWJmLWFjMTEtYjdhYzU3NTFhZDI1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoia0FkUE0xNk10em5ZNWQybzFiQWx6Y3hkOXJHS3Y0NnpldFRVOXVGWEdvNTVab3FWU3BwXC93UFprelFNekx0QVEifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH v1] ShellPkg/TftpDynamicCommand: Clarify the retry count option in command. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Nov 2018 06:51:19 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Fu Siyuan > -----Original Message----- > From: Wu, Jiaxin > Sent: Monday, November 5, 2018 2:59 PM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben ; Ye, Ting ; > Fu, Siyuan ; Wu, Jiaxin > Subject: [PATCH v1] ShellPkg/TftpDynamicCommand: Clarify the retry count > option in command. >=20 > [-c ] 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. >=20 > Cc: Carsey Jaben > Cc: Ye Ting > Cc: Fu Siyuan > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Wu Jiaxin > --- > ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c | 6 +++++- > ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni | 3 ++- > 2 files changed, 7 insertions(+), 2 deletions(-) >=20 > diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > index ac2813efc3..028686e1ff 100644 > --- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > +++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.c > @@ -216,11 +216,11 @@ EFI_MTFTP4_CONFIG_DATA DefaultMtftp4ConfigData =3D = { > { { 0, 0, 0, 0 } }, // SubnetMask - Not relevant > as UseDefaultSetting=3DTRUE > 0, // LocalPort - Automatically > assigned port number. > { { 0, 0, 0, 0 } }, // GatewayIp - Not relevant > as UseDefaultSetting=3DTRUE > { { 0, 0, 0, 0 } }, // ServerIp - Not known yet > 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 - Retransmissio= n > timeout in seconds. > }; >=20 > STATIC CONST SHELL_PARAM_ITEM ParamList[] =3D { > {L"-i", TypeValue}, > @@ -419,10 +419,14 @@ RunTftp ( > ValueStr =3D ShellCommandLineGetValue (CheckPackage, L"-c"); > if (ValueStr !=3D NULL) { > if (!StringToUint16 (ValueStr, &Mtftp4ConfigData.TryCount)) { > goto Error; > } > + > + if (Mtftp4ConfigData.TryCount =3D=3D 0) { > + Mtftp4ConfigData.TryCount =3D 6; > + } > } >=20 > ValueStr =3D ShellCommandLineGetValue (CheckPackage, L"-t"); > if (ValueStr !=3D NULL) { > if (!StringToUint16 (ValueStr, &Mtftp4ConfigData.TimeoutValue)) { > diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni > b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni > index 654e42ad23..ff64912564 100644 > --- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni > +++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni > @@ -56,11 +56,12 @@ > " -i interface - Specifies an adapter name, i.e., eth0.\r\n" > " -l port - Specifies the local port number. Default value is > 0\r\n" > " and the port number is automatically assigned.\r\n= " > " -r port - Specifies the remote port number. Default value is > 69.\r\n" > " -c - 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 t= o > zero\r\n" > +" also means to use the default value.\r\n" > " -t - The number of seconds to wait for a response > after\r\n" > " sending a request packet. Default value is 4s.\r\n= " > " -s - Specifies the TFTP blksize option as defined in RF= C > 2348.\r\n" > " Valid range is between 8 and 65464, default value > is 512.\r\n" > " -w - Specifies the TFTP windowsize option as defined in > RFC 7440.\r\n" > -- > 2.17.1.windows.2