Update HiiConfigAccess.ExtractConfig interface to support NULL request string and ConfigHdr request string.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10180 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 208 insertions, 18 deletions

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 35214f2ce9..32b43f6c36 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -1,7 +1,7 @@
 /** @file

   Helper functions for configuring or getting the parameters relating to iSCSI.

 

-Copyright (c) 2004 - 2009, Intel Corporation.<BR>

+Copyright (c) 2004 - 2010, Intel Corporation.<BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -360,11 +360,24 @@ IScsiFormExtractConfig (
   ISCSI_CONFIG_IFR_NVDATA          *IfrNvData;

   ISCSI_FORM_CALLBACK_INFO         *Private;

   EFI_HII_CONFIG_ROUTING_PROTOCOL  *HiiConfigRouting;

+  EFI_STRING                       ConfigRequestHdr;

+  EFI_STRING                       ConfigRequest;

+  BOOLEAN                          AllocatedRequest;

+  UINTN                            Size;

 

-  if (Request == NULL || Progress == NULL || Results == NULL) {

+  if (Progress == NULL || Results == NULL) {

     return EFI_INVALID_PARAMETER;

   }

+

   *Progress = Request;

+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVendorGuid, mVendorStorageName)) {

+    return EFI_NOT_FOUND;

+  }

+

+  ConfigRequestHdr = NULL;

+  ConfigRequest    = NULL;

+  AllocatedRequest = FALSE;

+  Size             = 0;

 

   if (!mIScsiDeviceListUpdated) {

     //

@@ -394,15 +407,47 @@ IScsiFormExtractConfig (
   //

   HiiConfigRouting = Private->ConfigRouting;

   BufferSize = sizeof (ISCSI_CONFIG_IFR_NVDATA);

+  ConfigRequest = Request;

+  if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {

+    //

+    // Request has no request element, construct full request string.

+    // Allocate and fill a buffer large enough to hold the <ConfigHdr> template

+    // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator

+    //

+    ConfigRequestHdr = HiiConstructConfigHdr (&mVendorGuid, mVendorStorageName, Private->DriverHandle);

+    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);

+    ConfigRequest = AllocateZeroPool (Size);

+    ASSERT (ConfigRequest != NULL);

+    AllocatedRequest = TRUE;

+    UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);

+    FreePool (ConfigRequestHdr);

+  }

   Status = HiiConfigRouting->BlockToConfig (

                                HiiConfigRouting,

-                               Request,

+                               ConfigRequest,

                                (UINT8 *) IfrNvData,

                                BufferSize,

                                Results,

                                Progress

                                );

   FreePool (IfrNvData);

+  //

+  // Free the allocated config request string.

+  //

+  if (AllocatedRequest) {

+    FreePool (ConfigRequest);

+    ConfigRequest = NULL;

+  }

+

+  //

+  // Set Progress string to the original request string.

+  //

+  if (Request == NULL) {

+    *Progress = NULL;

+  } else if (StrStr (Request, L"OFFSET") == NULL) {

+    *Progress = Request + StrLen (Request);

+  }

+

   return Status;

 }

 

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
index 9417a44c25..f5a721b57a 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigNv.c
@@ -342,19 +342,32 @@ Ip4DeviceExtractConfig (
   NIC_IP4_CONFIG_INFO              *IfrDeviceNvData;

   IP4_CONFIG_INSTANCE              *Ip4ConfigInstance;

   IP4_CONFIG_IFR_NVDATA            *IfrFormNvData;

+  EFI_STRING                       ConfigRequestHdr;

+  EFI_STRING                       ConfigRequest;

+  EFI_STRING                       DeviceResult;

+  EFI_STRING                       FormResult;

+  CHAR16                           *StrPointer;

+  BOOLEAN                          AllocatedRequest;

+  UINTN                            Size;

+  UINTN                            BufferSize;

 

-  if (Request == NULL || Progress == NULL || Results == NULL) {

+  if (Progress == NULL || Results == NULL) {

     return EFI_INVALID_PARAMETER;

   }

 

-  *Progress = Request;

-

+  *Progress     = Request;

+  Size          = 0;

+  DeviceResult  = NULL;

+  FormResult    = NULL;

+  ConfigRequest = NULL;

+  Status        = EFI_SUCCESS;

+  AllocatedRequest  = FALSE;

   Ip4ConfigInstance = IP4_CONFIG_INSTANCE_FROM_CONFIG_ACCESS (This);

 

   //

   // Check Request data in <ConfigHdr>.

   //

-  if (HiiIsConfigHdrMatch (Request, &gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {

+  if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {

     IfrDeviceNvData = AllocateZeroPool (NIC_ITEM_CONFIG_SIZE);

     if (IfrDeviceNvData == NULL) {

       return EFI_OUT_OF_RESOURCES;

@@ -367,21 +380,50 @@ Ip4DeviceExtractConfig (
       return EFI_NOT_FOUND;

     }

 

+    ConfigRequest = Request;

+    if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {

+      //

+      // Request has no request element, construct full request string.

+      // Allocate and fill a buffer large enough to hold the <ConfigHdr> template

+      // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator

+      //

+      ConfigRequestHdr = HiiConstructConfigHdr (&gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE, Ip4ConfigInstance->ChildHandle);

+      Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);

+      ConfigRequest = AllocateZeroPool (Size);

+      ASSERT (ConfigRequest != NULL);

+      AllocatedRequest = TRUE;

+      BufferSize = NIC_ITEM_CONFIG_SIZE;

+      UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);

+      FreePool (ConfigRequestHdr);

+    }

+

     //

     // Convert buffer data to <ConfigResp> by helper function BlockToConfig()

     //

     Status = gHiiConfigRouting->BlockToConfig (

                                   gHiiConfigRouting,

-                                  Request,

+                                  ConfigRequest,

                                   (UINT8 *) IfrDeviceNvData,

                                   NIC_ITEM_CONFIG_SIZE,

-                                  Results,

+                                  &DeviceResult,

                                   Progress

                                   );

 

     FreePool (IfrDeviceNvData);

+    //

+    // Free the allocated config request string.

+    //

+    if (AllocatedRequest) {

+      FreePool (ConfigRequest);

+      ConfigRequest = NULL;

+    }

 

-  } else if (HiiIsConfigHdrMatch (Request, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {

+    if (EFI_ERROR (Status)) {

+      goto Failure;

+    }

+  } 

+  

+  if ((Request == NULL) || HiiIsConfigHdrMatch (Request, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {

 

     IfrFormNvData = AllocateZeroPool (NIC_ITEM_CONFIG_SIZE);

     if (IfrFormNvData == NULL) {

@@ -390,25 +432,80 @@ Ip4DeviceExtractConfig (
 

     Ip4ConfigConvertDeviceConfigDataToIfrNvData (Ip4ConfigInstance, IfrFormNvData);

 

+    ConfigRequest = Request;

+    if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {

+      //

+      // Request has no request element, construct full request string.

+      // Allocate and fill a buffer large enough to hold the <ConfigHdr> template

+      // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator

+      //

+      ConfigRequestHdr = HiiConstructConfigHdr (&mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE, Ip4ConfigInstance->ChildHandle);

+      Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);

+      ConfigRequest = AllocateZeroPool (Size);

+      ASSERT (ConfigRequest != NULL);

+      AllocatedRequest = TRUE;

+      BufferSize = sizeof (IP4_CONFIG_IFR_NVDATA);

+      UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);

+      FreePool (ConfigRequestHdr);

+    }

+ 

     //

     // Convert buffer data to <ConfigResp> by helper function BlockToConfig()

     //

     Status = gHiiConfigRouting->BlockToConfig (

                                   gHiiConfigRouting,

-                                  Request,

+                                  ConfigRequest,

                                   (UINT8 *) IfrFormNvData,

                                   sizeof (IP4_CONFIG_IFR_NVDATA),

-                                  Results,

+                                  &FormResult,

                                   Progress

                                   );

 

     FreePool (IfrFormNvData);

+    //

+    // Free the allocated config request string.

+    //

+    if (AllocatedRequest) {

+      FreePool (ConfigRequest);

+      ConfigRequest = NULL;

+    }

+

+    if (EFI_ERROR (Status)) {

+      goto Failure;

+    }

+  }

 

+  if (Request == NULL) {

+    Size = StrLen (DeviceResult);

+    Size = Size + 1;

+    Size = Size + StrLen (FormResult) + 1;

+    *Results = AllocateZeroPool (Size * sizeof (CHAR16));

+    ASSERT (*Results != NULL);

+    StrPointer  = *Results;

+    StrCpy (StrPointer, DeviceResult);

+    StrPointer  = StrPointer + StrLen (StrPointer);

+    *StrPointer = L'&';

+    StrCpy (StrPointer + 1, FormResult);

+    FreePool (DeviceResult);

+    FreePool (FormResult);

+  } else if (HiiIsConfigHdrMatch (ConfigRequest, &gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {

+    *Results = DeviceResult;

+  } else if (HiiIsConfigHdrMatch (ConfigRequest, &mNicIp4ConfigNvDataGuid, EFI_NIC_IP4_CONFIG_VARIABLE)) {

+    *Results = FormResult;

   } else {

     return EFI_NOT_FOUND;

   }

 

-

+Failure:

+  //

+  // Set Progress string to the original request string.

+  //

+  if (Request == NULL) {

+    *Progress = NULL;

+  } else if (StrStr (Request, L"OFFSET") == NULL) {

+    *Progress = Request + StrLen (Request);

+  }

+  

   return Status;

 }

 

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
index b11e7c96d5..656291618f 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
+++ b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigImpl.c
@@ -75,14 +75,29 @@ VlanExtractConfig (
        OUT EFI_STRING                            *Results

   )

 {

-  EFI_STATUS          Status;

-  UINTN               BufferSize;

-  VLAN_CONFIGURATION  Configuration;

+  EFI_STATUS                 Status;

+  UINTN                      BufferSize;

+  VLAN_CONFIGURATION         Configuration;

+  VLAN_CONFIG_PRIVATE_DATA  *PrivateData;

+  EFI_STRING                 ConfigRequestHdr;

+  EFI_STRING                 ConfigRequest;

+  BOOLEAN                    AllocatedRequest;

+  UINTN                      Size;

 

-  if (Request == NULL) {

+  if (Progress == NULL || Results == NULL) {

     return EFI_INVALID_PARAMETER;

   }

 

+  *Progress = Request;

+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mVlanFormSetGuid, mVlanStorageName)) {

+    return EFI_NOT_FOUND;

+  }

+

+  ConfigRequestHdr = NULL;

+  ConfigRequest    = NULL;

+  AllocatedRequest = FALSE;

+  Size             = 0;

+

   //

   // Retrieve the pointer to the UEFI HII Config Routing Protocol

   //

@@ -94,16 +109,49 @@ VlanExtractConfig (
   //

   // Convert buffer data to <ConfigResp> by helper function BlockToConfig()

   //

+  PrivateData = VLAN_CONFIG_PRIVATE_DATA_FROM_THIS (This);

   ZeroMem (&Configuration, sizeof (VLAN_CONFIGURATION));

   BufferSize = sizeof (VLAN_CONFIG_PRIVATE_DATA);

+  ConfigRequest = Request;

+  if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {

+    //

+    // Request has no request element, construct full request string.

+    // Allocate and fill a buffer large enough to hold the <ConfigHdr> template

+    // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator

+    //

+    ConfigRequestHdr = HiiConstructConfigHdr (&mVlanFormSetGuid, mVlanStorageName, PrivateData->DriverHandle);

+    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);

+    ConfigRequest = AllocateZeroPool (Size);

+    ASSERT (ConfigRequest != NULL);

+    AllocatedRequest = TRUE;

+    UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);

+    FreePool (ConfigRequestHdr);

+  }

+

   Status = mHiiConfigRouting->BlockToConfig (

                                 mHiiConfigRouting,

-                                Request,

+                                ConfigRequest,

                                 (UINT8 *) &Configuration,

                                 BufferSize,

                                 Results,

                                 Progress

                                 );

+  //

+  // Free the allocated config request string.

+  //

+  if (AllocatedRequest) {

+    FreePool (ConfigRequest);

+    ConfigRequest = NULL;

+  }

+  //

+  // Set Progress string to the original request string.

+  //

+  if (Request == NULL) {

+    *Progress = NULL;

+  } else if (StrStr (Request, L"OFFSET") == NULL) {

+    *Progress = Request + StrLen (Request);

+  }

+

   return Status;

 }