Verified ChildHandle, and correct the name for a child.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / ComponentName.c

diff --git a/NetworkPkg/IScsiDxe/ComponentName.c b/NetworkPkg/IScsiDxe/ComponentName.c
index e4e28e8961efdacace45bb37ee070e67d6439c2b..46d89d855ca38bb5b53017a2e682bf3fa78d10d2 100644 (file)
--- a/NetworkPkg/IScsiDxe/ComponentName.c
+++ b/NetworkPkg/IScsiDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file\r
   UEFI Component Name(2) protocol implementation for iSCSI.\r
 \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -43,6 +43,8 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE     mIScsiDriverNameTable
   }\r
 };\r
 \r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_UNICODE_STRING_TABLE  *gIScsiControllerNameTable = NULL;\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the driver.\r
 \r
@@ -99,6 +101,68 @@ IScsiComponentNameGetDriverName (
            );\r
 }\r
 \r
+/**\r
+  Update the component name for the iSCSI instance.\r
+\r
+  @param[in]  IScsiExtScsiPassThru  A pointer to the EFI_EXT_SCSI_PASS_THRU_PROTOCOL instance.\r
+  @param[in]  Ipv6Flag              TRUE if IP6 network stack is used.\r
+  \r
+  @retval EFI_SUCCESS               Update the ControllerNameTable of this instance successfully.\r
+  @retval EFI_INVALID_PARAMETER     The input parameter is invalid.\r
+  @retval EFI_UNSUPPORTED           Can't get the corresponding NIC info from the Controller handle.\r
+  \r
+**/\r
+EFI_STATUS\r
+UpdateName (\r
+  IN   EFI_EXT_SCSI_PASS_THRU_PROTOCOL *IScsiExtScsiPassThru,\r
+  IN   BOOLEAN     Ipv6Flag\r
+  )\r
+{\r
+  EFI_STATUS                       Status;\r
+  CHAR16                           HandleName[80];\r
+  ISCSI_DRIVER_DATA                *Private;\r
+  UINT8                            NicIndex;\r
+\r
+  if (IScsiExtScsiPassThru == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+  \r
+  Private  = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (IScsiExtScsiPassThru);\r
+  NicIndex = Private->Session->ConfigData->NicIndex;\r
+    \r
+  UnicodeSPrint (\r
+    HandleName,\r
+    sizeof (HandleName),\r
+    L"iSCSI (%s, NicIndex=%d)",\r
+    Ipv6Flag ? L"IPv6" : L"IPv4",\r
+    NicIndex\r
+  );\r
+\r
+  if (gIScsiControllerNameTable != NULL) {\r
+    FreeUnicodeStringTable (gIScsiControllerNameTable);\r
+    gIScsiControllerNameTable = NULL;\r
+  }\r
+\r
+  Status = AddUnicodeString2 (\r
+             "eng",\r
+             gIScsiComponentName.SupportedLanguages,\r
+             &gIScsiControllerNameTable,\r
+             HandleName,\r
+             TRUE\r
+             );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  return AddUnicodeString2 (\r
+           "en",\r
+           gIScsiComponentName2.SupportedLanguages,\r
+           &gIScsiControllerNameTable,\r
+           HandleName,\r
+           FALSE\r
+           );\r
+}\r
+\r
 /**\r
   Retrieves a Unicode string that is the user readable name of the controller\r
   that is being managed by a driver.\r
@@ -177,5 +241,104 @@ IScsiComponentNameGetControllerName (
   OUT CHAR16                        **ControllerName\r
   )\r
 {\r
-  return EFI_UNSUPPORTED;\r
+  EFI_STATUS                      Status;\r
+  \r
+  EFI_HANDLE                      IScsiController;\r
+  BOOLEAN                         Ipv6Flag;\r
+  EFI_GUID                        *IScsiPrivateGuid;\r
+  ISCSI_PRIVATE_PROTOCOL          *IScsiIdentifier;\r
+  \r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *IScsiExtScsiPassThru;\r
+  \r
+  if (ControllerHandle == NULL) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
+  //\r
+  // Get the handle of the controller we are controling.\r
+  //\r
+  IScsiController = NetLibGetNicHandle (ControllerHandle, &gEfiTcp4ProtocolGuid);\r
+  if (IScsiController != NULL) {\r
+    IScsiPrivateGuid = &gIScsiV4PrivateGuid;\r
+    Ipv6Flag = FALSE;\r
+  } else {\r
+    IScsiController = NetLibGetNicHandle (ControllerHandle, &gEfiTcp6ProtocolGuid);\r
+    if (IScsiController != NULL) {\r
+      IScsiPrivateGuid = &gIScsiV6PrivateGuid;\r
+      Ipv6Flag = TRUE;\r
+    } else {\r
+      return EFI_UNSUPPORTED;\r
+    }\r
+  }\r
+\r
+  Status = gBS->OpenProtocol (\r
+                  IScsiController,\r
+                  IScsiPrivateGuid,\r
+                  (VOID **) &IScsiIdentifier,\r
+                  NULL,\r
+                  NULL,\r
+                  EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                  );\r
+  if (EFI_ERROR (Status)) {\r
+    return Status;\r
+  }\r
+\r
+  if(ChildHandle != NULL) {\r
+    if(!Ipv6Flag) {\r
+      //\r
+      // Make sure this driver produced ChildHandle\r
+      //\r
+      Status = EfiTestChildHandle (\r
+                 ControllerHandle,\r
+                 ChildHandle,\r
+                 &gEfiTcp4ProtocolGuid\r
+                 );\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+    } else {\r
+      //\r
+      // Make sure this driver produced ChildHandle\r
+      //\r
+      Status = EfiTestChildHandle (\r
+                 ControllerHandle,\r
+                 ChildHandle,\r
+                 &gEfiTcp6ProtocolGuid\r
+                 );\r
+      if (EFI_ERROR (Status)) {\r
+        return Status;\r
+      }\r
+    }\r
+    \r
+    //\r
+    // Retrieve an instance of a produced protocol from ChildHandle\r
+    //\r
+    Status = gBS->OpenProtocol (\r
+                    ChildHandle,\r
+                    &gEfiExtScsiPassThruProtocolGuid,\r
+                   (VOID **)&IScsiExtScsiPassThru,\r
+                    NULL,\r
+                    NULL,\r
+                    EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+                    );\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+    \r
+    //\r
+    // Update the component name for this child handle.\r
+    //\r
+    Status = UpdateName (IScsiExtScsiPassThru, Ipv6Flag);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+  }\r
+\r
+  return LookupUnicodeString2 (\r
+           Language,\r
+           This->SupportedLanguages,\r
+           gIScsiControllerNameTable,\r
+           ControllerName,\r
+           (BOOLEAN)(This == &gIScsiComponentName)\r
+           );\r
 }\r