From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 37FBF81CF4 for ; Sun, 27 Nov 2016 21:54:45 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP; 27 Nov 2016 21:54:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,562,1473145200"; d="scan'208";a="36162415" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga005.jf.intel.com with ESMTP; 27 Nov 2016 21:54:44 -0800 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 27 Nov 2016 21:54:43 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 27 Nov 2016 21:54:43 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.239]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.142]) with mapi id 14.03.0248.002; Mon, 28 Nov 2016 13:54:41 +0800 From: "Fu, Siyuan" To: "Zhang, Lubo" , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Wu, Jiaxin" Thread-Topic: [edk2] [patch] ShellPkg: Add error prompt message in Ifconfig6 command. Thread-Index: AQHSSTqrcky8WReKOUaqUkz4AbX1saDt5VQw Date: Mon, 28 Nov 2016 05:54:41 +0000 Message-ID: References: <1480311793-5048-1-git-send-email-lubo.zhang@intel.com> In-Reply-To: <1480311793-5048-1-git-send-email-lubo.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNzRlMDkzZmYtMDE5YS00MGZmLWIzOWYtNjg5MjZmYzdiYTFjIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6InQ1WnB2bE90OHFEOFV0aDNDVGE1ZTdYNjE0cXM2SkFCV0VaYlVuRXU1MVk9In0= x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [patch] ShellPkg: Add error prompt message in Ifconfig6 command. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Nov 2016 05:54:45 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Fu Siyuan > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Zhang Lubo > Sent: Monday, November 28, 2016 1:43 PM > To: edk2-devel@lists.01.org > Cc: Ye, Ting ; Fu, Siyuan ; Wu, > Jiaxin > Subject: [edk2] [patch] ShellPkg: Add error prompt message in Ifconfig6 > command. >=20 > It should display error prompt message when Ifconfig6 can > not configure correctly. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Zhang Lubo > Cc: Ye Ting > Cc: Fu Siyuan > Cc: Wu Jiaxin > --- > ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c | 15 > +++++++++++++++ > .../UefiShellNetwork2CommandsLib.uni | 9 +++++++++ > 2 files changed, 24 insertions(+) >=20 > diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c > index 32dd284..fb308cc 100644 > --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c > +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c > @@ -1315,10 +1315,24 @@ IfConfig6SetInterfaceInfo ( > goto ON_EXIT; > } >=20 > VarArg=3D VarArg->Next; >=20 > + if (StrCmp (VarArg->Arg, L"host") =3D=3D 0) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_IFCONFIG6_ERR_INVALID_IP_CONFIG), gShellNetwork2HiiHandle, Status); > + ShellStatus =3D EFI_INVALID_PARAMETER; > + goto ON_EXIT; > + } else if (StrCmp (VarArg->Arg, L"gw") =3D=3D 0) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_IFCONFIG6_ERR_INVALID_GW_CONFIG), gShellNetwork2HiiHandle, Status); > + ShellStatus =3D EFI_INVALID_PARAMETER; > + goto ON_EXIT; > + } else if (StrCmp (VarArg->Arg, L"dns") =3D=3D 0) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG), gShellNetwork2HiiHandle, Status); > + ShellStatus =3D EFI_INVALID_PARAMETER; > + goto ON_EXIT; > + } > + > } else if (StrCmp (VarArg->Arg, L"man") =3D=3D 0) { > // > // Set manual config policy. > // > Policy =3D Ip6ConfigPolicyManual; > @@ -1509,10 +1523,11 @@ IfConfig6SetInterfaceInfo ( > CfgAddr > ); >=20 > if (EFI_ERROR (Status)) { > ShellStatus =3D SHELL_ACCESS_DENIED; > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_IFCONFIG6_ERR_MAN_GW), gShellNetwork2HiiHandle, Status); > goto ON_EXIT; > } >=20 > } else if (StrCmp (VarArg->Arg, L"dns") =3D=3D 0) { > // > diff --git > a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Commands= L > ib.uni > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Commands= L > ib.uni > index c3445bb..66ff05c 100644 > --- > a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Commands= L > ib.uni > +++ > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Commands= L > ib.uni > @@ -75,10 +75,19 @@ > #string STR_IFCONFIG6_ERR_LACK_ARGUMENTS #language en-US "Lack > arguments. Bad command %H%s%N is skipped.\r\n" > "Hint: > Please type 'IfConfig6 -?' for help info.\r\n" > #string STR_IFCONFIG6_ERR_LACK_OPTION #language en-US "Lack > options.\r\n" > "Hint: > Please type 'IfConfig6 -?' for help info.\r\n" > #string STR_IFCONFIG6_ERR_MAN_HOST #language en-US "Manua= l > address configuration failed. Please retry.\r\n" > + > +#string STR_IFCONFIG6_ERR_MAN_GW #language en-US "Getwa= y > address configuration failed. Please check the argument.\r\n" > + > +#string STR_IFCONFIG6_ERR_INVALID_IP_CONFIG #language en-US "Don't > support to change the IP address manual if the policy is set to auto. Set > IP address fail.\r\n" > + > +#string STR_IFCONFIG6_ERR_INVALID_GW_CONFIG #language en-US "Don't > support to change the IP address manual if the policy is set to auto. Set > Getway fail.\r\n" > + > +#string STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG #language en-US "Don't > support to change the IP address manual if the policy is set to auto. Set > DNS fail.\r\n" > + > #string STR_IFCONFIG6_ERR_DUPLICATE_COMMAND #language en-US > "Duplicate commands. Bad command %H%s%N is skipped.\r\n" > "Hint: > Please type 'IfConfig6 -?' for help info.\r\n" > #string STR_IFCONFIG6_ERR_CONFLICT_COMMAND #language en-US > "Conflict commands. Bad command %H%s%N is skipped.\r\n" > "Hint: > Please type 'IfConfig6 -?' for help info.\r\n" > #string STR_IFCONFIG6_ERR_UNKNOWN_COMMAND #language en-US > "Unknown commands. Bad command %H%s%N is skipped.\r\n" > -- > 1.9.5.msysgit.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel