X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellNetwork1CommandsLib%2FIfconfig.c;fp=ShellPkg%2FLibrary%2FUefiShellNetwork1CommandsLib%2FIfconfig.c;h=f8dbc88cf84273fc96d896016c1f0fe721c17ad5;hp=fb6f57518422576e1d349fc3450906c5e6602333;hb=d1baf355b1e5d3363ef7b8abcabffe08af43b8e5;hpb=2d675c1c8c9e43195bf32d5a34a54f962f35afca

diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
index fb6f575184..f8dbc88cf8 100644
--- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
+++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ifconfig.c
@@ -828,6 +828,7 @@ IfConfigClearInterfaceInfo (
                             &Policy
                             );
     if (EFI_ERROR (Status)) {
+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");
       ShellStatus = SHELL_ACCESS_DENIED;
       break;
     }
@@ -904,6 +905,7 @@ IfConfigSetInterfaceInfo (
                   &TimeOutEvt
                   );
   if (EFI_ERROR (Status)) {
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");
     ShellStatus = SHELL_ACCESS_DENIED;
     goto ON_EXIT;
   }
@@ -916,6 +918,7 @@ IfConfigSetInterfaceInfo (
                   &MappedEvt
                   );
   if (EFI_ERROR (Status)) {
+    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");
     ShellStatus = SHELL_ACCESS_DENIED;
     goto ON_EXIT;
   }
@@ -974,6 +977,7 @@ IfConfigSetInterfaceInfo (
       if (IfCb->Policy == Ip4Config2PolicyDhcp) {
         Status = IfConfigStartIp4 (IfCb->NicHandle, gImageHandle);
         if (EFI_ERROR(Status)) {
+          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");
           ShellStatus = SHELL_ACCESS_DENIED;
           goto ON_EXIT;
         }
@@ -989,6 +993,7 @@ IfConfigSetInterfaceInfo (
                                 &Policy
                                 );
         if (EFI_ERROR(Status)) {
+          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");
           ShellStatus = SHELL_ACCESS_DENIED;
           goto ON_EXIT;
         }
@@ -997,23 +1002,13 @@ IfConfigSetInterfaceInfo (
       VarArg= VarArg->Next;    
 
     } else if (StrCmp (VarArg->Arg, L"static") == 0) {
-      //
-      // Set manual config policy.
-      //
-      Policy = Ip4Config2PolicyStatic;
-      Status = IfCb->IfCfg->SetData (
-                              IfCb->IfCfg,
-                              Ip4Config2DataTypePolicy,
-                              sizeof (EFI_IP4_CONFIG2_POLICY),
-                              &Policy
-                              );
-      if (EFI_ERROR(Status)) {
-        ShellStatus = SHELL_ACCESS_DENIED;
+      VarArg= VarArg->Next;
+      if (VarArg == NULL) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_COMMAND), gShellNetwork1HiiHandle);
+        ShellStatus = SHELL_INVALID_PARAMETER;
         goto ON_EXIT;
       }
 
-      VarArg= VarArg->Next;   
-
       ZeroMem (&ManualAddress, sizeof (ManualAddress));
     
       //
@@ -1021,6 +1016,7 @@ IfConfigSetInterfaceInfo (
       //
       Status = NetLibStrToIp4 (VarArg->Arg, &ManualAddress.Address);
       if (EFI_ERROR(Status)) {
+        ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, VarArg->Arg);
         ShellStatus = SHELL_INVALID_PARAMETER;
         goto ON_EXIT;
       }
@@ -1029,8 +1025,15 @@ IfConfigSetInterfaceInfo (
       // Get subnetmask.
       //    
       VarArg = VarArg->Next;
+      if (VarArg == NULL) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_COMMAND), gShellNetwork1HiiHandle);
+        ShellStatus = SHELL_INVALID_PARAMETER;
+        goto ON_EXIT;
+      }
+      
       Status = NetLibStrToIp4 (VarArg->Arg, &ManualAddress.SubnetMask);
       if (EFI_ERROR(Status)) {
+        ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, VarArg->Arg);
         ShellStatus = SHELL_INVALID_PARAMETER;
         goto ON_EXIT;
       }
@@ -1039,12 +1042,38 @@ IfConfigSetInterfaceInfo (
       // Get gateway.
       //
       VarArg = VarArg->Next;
+      if (VarArg == NULL) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_LACK_COMMAND), gShellNetwork1HiiHandle);
+        ShellStatus = SHELL_INVALID_PARAMETER;
+        goto ON_EXIT;
+      }
+      
       Status = NetLibStrToIp4 (VarArg->Arg, &Gateway);
       if (EFI_ERROR(Status)) {
+        ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, VarArg->Arg);
         ShellStatus = SHELL_INVALID_PARAMETER;
         goto ON_EXIT;
       }
+
+      //
+      // Set manual config policy.
+      //
+      Policy = Ip4Config2PolicyStatic;
+      Status = IfCb->IfCfg->SetData (
+                              IfCb->IfCfg,
+                              Ip4Config2DataTypePolicy,
+                              sizeof (EFI_IP4_CONFIG2_POLICY),
+                              &Policy
+                              );
+      if (EFI_ERROR(Status)) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");
+        ShellStatus = SHELL_ACCESS_DENIED;
+        goto ON_EXIT;
+      }
       
+      //
+      // Set Manual Address.
+      //
       IsAddressOk = FALSE;
 
       Status = IfCb->IfCfg->RegisterDataNotify (
@@ -1053,6 +1082,7 @@ IfConfigSetInterfaceInfo (
                               MappedEvt
                               );
       if (EFI_ERROR (Status)) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_SET_ADDR_FAILED), gShellNetwork1HiiHandle, Status);
         ShellStatus = SHELL_ACCESS_DENIED;
         goto ON_EXIT;
       }
@@ -1101,6 +1131,7 @@ IfConfigSetInterfaceInfo (
                               &Gateway
                               );
       if (EFI_ERROR (Status)) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG_SET_ADDR_FAILED), gShellNetwork1HiiHandle, Status);
         ShellStatus = SHELL_ACCESS_DENIED;
         goto ON_EXIT;
       }
@@ -1126,6 +1157,7 @@ IfConfigSetInterfaceInfo (
       while (Tmp != NULL) {
         Status = NetLibStrToIp4 (Tmp->Arg, Dns + Index);
         if (EFI_ERROR(Status)) {
+          ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_INVALID_IPADDRESS), gShellNetwork1HiiHandle, Tmp->Arg);
           ShellStatus = SHELL_INVALID_PARAMETER;
           goto ON_EXIT;
         }
@@ -1147,6 +1179,7 @@ IfConfigSetInterfaceInfo (
                               Dns
                               );
       if (EFI_ERROR (Status)) {
+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_ERR_AD), gShellNetwork1HiiHandle, L"ifconfig");
         ShellStatus = SHELL_ACCESS_DENIED;
         goto ON_EXIT;
       }