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.zhang@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed by : Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Hegde Nagaraj P <nagaraj-p.hegde@hpe.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni
index 76b61882b1cf012f4f731f137a61b9f97105b8f5..4566cd110e8c29a615fde85e908e62f21ec679e7 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.uni
@@ -61,7 +61,7 @@
 #string STR_PING_RTT                 #language en-US "\nRtt(round trip time) min=%d~%dms max=%d~%dms avg=%d~%dms\r\n"\r
 \r
 #string STR_IFCONFIG_UNSUPPORTED_OPTION       #language en-US    "The option '%H%s%N' is unsupported now.\n"\r
-#string STR_IFCONFIG_LACK_OPTION              #language en-US    "Flags lack.\n"\r
+#string STR_IFCONFIG_LACK_OPTION              #language en-US    "Flags lack. Please type 'ifConfig -?' for help info.\n"\r
 #string STR_IFCONFIG_LACK_INTERFACE           #language en-US    "Lack interface name.\n"\r
 #string STR_IFCONFIG_LACK_COMMAND             #language en-US    "Lack interface config option.\n"\r
 #string STR_IFCONFIG_INVALID_INTERFACE        #language en-US    "Invalid interface name.\n"\r

diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
index 32dd2845fc3811b5662b71d4ea2056145c69e04c..fb308cc3b6c1a1bb618d5cff5c1878eac42cbe93 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
+++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
@@ -1317,6 +1317,20 @@ IfConfig6SetInterfaceInfo (
 \r
       VarArg= VarArg->Next;\r
 \r
+      if (StrCmp (VarArg->Arg, L"host") == 0) {\r
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_INVALID_IP_CONFIG), gShellNetwork2HiiHandle, Status);\r
+        ShellStatus = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      } else if (StrCmp (VarArg->Arg, L"gw") == 0) {\r
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_INVALID_GW_CONFIG), gShellNetwork2HiiHandle, Status);\r
+        ShellStatus = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      } else if (StrCmp (VarArg->Arg, L"dns") == 0) {\r
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG), gShellNetwork2HiiHandle, Status);\r
+        ShellStatus = EFI_INVALID_PARAMETER;\r
+        goto ON_EXIT;\r
+      }\r
+\r
     } else if (StrCmp (VarArg->Arg, L"man") == 0) {\r
       //\r
       // Set manual config policy.\r
@@ -1511,6 +1525,7 @@ IfConfig6SetInterfaceInfo (
 \r
       if (EFI_ERROR (Status)) {\r
         ShellStatus = SHELL_ACCESS_DENIED;\r
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_MAN_GW), gShellNetwork2HiiHandle, Status);\r
         goto ON_EXIT;\r
       }\r
 \r

diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.uni b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.uni
index c3445bbf1cfe67d328d3aad6256158bdfb297dfc..5c0fef0ff76f3e2818f661b47f3b582b48c7aab8 100644 (file)
--- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.uni
+++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.uni
@@ -77,6 +77,15 @@
 #string STR_IFCONFIG6_ERR_LACK_OPTION          #language en-US    "Lack options.\r\n"\r
                                                                   "Hint: Please type 'IfConfig6 -?' for help info.\r\n"\r
 #string STR_IFCONFIG6_ERR_MAN_HOST             #language en-US    "Manual address configuration failed. Please retry.\r\n"\r
+\r
+#string STR_IFCONFIG6_ERR_MAN_GW               #language en-US    "Gateway address configuration failed. Please check the argument.\r\n"\r
+\r
+#string STR_IFCONFIG6_ERR_INVALID_IP_CONFIG    #language en-US    "The IP address is not configurable when the policy is Ip6ConfigPolicyAutomatic.\r\n"\r
+\r
+#string STR_IFCONFIG6_ERR_INVALID_GW_CONFIG    #language en-US    "The gateway address is not configurable when the policy is Ip6ConfigPolicyAutomatic.\r\n"\r
+\r
+#string STR_IFCONFIG6_ERR_INVALID_DNS_CONFIG   #language en-US    "The DNS server address is not configurable when the policy is Ip6ConfigPolicyAutomatic.\r\n"\r
+\r
 #string STR_IFCONFIG6_ERR_DUPLICATE_COMMAND    #language en-US    "Duplicate commands. Bad command %H%s%N is skipped.\r\n"\r
                                                                   "Hint: Please type 'IfConfig6 -?' for help info.\r\n"\r
 #string STR_IFCONFIG6_ERR_CONFLICT_COMMAND     #language en-US    "Conflict commands. Bad command %H%s%N is skipped.\r\n"\r