Reviewed by : Wu Jiaxin <jiaxin...@intel.com>
> -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Zhang Lubo > Sent: Tuesday, November 29, 2016 10:58 AM > To: edk2-devel@lists.01.org > Cc: Ye, Ting <ting...@intel.com>; Fu, Siyuan <siyuan...@intel.com>; Wu, > Jiaxin <jiaxin...@intel.com> > Subject: [edk2] [PATCH v2] ShellPkg: Add error prompt message in Ifconfig6 > command. > > v2: update the prompt message more readable. > > It should display error prompt message when Ifconfig6 can not configure > correctly. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Zhang Lubo <lubo.zh...@intel.com> > Cc: Ye Ting <ting...@intel.com> > Cc: Fu Siyuan <siyuan...@intel.com> > Cc: Wu Jiaxin <jiaxin...@intel.com> > --- > ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c | 15 > +++++++++++++++ > .../UefiShellNetwork2CommandsLib.uni | 9 +++++++++ > 2 files changed, 24 insertions(+) > > 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; > } > > VarArg= VarArg->Next; > > + if (StrCmp (VarArg->Arg, L"host") == 0) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_IFCONFIG6_ERR_INVALID_IP_CONFIG), gShellNetwork2HiiHandle, > Status); > + ShellStatus = EFI_INVALID_PARAMETER; > + goto ON_EXIT; > + } else if (StrCmp (VarArg->Arg, L"gw") == 0) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_IFCONFIG6_ERR_INVALID_GW_CONFIG), gShellNetwork2HiiHandle, > Status); > + ShellStatus = EFI_INVALID_PARAMETER; > + goto ON_EXIT; > + } else if (StrCmp (VarArg->Arg, L"dns") == 0) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG), gShellNetwork2HiiHandle, > Status); > + ShellStatus = EFI_INVALID_PARAMETER; > + goto ON_EXIT; > + } > + > } else if (StrCmp (VarArg->Arg, L"man") == 0) { > // > // Set manual config policy. > // > Policy = Ip6ConfigPolicyManual; > @@ -1509,10 +1523,11 @@ IfConfig6SetInterfaceInfo ( > CfgAddr > ); > > if (EFI_ERROR (Status)) { > ShellStatus = SHELL_ACCESS_DENIED; > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > + (STR_IFCONFIG6_ERR_MAN_GW), gShellNetwork2HiiHandle, Status); > goto ON_EXIT; > } > > } else if (StrCmp (VarArg->Arg, L"dns") == 0) { > // > diff --git > a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > mandsLib.uni > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > mandsLib.uni > index c3445bb..79af7f9 100644 > --- > a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > mandsLib.uni > +++ > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > +++ mandsLib.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 "Manual > address configuration failed. Please retry.\r\n" > + > +#string STR_IFCONFIG6_ERR_MAN_GW #language en-US "Getway > address configuration failed. Please check the argument.\r\n" > + > +#string STR_IFCONFIG6_ERR_INVALID_IP_CONFIG #language en-US > "The IP address is not configurable when the policy is > Ip6ConfigPolicyAutomatic.\r\n" > + > +#string STR_IFCONFIG6_ERR_INVALID_GW_CONFIG #language en-US > "The gateway address is not configurable when the policy is > Ip6ConfigPolicyAutomatic.\r\n" > + > +#string STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG #language en-US > "The DNS server address is not configurable when the policy is > Ip6ConfigPolicyAutomatic.\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 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
