Changeset 77662 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c

Timestamp:

Mar 12, 2019 12:40:12 PM (6 years ago)

Author:

vboxsync

Message:

EFI: First step in UDK2018 merge. Does not build yet.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdeModulePkg/Library/DxeNetLib/DxeNetLib.c (modified) (85 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c

@@ -2 +2 @@
   Network library.
 
-Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
+(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -19 +20 @@
 #include <Protocol/ServiceBinding.h>
 #include <Protocol/SimpleNetwork.h>
+#include <Protocol/AdapterInformation.h>
 #include <Protocol/ManagedNetwork.h>
-#include <Protocol/HiiConfigRouting.h>
+#include <Protocol/Ip4Config2.h>
 #include <Protocol/ComponentName.h>
 #include <Protocol/ComponentName2.h>
-#include <Protocol/HiiConfigAccess.h>
-
-#include <Guid/NicIp4ConfigNvData.h>
+
 #include <Guid/SmBios.h>
 
@@ -36 +36 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DevicePathLib.h>
-#include <Library/HiiLib.h>
 #include <Library/PrintLib.h>
 #include <Library/UefiLib.h>
 
-#define NIC_ITEM_CONFIG_SIZE   sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE
+#define NIC_ITEM_CONFIG_SIZE   (sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE)
 #define DEFAULT_ZERO_START     ((UINTN) ~0)
 
@@ -200 +199 @@
   time it is called to avoid the problem if SNP is unloaded.
   This code snip is copied from MNP.
+  If Packet is NULL, then ASSERT().
 
   @param[in] Packet          The Syslog packet
@@ -220 +220 @@
   EFI_EVENT                   TimeoutEvent;
   UINT8                       *TxBuf;
+
+  ASSERT (Packet != NULL);
 
   Snp = SyslogLocateSnp ();
@@ -304 +306 @@
   and user's message.
 
-  @param[in]  Level     Syslog servity level
+  @param[in]  Level     Syslog severity level
   @param[in]  Module    The module that generates the log
   @param[in]  File      The file that contains the current log
@@ -312 +314 @@
   @param[out] Buf       The buffer to put the packet data
 
-  @return The length of the syslog packet built.
+  @return The length of the syslog packet built, 0 represents no packet is built.
 
 **/
@@ -326 +328 @@
   )
 {
+  EFI_STATUS                Status;
   ETHER_HEAD                *Ether;
   IP4_HEAD                  *Ip4;
@@ -381 +384 @@
   //
   Pri = ((NET_SYSLOG_FACILITY & 31) << 3) | (Level & 7);
-  gRT->GetTime (&Time, NULL);
-  ASSERT ((Time.Month <= 12) && (Time.Month >= 1));
+  Status = gRT->GetTime (&Time, NULL);
+  if (EFI_ERROR (Status)) {
+    return 0;
+  }
 
   //
@@ -399 +404 @@
                     Time.Second
                     );
-  Len--;
 
   Len += (UINT32) AsciiSPrint (
@@ -410 +414 @@
                     File
                     );
-  Len--;
+  Len ++;
 
   //
@@ -441 +445 @@
          )
 
+  If Format is NULL, then ASSERT().
+
   @param Format  The ASCII format string.
   @param ...     The variable length parameter whose format is determined
@@ -459 +465 @@
   CHAR8                     *Buf;
 
+  ASSERT (Format != NULL);
+
   Buf = (CHAR8 *) AllocatePool (NET_DEBUG_MSG_LEN);
 
@@ -478 +486 @@
   Because it isn't open the SNP BY_DRIVER, apply caution when using it.
 
-  @param Level    The servity level of the message.
+  @param Level    The severity level of the message.
   @param Module   The Moudle that generates the log.
   @param File     The file that contains the log.
@@ -485 +493 @@
 
   @retval EFI_INVALID_PARAMETER Any input parameter is invalid.
-  @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory for the packet
+  @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory for the packet.
+  @retval EFI_DEVICE_ERROR      Device error occurs.
   @retval EFI_SUCCESS           The log is discard because that it is more verbose
                                 than the mNetDebugLevelMax. Or, it has been sent out.
@@ -506 +515 @@
   // Check whether the message should be sent out
   //
-  if (Message == NULL) {
+  if (Message == NULL || File == NULL || Module == NULL) {
     return EFI_INVALID_PARAMETER;
   }
@@ -539 +548 @@
           Packet
           );
-
-  mSyslogPacketSeq++;
-  Status = SyslogSendPacket (Packet, Len);
+  if (Len == 0) {
+    Status = EFI_DEVICE_ERROR;
+  } else {
+    mSyslogPacketSeq++;
+    Status = SyslogSendPacket (Packet, Len);
+  }
+
   FreePool (Packet);
 
@@ -568 +581 @@
   INTN                      Index;
 
-  for (Index = 0; Index < IP4_MASK_NUM; Index++) {
+  for (Index = 0; Index <= IP4_MASK_MAX; Index++) {
     if (NetMask == gIp4AllMasks[Index]) {
       break;
@@ -582 +595 @@
   Return the class of the IP address, such as class A, B, C.
   Addr is in host byte order.
+
+  [ATTENTION]
+  Classful addressing (IP class A/B/C) has been deprecated according to RFC4632.
+  Caller of this function could only check the returned value against
+  IP4_ADDR_CLASSD (multicast) or IP4_ADDR_CLASSE (reserved) now.
 
   The address of class A  starts with 0.
@@ -631 +649 @@
 /**
   Check whether the IP is a valid unicast address according to
-  the netmask. If NetMask is zero, use the IP address's class to get the default mask.
-
-  If Ip is 0, IP is not a valid unicast address.
-  Class D address is used for multicasting and class E address is reserved for future. If Ip
-  belongs to class D or class E, IP is not a valid unicast address.
-  If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address.
+  the netmask.
+
+  ASSERT if NetMask is zero.
+
+  If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address,
+  except when the originator is one of the endpoints of a point-to-point link with a 31-bit
+  mask (RFC3021).
 
   @param[in]  Ip                    The IP to check against.
@@ -651 +670 @@
   )
 {
-  INTN                      Class;
-
-  Class = NetGetIpClass (Ip);
-
-  if ((Ip == 0) || (Class >= IP4_ADDR_CLASSD)) {
+  ASSERT (NetMask != 0);
+
+  if (Ip == 0 || IP4_IS_LOCAL_BROADCAST (Ip)) {
     return FALSE;
   }
 
-  if (NetMask == 0) {
-    NetMask = gIp4AllMasks[Class << 3];
-  }
-
-  if (((Ip &~NetMask) == ~NetMask) || ((Ip &~NetMask) == 0)) {
-    return FALSE;
+  if (NetGetMaskLength (NetMask) != 31) {
+    if (((Ip &~NetMask) == ~NetMask) || ((Ip &~NetMask) == 0)) {
+      return FALSE;
+    }
+  } else {
+    return TRUE;
   }
 
@@ -672 +689 @@
 /**
   Check whether the incoming IPv6 address is a valid unicast address.
+
+  ASSERT if Ip6 is NULL.
 
   If the address is a multicast address has binary 0xFF at the start, it is not
@@ -693 +712 @@
   UINT8 Index;
 
+  ASSERT (Ip6 != NULL);
+
   if (Ip6->Addr[0] == 0xFF) {
     return FALSE;
@@ -715 +736 @@
   Check whether the incoming Ipv6 address is the unspecified address or not.
 
+  ASSERT if Ip6 is NULL.
+
   @param[in] Ip6   - Ip6 address, in network order.
 
@@ -728 +751 @@
 {
   UINT8 Index;
+
+  ASSERT (Ip6 != NULL);
 
   for (Index = 0; Index < 16; Index++) {
@@ -741 +766 @@
   Check whether the incoming Ipv6 address is a link-local address.
 
+  ASSERT if Ip6 is NULL.
+
   @param[in] Ip6   - Ip6 address, in network order.
 
@@ -776 +803 @@
 /**
   Check whether the Ipv6 address1 and address2 are on the connected network.
+
+  ASSERT if Ip1 or Ip2 is NULL.
+  ASSERT if PrefixLength exceeds or equals to IP6_PREFIX_MAX.
 
   @param[in] Ip1          - Ip6 address1, in network order.
@@ -797 +827 @@
   UINT8 Mask;
 
-  ASSERT ((Ip1 != NULL) && (Ip2 != NULL) && (PrefixLength < IP6_PREFIX_NUM));
+  ASSERT ((Ip1 != NULL) && (Ip2 != NULL) && (PrefixLength < IP6_PREFIX_MAX));
 
   if (PrefixLength == 0) {
@@ -814 +844 @@
 
     ASSERT (Byte < 16);
+    if (Byte >= 16) {
+      return FALSE;
+    }
     if ((Ip1->Addr[Byte] & Mask) != (Ip2->Addr[Byte] & Mask)) {
       return FALSE;
@@ -825 +858 @@
 /**
   Switches the endianess of an IPv6 address
+
+  ASSERT if Ip6 is NULL.
 
   This function swaps the bytes in a 128-bit IPv6 address to switch the value
@@ -844 +879 @@
   UINT64 Low;
 
+  ASSERT (Ip6 != NULL);
+
   CopyMem (&High, Ip6, sizeof (UINT64));
   CopyMem (&Low, &Ip6->Addr[8], sizeof (UINT64));
@@ -857 +894 @@
 
 /**
-  Initialize a random seed using current time.
-
-  Get current time first. Then initialize a random seed based on some basic
-  mathematics operation on the hour, day, minute, second, nanosecond and year
-  of the current time.
+  Initialize a random seed using current time and monotonic count.
+
+  Get current time and monotonic count first. Then initialize a random seed
+  based on some basic mathematics operation on the hour, day, minute, second,
+  nanosecond and year of the current time and the monotonic count value.
 
   @return The random seed initialized with current time.
@@ -874 +911 @@
   EFI_TIME                  Time;
   UINT32                    Seed;
+  UINT64                    MonotonicCount;
 
   gRT->GetTime (&Time, NULL);
-  Seed = (~Time.Hour << 24 | Time.Day << 16 | Time.Minute << 8 | Time.Second);
+  Seed = (Time.Hour << 24 | Time.Day << 16 | Time.Minute << 8 | Time.Second);
   Seed ^= Time.Nanosecond;
   Seed ^= Time.Year << 7;
 
+  gBS->GetNextMonotonicCount (&MonotonicCount);
+  Seed += (UINT32) MonotonicCount;
+
   return Seed;
 }
@@ -886 +927 @@
 /**
   Extract a UINT32 from a byte stream.
+
+  ASSERT if Buf is NULL.
 
   Copy a UINT32 from a byte stream, then converts it from Network
@@ -903 +946 @@
   UINT32                    Value;
 
+  ASSERT (Buf != NULL);
+
   CopyMem (&Value, Buf, sizeof (UINT32));
   return NTOHL (Value);
@@ -910 +955 @@
 /**
   Put a UINT32 to the byte stream in network byte order.
+
+  ASSERT if Buf is NULL.
 
   Converts a UINT32 from host byte order to network byte order. Then copy it to the
@@ -925 +972 @@
   )
 {
+  ASSERT (Buf != NULL);
+
   Data = HTONL (Data);
   CopyMem (Buf, &Data, sizeof (UINT32));
@@ -1023 +1072 @@
   Insert a new node entry after a designated node entry of a doubly linked list.
 
+  ASSERT if PrevEntry or NewEntry is NULL.
+
   Inserts a new node entry donated by NewEntry after the node entry donated by PrevEntry
   of the doubly linked list.
@@ -1037 +1088 @@
   )
 {
+  ASSERT (PrevEntry != NULL && NewEntry != NULL);
+
   NewEntry->BackLink                = PrevEntry;
   NewEntry->ForwardLink             = PrevEntry->ForwardLink;
@@ -1047 +1100 @@
   Insert a new node entry before a designated node entry of a doubly linked list.
 
+  ASSERT if PostEntry or NewEntry is NULL.
+
   Inserts a new node entry donated by NewEntry after the node entry donated by PostEntry
   of the doubly linked list.
@@ -1061 +1116 @@
   )
 {
+  ASSERT (PostEntry != NULL && NewEntry != NULL);
+
   NewEntry->ForwardLink             = PostEntry;
   NewEntry->BackLink                = PostEntry->BackLink;
@@ -1150 +1207 @@
                                  if NumberOfChildren is 0.
 
-  @retval TURE                   Found the input Handle in ChildHandleBuffer.
+  @retval TRUE                   Found the input Handle in ChildHandleBuffer.
   @retval FALSE                  Can't find the input Handle in ChildHandleBuffer.
 
@@ -1259 +1316 @@
   If Map is NULL, then ASSERT().
 
-
   @param[in]  Map                   The net map to test.
 
@@ -1279 +1335 @@
   Return the number of the <Key, Value> pairs in the netmap.
 
+  If Map is NULL, then ASSERT().
+
   @param[in]  Map                   The netmap to get the entry number.
 
@@ -1290 +1348 @@
   )
 {
+  ASSERT (Map != NULL);
   return Map->Count;
 }
@@ -1354 +1413 @@
 
   If Map is NULL, then ASSERT().
+  If Key is NULL, then ASSERT().
 
   @param[in, out]  Map                   The netmap to insert into.
@@ -1373 +1433 @@
   NET_MAP_ITEM              *Item;
 
-  ASSERT (Map != NULL);
+  ASSERT (Map != NULL && Key != NULL);
 
   Item = NetMapAllocItem (Map);
@@ -1398 +1458 @@
 
   If Map is NULL, then ASSERT().
+  If Key is NULL, then ASSERT().
 
   @param[in, out]  Map                   The netmap to insert into.
@@ -1417 +1478 @@
   NET_MAP_ITEM              *Item;
 
-  ASSERT (Map != NULL);
+  ASSERT (Map != NULL && Key != NULL);
 
   Item = NetMapAllocItem (Map);
@@ -1437 +1498 @@
 /**
   Check whether the item is in the Map and return TRUE if it is.
+
+  If Map is NULL, then ASSERT().
+  If Item is NULL, then ASSERT().
 
   @param[in]  Map                   The netmap to search within.
@@ -1452 +1516 @@
   LIST_ENTRY            *ListEntry;
 
+  ASSERT (Map != NULL && Item != NULL);
+
   NET_LIST_FOR_EACH (ListEntry, &Map->Used) {
     if (ListEntry == &Item->Link) {
@@ -1469 +1535 @@
 
   If Map is NULL, then ASSERT().
+  If Key is NULL, then ASSERT().
 
   @param[in]  Map                   The netmap to search within.
@@ -1486 +1553 @@
   NET_MAP_ITEM            *Item;
 
-  ASSERT (Map != NULL);
+  ASSERT (Map != NULL && Key != NULL);
 
   NET_LIST_FOR_EACH (Entry, &Map->Used) {
@@ -1635 +1702 @@
   Iterate through the netmap and call CallBack for each item.
 
-  It will contiue the traverse if CallBack returns EFI_SUCCESS, otherwise, break
+  It will continue the traverse if CallBack returns EFI_SUCCESS, otherwise, break
   from the loop. It returns the CallBack's last return value. This function is
   delete safe for the current item.
@@ -1684 +1751 @@
 
   return EFI_SUCCESS;
-}
-
-
-/**
-  Internal function to get the child handle of the NIC handle.
-
-  @param[in]   Controller    NIC controller handle.
-  @param[out]  ChildHandle   Returned child handle.
-
-  @retval EFI_SUCCESS        Successfully to get child handle.
-  @retval Others             Failed to get child handle.
-
-**/
-EFI_STATUS
-NetGetChildHandle (
-  IN EFI_HANDLE         Controller,
-  OUT EFI_HANDLE        *ChildHandle
-  )
-{
-  EFI_STATUS                 Status;
-  EFI_HANDLE                 *Handles;
-  UINTN                      HandleCount;
-  UINTN                      Index;
-  EFI_DEVICE_PATH_PROTOCOL   *ChildDeviceDevicePath;
-  VENDOR_DEVICE_PATH         *VendorDeviceNode;
-
-  //
-  // Locate all EFI Hii Config Access protocols
-  //
-  Status = gBS->LocateHandleBuffer (
-                 ByProtocol,
-                 &gEfiHiiConfigAccessProtocolGuid,
-                 NULL,
-                 &HandleCount,
-                 &Handles
-                 );
-  if (EFI_ERROR (Status) || (HandleCount == 0)) {
-    return Status;
-  }
-
-  Status = EFI_NOT_FOUND;
-
-  for (Index = 0; Index < HandleCount; Index++) {
-
-    Status = EfiTestChildHandle (Controller, Handles[Index], &gEfiManagedNetworkServiceBindingProtocolGuid);
-    if (!EFI_ERROR (Status)) {
-      //
-      // Get device path on the child handle
-      //
-      Status = gBS->HandleProtocol (
-                     Handles[Index],
-                     &gEfiDevicePathProtocolGuid,
-                     (VOID **) &ChildDeviceDevicePath
-                     );
-
-      if (!EFI_ERROR (Status)) {
-        while (!IsDevicePathEnd (ChildDeviceDevicePath)) {
-          ChildDeviceDevicePath = NextDevicePathNode (ChildDeviceDevicePath);
-          //
-          // Parse one instance
-          //
-          if (ChildDeviceDevicePath->Type == HARDWARE_DEVICE_PATH &&
-              ChildDeviceDevicePath->SubType == HW_VENDOR_DP) {
-            VendorDeviceNode = (VENDOR_DEVICE_PATH *) ChildDeviceDevicePath;
-            if (CompareMem (&VendorDeviceNode->Guid, &gEfiNicIp4ConfigVariableGuid, sizeof (EFI_GUID)) == 0) {
-              //
-              // Found item matched gEfiNicIp4ConfigVariableGuid
-              //
-              *ChildHandle = Handles[Index];
-              FreePool (Handles);
-              return EFI_SUCCESS;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  FreePool (Handles);
-  return Status;
 }
 
@@ -2169 +2156 @@
   Get MAC address associated with the network service handle.
 
+  If MacAddress is NULL, then ASSERT().
+  If AddressSize is NULL, then ASSERT().
+
   There should be MNP Service Binding Protocol installed on the input ServiceHandle.
   If SNP is installed on the ServiceHandle or its parent handle, MAC address will
@@ -2273 +2263 @@
   to a unicode string. Callers are responsible for freeing the string storage.
 
+  If MacString is NULL, then ASSERT().
+
   Locate simple network protocol associated with the Service Binding Handle and
   get the mac address from SNP. Then convert the mac address into a unicode
@@ -2306 +2298 @@
   CHAR16                       *String;
   UINTN                        Index;
+  UINTN                        BufferSize;
 
   ASSERT (MacString != NULL);
@@ -2322 +2315 @@
   // Plus one unicode character for the null-terminator.
   //
-  String = AllocateZeroPool ((2 * HwAddressSize + 5 + 1) * sizeof (CHAR16));
+  BufferSize = (2 * HwAddressSize + 5 + 1) * sizeof (CHAR16);
+  String = AllocateZeroPool (BufferSize);
   if (String == NULL) {
     return EFI_OUT_OF_RESOURCES;
@@ -2333 +2327 @@
   HwAddress = &MacAddress.Addr[0];
   for (Index = 0; Index < HwAddressSize; Index++) {
-    String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(HwAddress++), 2);
+    UnicodeValueToStringS (
+      String,
+      BufferSize - ((UINTN)String - (UINTN)*MacString),
+      PREFIX_ZERO | RADIX_HEX,
+      *(HwAddress++),
+      2
+      );
+    String += StrnLenS (String, (BufferSize - ((UINTN)String - (UINTN)*MacString)) / sizeof (CHAR16));
   }
 
@@ -2342 +2343 @@
   if (VlanId != 0) {
     *String++ = L'\\';
-    String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, VlanId, 4);
+    UnicodeValueToStringS (
+      String,
+      BufferSize - ((UINTN)String - (UINTN)*MacString),
+      PREFIX_ZERO | RADIX_HEX,
+      VlanId,
+      4
+      );
+    String += StrnLenS (String, (BufferSize - ((UINTN)String - (UINTN)*MacString)) / sizeof (CHAR16));
   }
 
@@ -2355 +2363 @@
 /**
   Detect media status for specified network device.
+
+  If MediaPresent is NULL, then ASSERT().
 
   The underlying UNDI driver may or may not support reporting media status from
@@ -2464 +2474 @@
                       );
       ASSERT (MCastFilter != NULL);
+      if (MCastFilter == NULL) {
+        Status = EFI_OUT_OF_RESOURCES;
+        goto Exit;
+      }
 
       ResetMCastFilters = FALSE;
@@ -2562 +2576 @@
 
 /**
+
+  Detect media state for a network device. This routine will wait for a period of time at
+  a specified checking interval when a certain network is under connecting until connection
+  process finishs or timeout. If Aip protocol is supported by low layer drivers, three kinds
+  of media states can be detected: EFI_SUCCESS, EFI_NOT_READY and EFI_NO_MEDIA, represents
+  connected state, connecting state and no media state respectively. When function detects
+  the current state is EFI_NOT_READY, it will loop to wait for next time's check until state
+  turns to be EFI_SUCCESS or EFI_NO_MEDIA. If Aip protocol is not supported, function will
+  call NetLibDetectMedia() and return state directly.
+
+  @param[in]   ServiceHandle    The handle where network service binding protocols are
+                                installed on.
+  @param[in]   Timeout          The maximum number of 100ns units to wait when network
+                                is connecting. Zero value means detect once and return
+                                immediately.
+  @param[out]  MediaState       The pointer to the detected media state.
+
+  @retval EFI_SUCCESS           Media detection success.
+  @retval EFI_INVALID_PARAMETER ServiceHandle is not a valid network device handle or
+                                MediaState pointer is NULL.
+  @retval EFI_DEVICE_ERROR      A device error occurred.
+  @retval EFI_TIMEOUT           Network is connecting but timeout.
+
+**/
+EFI_STATUS
+EFIAPI
+NetLibDetectMediaWaitTimeout (
+  IN  EFI_HANDLE            ServiceHandle,
+  IN  UINT64                Timeout,
+  OUT EFI_STATUS            *MediaState
+  )
+{
+  EFI_STATUS                        Status;
+  EFI_HANDLE                        SnpHandle;
+  EFI_SIMPLE_NETWORK_PROTOCOL       *Snp;
+  EFI_ADAPTER_INFORMATION_PROTOCOL  *Aip;
+  EFI_ADAPTER_INFO_MEDIA_STATE      *MediaInfo;
+  BOOLEAN                           MediaPresent;
+  UINTN                             DataSize;
+  EFI_STATUS                        TimerStatus;
+  EFI_EVENT                         Timer;
+  UINT64                            TimeRemained;
+
+  if (MediaState == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  *MediaState = EFI_SUCCESS;
+  MediaInfo   = NULL;
+
+  //
+  // Get SNP handle
+  //
+  Snp = NULL;
+  SnpHandle = NetLibGetSnpHandle (ServiceHandle, &Snp);
+  if (SnpHandle == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  Status = gBS->HandleProtocol (
+                  SnpHandle,
+                  &gEfiAdapterInformationProtocolGuid,
+                  (VOID *) &Aip
+                  );
+  if (EFI_ERROR (Status)) {
+
+    MediaPresent = TRUE;
+    Status = NetLibDetectMedia (ServiceHandle, &MediaPresent);
+    if (!EFI_ERROR (Status)) {
+      if (MediaPresent) {
+        *MediaState = EFI_SUCCESS;
+      } else {
+        *MediaState = EFI_NO_MEDIA;
+      }
+    }
+
+    //
+    // NetLibDetectMedia doesn't support EFI_NOT_READY status, return now!
+    //
+    return Status;
+  }
+
+  Status = Aip->GetInformation (
+                  Aip,
+                  &gEfiAdapterInfoMediaStateGuid,
+                  (VOID **) &MediaInfo,
+                  &DataSize
+                  );
+  if (!EFI_ERROR (Status)) {
+
+    *MediaState = MediaInfo->MediaState;
+    FreePool (MediaInfo);
+    if (*MediaState != EFI_NOT_READY || Timeout < MEDIA_STATE_DETECT_TIME_INTERVAL) {
+
+      return EFI_SUCCESS;
+    }
+  } else {
+
+    if (MediaInfo != NULL) {
+      FreePool (MediaInfo);
+    }
+
+    if (Status == EFI_UNSUPPORTED) {
+
+      //
+      // If gEfiAdapterInfoMediaStateGuid is not supported, call NetLibDetectMedia to get media state!
+      //
+      MediaPresent = TRUE;
+      Status = NetLibDetectMedia (ServiceHandle, &MediaPresent);
+      if (!EFI_ERROR (Status)) {
+        if (MediaPresent) {
+          *MediaState = EFI_SUCCESS;
+        } else {
+          *MediaState = EFI_NO_MEDIA;
+        }
+      }
+      return Status;
+    }
+
+    return Status;
+  }
+
+  //
+  // Loop to check media state
+  //
+
+  Timer        = NULL;
+  TimeRemained = Timeout;
+  Status = gBS->CreateEvent (EVT_TIMER, TPL_CALLBACK, NULL, NULL, &Timer);
+  if (EFI_ERROR (Status)) {
+    return EFI_DEVICE_ERROR;
+  }
+
+  do {
+    Status = gBS->SetTimer (
+                    Timer,
+                    TimerRelative,
+                    MEDIA_STATE_DETECT_TIME_INTERVAL
+                    );
+    if (EFI_ERROR (Status)) {
+      gBS->CloseEvent(Timer);
+      return EFI_DEVICE_ERROR;
+    }
+
+    do {
+      TimerStatus = gBS->CheckEvent (Timer);
+      if (!EFI_ERROR (TimerStatus)) {
+
+        TimeRemained -= MEDIA_STATE_DETECT_TIME_INTERVAL;
+        Status = Aip->GetInformation (
+                        Aip,
+                        &gEfiAdapterInfoMediaStateGuid,
+                        (VOID **) &MediaInfo,
+                        &DataSize
+                        );
+        if (!EFI_ERROR (Status)) {
+
+          *MediaState = MediaInfo->MediaState;
+          FreePool (MediaInfo);
+        } else {
+
+          if (MediaInfo != NULL) {
+            FreePool (MediaInfo);
+          }
+          gBS->CloseEvent(Timer);
+          return Status;
+        }
+      }
+    } while (TimerStatus == EFI_NOT_READY);
+  } while (*MediaState == EFI_NOT_READY && TimeRemained >= MEDIA_STATE_DETECT_TIME_INTERVAL);
+
+  gBS->CloseEvent(Timer);
+  if (*MediaState == EFI_NOT_READY && TimeRemained < MEDIA_STATE_DETECT_TIME_INTERVAL) {
+    return EFI_TIMEOUT;
+  } else {
+    return EFI_SUCCESS;
+  }
+}
+
+/**
   Check the default address used by the IPv4 driver is static or dynamic (acquired
   from DHCP).
 
-  If the controller handle does not have the NIC Ip4 Config Protocol installed, the
-  default address is static. If the EFI variable to save the configuration is not found,
-  the default address is static. Otherwise, get the result from the EFI variable which
-  saving the configuration.
-
-  @param[in]   Controller     The controller handle which has the NIC Ip4 Config Protocol
+  If the controller handle does not have the EFI_IP4_CONFIG2_PROTOCOL installed, the
+  default address is static. If failed to get the policy from Ip4 Config2 Protocol,
+  the default address is static. Otherwise, get the result from Ip4 Config2 Protocol.
+
+  @param[in]   Controller     The controller handle which has the EFI_IP4_CONFIG2_PROTOCOL
                               relative with the default address to judge.
 
@@ -2583 +2775 @@
 {
   EFI_STATUS                       Status;
-  EFI_HII_CONFIG_ROUTING_PROTOCOL  *HiiConfigRouting;
-  UINTN                            Len;
-  NIC_IP4_CONFIG_INFO              *ConfigInfo;
+  EFI_IP4_CONFIG2_PROTOCOL         *Ip4Config2;
+  UINTN                            DataSize;
+  EFI_IP4_CONFIG2_POLICY           Policy;
   BOOLEAN                          IsStatic;
-  EFI_STRING                       ConfigHdr;
-  EFI_STRING                       ConfigResp;
-  EFI_STRING                       AccessProgress;
-  EFI_STRING                       AccessResults;
-  EFI_STRING                       String;
-  EFI_HANDLE                       ChildHandle;
-
-  ConfigInfo       = NULL;
-  ConfigHdr        = NULL;
-  ConfigResp       = NULL;
-  AccessProgress   = NULL;
-  AccessResults    = NULL;
-  IsStatic         = TRUE;
-
-  Status = gBS->LocateProtocol (
-                  &gEfiHiiConfigRoutingProtocolGuid,
-                  NULL,
-                  (VOID **) &HiiConfigRouting
-                  );
-  if (EFI_ERROR (Status)) {
-    return TRUE;
-  }
-
-  Status = NetGetChildHandle (Controller, &ChildHandle);
-  if (EFI_ERROR (Status)) {
-    return TRUE;
-  }
-
-  //
-  // Construct config request string header
-  //
-  ConfigHdr = HiiConstructConfigHdr (&gEfiNicIp4ConfigVariableGuid, EFI_NIC_IP4_CONFIG_VARIABLE, ChildHandle);
-  if (ConfigHdr == NULL) {
-    return TRUE;
-  }
-
-  Len = StrLen (ConfigHdr);
-  ConfigResp = AllocateZeroPool ((Len + NIC_ITEM_CONFIG_SIZE * 2 + 100) * sizeof (CHAR16));
-  if (ConfigResp == NULL) {
-    goto ON_EXIT;
-  }
-  StrCpy (ConfigResp, ConfigHdr);
-
-  String = ConfigResp + Len;
-  UnicodeSPrint (
-    String,
-    (8 + 4 + 7 + 4 + 1) * sizeof (CHAR16),
-    L"&OFFSET=%04X&WIDTH=%04X",
-    OFFSET_OF (NIC_IP4_CONFIG_INFO, Source),
-    sizeof (UINT32)
-    );
-
-  Status = HiiConfigRouting->ExtractConfig (
-                               HiiConfigRouting,
-                               ConfigResp,
-                               &AccessProgress,
-                               &AccessResults
-                               );
+
+  Ip4Config2 = NULL;
+
+  DataSize = sizeof (EFI_IP4_CONFIG2_POLICY);
+
+  IsStatic   = TRUE;
+
+  //
+  // Get Ip4Config2 policy.
+  //
+  Status = gBS->HandleProtocol (Controller, &gEfiIp4Config2ProtocolGuid, (VOID **) &Ip4Config2);
   if (EFI_ERROR (Status)) {
     goto ON_EXIT;
   }
 
-  ConfigInfo = AllocateZeroPool (NIC_ITEM_CONFIG_SIZE);
-  if (ConfigInfo == NULL) {
-    goto ON_EXIT;
-  }
-
-  ConfigInfo->Source = IP4_CONFIG_SOURCE_STATIC;
-  Len = NIC_ITEM_CONFIG_SIZE;
-  Status = HiiConfigRouting->ConfigToBlock (
-                               HiiConfigRouting,
-                               AccessResults,
-                               (UINT8 *) ConfigInfo,
-                               &Len,
-                               &AccessProgress
-                               );
+  Status = Ip4Config2->GetData (Ip4Config2, Ip4Config2DataTypePolicy, &DataSize, &Policy);
   if (EFI_ERROR (Status)) {
     goto ON_EXIT;
   }
 
-  IsStatic = (BOOLEAN) (ConfigInfo->Source == IP4_CONFIG_SOURCE_STATIC);
+  IsStatic = (BOOLEAN) (Policy == Ip4Config2PolicyStatic);
 
 ON_EXIT:
 
-  if (AccessResults != NULL) {
-    FreePool (AccessResults);
-  }
-  if (ConfigInfo != NULL) {
-    FreePool (ConfigInfo);
-  }
-  if (ConfigResp != NULL) {
-    FreePool (ConfigResp);
-  }
-  if (ConfigHdr != NULL) {
-    FreePool (ConfigHdr);
-  }
-
   return IsStatic;
 }
@@ -2689 +2808 @@
 /**
   Create an IPv4 device path node.
+
+  If Node is NULL, then ASSERT().
 
   The header type of IPv4 device path node is MESSAGING_DEVICE_PATH.
@@ -2717 +2838 @@
   )
 {
+  ASSERT (Node != NULL);
+
   Node->Header.Type    = MESSAGING_DEVICE_PATH;
   Node->Header.SubType = MSG_IPv4_DP;
@@ -2746 +2869 @@
 /**
   Create an IPv6 device path node.
+
+  If Node is NULL, then ASSERT().
+  If LocalIp is NULL, then ASSERT().
+  If RemoteIp is NULL, then ASSERT().
 
   The header type of IPv6 device path node is MESSAGING_DEVICE_PATH.
@@ -2772 +2899 @@
   )
 {
+  ASSERT (Node != NULL && LocalIp != NULL && RemoteIp != NULL);
+
   Node->Header.Type    = MESSAGING_DEVICE_PATH;
   Node->Header.SubType = MSG_IPv6_DP;
@@ -2795 +2924 @@
 /**
   Find the UNDI/SNP handle from controller and protocol GUID.
+
+  If ProtocolGuid is NULL, then ASSERT().
 
   For example, IP will open a MNP child to transmit/receive
@@ -2823 +2954 @@
   UINTN                               Index;
 
+  ASSERT (ProtocolGuid != NULL);
+
   Status = gBS->OpenProtocolInformation (
                   Controller,
@@ -2864 +2997 @@
   )
 {
-  UINT8                          Index;
-  CHAR8                          *Ip4Str;
-  CHAR8                          *TempStr;
-  UINTN                          NodeVal;
-
-  if ((String == NULL) || (Ip4Address == NULL)) {
+  RETURN_STATUS                  Status;
+  CHAR8                          *EndPointer;
+
+  Status = AsciiStrToIpv4Address (String, &EndPointer, Ip4Address, NULL);
+  if (RETURN_ERROR (Status) || (*EndPointer != '\0')) {
     return EFI_INVALID_PARAMETER;
-  }
-
-  Ip4Str = (CHAR8 *) String;
-
-  for (Index = 0; Index < 4; Index++) {
-    TempStr = Ip4Str;
-
-    while ((*Ip4Str != '\0') && (*Ip4Str != '.')) {
-      Ip4Str++;
-    }
-
-    //
-    // The IPv4 address is X.X.X.X
-    //
-    if (*Ip4Str == '.') {
-      if (Index == 3) {
-        return EFI_INVALID_PARAMETER;
-      }
-    } else {
-      if (Index != 3) {
-        return EFI_INVALID_PARAMETER;
-      }
-    }
-
-    //
-    // Convert the string to IPv4 address. AsciiStrDecimalToUintn stops at the
-    // first character that is not a valid decimal character, '.' or '\0' here.
-    //
-    NodeVal = AsciiStrDecimalToUintn (TempStr);
-    if (NodeVal > 0xFF) {
-      return EFI_INVALID_PARAMETER;
-    }
-
-    Ip4Address->Addr[Index] = (UINT8) NodeVal;
-
-    Ip4Str++;
-  }
-
-  return EFI_SUCCESS;
+  } else {
+    return EFI_SUCCESS;
+  }
 }
 
@@ -2915 +3011 @@
 /**
   Convert one Null-terminated ASCII string to EFI_IPv6_ADDRESS. The format of the
-  string is defined in RFC 4291 - Text Pepresentation of Addresses.
+  string is defined in RFC 4291 - Text Representation of Addresses.
 
   @param[in]      String         The pointer to the Ascii string.
@@ -2931 +3027 @@
   )
 {
-  UINT8                          Index;
-  CHAR8                          *Ip6Str;
-  CHAR8                          *TempStr;
-  CHAR8                          *TempStr2;
-  UINT8                          NodeCnt;
-  UINT8                          TailNodeCnt;
-  UINT8                          AllowedCnt;
-  UINTN                          NodeVal;
-  BOOLEAN                        Short;
-  BOOLEAN                        Update;
-  BOOLEAN                        LeadZero;
-  UINT8                          LeadZeroCnt;
-  UINT8                          Cnt;
-
-  if ((String == NULL) || (Ip6Address == NULL)) {
+  RETURN_STATUS                  Status;
+  CHAR8                          *EndPointer;
+
+  Status = AsciiStrToIpv6Address (String, &EndPointer, Ip6Address, NULL);
+  if (RETURN_ERROR (Status) || (*EndPointer != '\0')) {
     return EFI_INVALID_PARAMETER;
-  }
-
-  Ip6Str      = (CHAR8 *) String;
-  AllowedCnt  = 6;
-  LeadZeroCnt = 0;
-
-  //
-  // An IPv6 address leading with : looks strange.
-  //
-  if (*Ip6Str == ':') {
-    if (*(Ip6Str + 1) != ':') {
-      return EFI_INVALID_PARAMETER;
-    } else {
-      AllowedCnt = 7;
-    }
-  }
-
-  ZeroMem (Ip6Address, sizeof (EFI_IPv6_ADDRESS));
-
-  NodeCnt     = 0;
-  TailNodeCnt = 0;
-  Short       = FALSE;
-  Update      = FALSE;
-  LeadZero    = FALSE;
-
-  for (Index = 0; Index < 15; Index = (UINT8) (Index + 2)) {
-    TempStr = Ip6Str;
-
-    while ((*Ip6Str != '\0') && (*Ip6Str != ':')) {
-      Ip6Str++;
-    }
-
-    if ((*Ip6Str == '\0') && (Index != 14)) {
-      return EFI_INVALID_PARAMETER;
-    }
-
-    if (*Ip6Str == ':') {
-      if (*(Ip6Str + 1) == ':') {
-        if ((NodeCnt > 6) ||
-            ((*(Ip6Str + 2) != '\0') && (AsciiStrHexToUintn (Ip6Str + 2) == 0))) {
-          //
-          // ::0 looks strange. report error to user.
-          //
-          return EFI_INVALID_PARAMETER;
-        }
-        if ((NodeCnt == 6) && (*(Ip6Str + 2) != '\0') &&
-            (AsciiStrHexToUintn (Ip6Str + 2) != 0)) {
-          return EFI_INVALID_PARAMETER;
-        }
-
-        //
-        // Skip the abbreviation part of IPv6 address.
-        //
-        TempStr2 = Ip6Str + 2;
-        while ((*TempStr2 != '\0')) {
-          if (*TempStr2 == ':') {
-            if (*(TempStr2 + 1) == ':') {
-              //
-              // :: can only appear once in IPv6 address.
-              //
-              return EFI_INVALID_PARAMETER;
-            }
-
-            TailNodeCnt++;
-            if (TailNodeCnt >= (AllowedCnt - NodeCnt)) {
-              //
-              // :: indicates one or more groups of 16 bits of zeros.
-              //
-              return EFI_INVALID_PARAMETER;
-            }
-          }
-
-          TempStr2++;
-        }
-
-        Short  = TRUE;
-        Update = TRUE;
-
-        Ip6Str = Ip6Str + 2;
-      } else {
-        if (*(Ip6Str + 1) == '\0') {
-          return EFI_INVALID_PARAMETER;
-        }
-        Ip6Str++;
-        NodeCnt++;
-        if ((Short && (NodeCnt > 6)) || (!Short && (NodeCnt > 7))) {
-          //
-          // There are more than 8 groups of 16 bits of zeros.
-          //
-          return EFI_INVALID_PARAMETER;
-        }
-      }
-    }
-
-    //
-    // Convert the string to IPv6 address. AsciiStrHexToUintn stops at the first
-    // character that is not a valid hexadecimal character, ':' or '\0' here.
-    //
-    NodeVal = AsciiStrHexToUintn (TempStr);
-    if ((NodeVal > 0xFFFF) || (Index > 14)) {
-      return EFI_INVALID_PARAMETER;
-    }
-    if (NodeVal != 0) {
-      if ((*TempStr  == '0') &&
-          ((*(TempStr + 2) == ':') || (*(TempStr + 3) == ':') ||
-          (*(TempStr + 2) == '\0') || (*(TempStr + 3) == '\0'))) {
-        return EFI_INVALID_PARAMETER;
-      }
-      if ((*TempStr  == '0') && (*(TempStr + 4) != '\0') &&
-          (*(TempStr + 4) != ':')) {
-        return EFI_INVALID_PARAMETER;
-      }
-    } else {
-      if (((*TempStr  == '0') && (*(TempStr + 1) == '0') &&
-          ((*(TempStr + 2) == ':') || (*(TempStr + 2) == '\0'))) ||
-          ((*TempStr  == '0') && (*(TempStr + 1) == '0') && (*(TempStr + 2) == '0') &&
-          ((*(TempStr + 3) == ':') || (*(TempStr + 3) == '\0')))) {
-        return EFI_INVALID_PARAMETER;
-      }
-    }
-
-    Cnt = 0;
-    while ((TempStr[Cnt] != ':') && (TempStr[Cnt] != '\0')) {
-      Cnt++;
-    }
-    if (LeadZeroCnt == 0) {
-      if ((Cnt == 4) && (*TempStr  == '0')) {
-        LeadZero = TRUE;
-        LeadZeroCnt++;
-      }
-      if ((Cnt != 0) && (Cnt < 4)) {
-        LeadZero = FALSE;
-        LeadZeroCnt++;
-      }
-    } else {
-      if ((Cnt == 4) && (*TempStr  == '0') && !LeadZero) {
-        return EFI_INVALID_PARAMETER;
-      }
-      if ((Cnt != 0) && (Cnt < 4) && LeadZero) {
-        return EFI_INVALID_PARAMETER;
-      }
-    }
-
-    Ip6Address->Addr[Index] = (UINT8) (NodeVal >> 8);
-    Ip6Address->Addr[Index + 1] = (UINT8) (NodeVal & 0xFF);
-
-    //
-    // Skip the groups of zeros by ::
-    //
-    if (Short && Update) {
-      Index  = (UINT8) (16 - (TailNodeCnt + 2) * 2);
-      Update = FALSE;
-    }
-  }
-
-  if ((!Short && Index != 16) || (*Ip6Str != '\0')) {
-    return EFI_INVALID_PARAMETER;
-  }
-
-  return EFI_SUCCESS;
+  } else {
+    return EFI_SUCCESS;
+  }
 }
 
@@ -3118 +3047 @@
   @retval EFI_SUCCESS            Convert to IPv4 address successfully.
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip4Address is NULL.
-  @retval EFI_OUT_OF_RESOURCES   Fail to perform the operation due to lack of resource.
 
 **/
@@ -3128 +3056 @@
   )
 {
-  CHAR8                          *Ip4Str;
-  EFI_STATUS                     Status;
-
-  if ((String == NULL) || (Ip4Address == NULL)) {
+  RETURN_STATUS                  Status;
+  CHAR16                         *EndPointer;
+
+  Status = StrToIpv4Address (String, &EndPointer, Ip4Address, NULL);
+  if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {
     return EFI_INVALID_PARAMETER;
-  }
-
-  Ip4Str = (CHAR8 *) AllocatePool ((StrLen (String) + 1) * sizeof (CHAR8));
-  if (Ip4Str == NULL) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  UnicodeStrToAsciiStr (String, Ip4Str);
-
-  Status = NetLibAsciiStrToIp4 (Ip4Str, Ip4Address);
-
-  FreePool (Ip4Str);
-
-  return Status;
+  } else {
+    return EFI_SUCCESS;
+  }
 }
 
@@ -3152 +3070 @@
 /**
   Convert one Null-terminated Unicode string to EFI_IPv6_ADDRESS.  The format of
-  the string is defined in RFC 4291 - Text Pepresentation of Addresses.
+  the string is defined in RFC 4291 - Text Representation of Addresses.
 
   @param[in]      String         The pointer to the Ascii string.
@@ -3159 +3077 @@
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.
-  @retval EFI_OUT_OF_RESOURCES   Fail to perform the operation due to lack of resource.
 
 **/
@@ -3169 +3086 @@
   )
 {
-  CHAR8                          *Ip6Str;
-  EFI_STATUS                     Status;
-
-  if ((String == NULL) || (Ip6Address == NULL)) {
+  RETURN_STATUS                  Status;
+  CHAR16                         *EndPointer;
+
+  Status = StrToIpv6Address (String, &EndPointer, Ip6Address, NULL);
+  if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {
     return EFI_INVALID_PARAMETER;
-  }
-
-  Ip6Str = (CHAR8 *) AllocatePool ((StrLen (String) + 1) * sizeof (CHAR8));
-  if (Ip6Str == NULL) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  UnicodeStrToAsciiStr (String, Ip6Str);
-
-  Status = NetLibAsciiStrToIp6 (Ip6Str, Ip6Address);
-
-  FreePool (Ip6Str);
-
-  return Status;
+  } else {
+    return EFI_SUCCESS;
+  }
 }
 
 /**
   Convert one Null-terminated Unicode string to EFI_IPv6_ADDRESS and prefix length.
-  The format of the string is defined in RFC 4291 - Text Pepresentation of Addresses
+  The format of the string is defined in RFC 4291 - Text Representation of Addresses
   Prefixes: ipv6-address/prefix-length.
 
@@ -3201 +3108 @@
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.
-  @retval EFI_OUT_OF_RESOURCES   Fail to perform the operation due to lack of resource.
 
 **/
@@ -3212 +3118 @@
   )
 {
-  CHAR8                          *Ip6Str;
-  CHAR8                          *PrefixStr;
-  CHAR8                          *TempStr;
-  EFI_STATUS                     Status;
-  UINT8                          Length;
-
-  if ((String == NULL) || (Ip6Address == NULL) || (PrefixLength == NULL)) {
+  RETURN_STATUS                  Status;
+  CHAR16                         *EndPointer;
+
+  Status = StrToIpv6Address (String, &EndPointer, Ip6Address, PrefixLength);
+  if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {
     return EFI_INVALID_PARAMETER;
-  }
-
-  Ip6Str = (CHAR8 *) AllocatePool ((StrLen (String) + 1) * sizeof (CHAR8));
-  if (Ip6Str == NULL) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  UnicodeStrToAsciiStr (String, Ip6Str);
-
-  //
-  // Get the sub string describing prefix length.
-  //
-  TempStr = Ip6Str;
-  while (*TempStr != '\0' && (*TempStr != '/')) {
-    TempStr++;
-  }
-
-  if (*TempStr == '/') {
-    PrefixStr = TempStr + 1;
   } else {
-    PrefixStr = NULL;
-  }
-
-  //
-  // Get the sub string describing IPv6 address and convert it.
-  //
-  *TempStr = '\0';
-
-  Status = NetLibAsciiStrToIp6 (Ip6Str, Ip6Address);
-  if (EFI_ERROR (Status)) {
-    goto Exit;
-  }
-
-  //
-  // If input string doesn't indicate the prefix length, return 0xff.
-  //
-  Length = 0xFF;
-
-  //
-  // Convert the string to prefix length
-  //
-  if (PrefixStr != NULL) {
-
-    Status = EFI_INVALID_PARAMETER;
-    Length = 0;
-    while (*PrefixStr != '\0') {
-      if (NET_IS_DIGIT (*PrefixStr)) {
-        Length = (UINT8) (Length * 10 + (*PrefixStr - '0'));
-        if (Length >= IP6_PREFIX_NUM) {
-          goto Exit;
-        }
-      } else {
-        goto Exit;
-      }
-
-      PrefixStr++;
-    }
-  }
-
-  *PrefixLength = Length;
-  Status        = EFI_SUCCESS;
-
-Exit:
-
-  FreePool (Ip6Str);
-  return Status;
+    return EFI_SUCCESS;
+  }
 }
 
@@ -3388 +3229 @@
   }
 
-  StrCpy (String, Buffer);
+  StrCpyS (String, StringSize / sizeof (CHAR16), Buffer);
 
   return EFI_SUCCESS;
@@ -3395 +3236 @@
 /**
   This function obtains the system guid from the smbios table.
+
+  If SystemGuid is NULL, then ASSERT().
 
   @param[out]  SystemGuid     The pointer of the returned system guid.
@@ -3408 +3251 @@
   )
 {
-  EFI_STATUS                Status;
-  SMBIOS_TABLE_ENTRY_POINT  *SmbiosTable;
-  SMBIOS_STRUCTURE_POINTER  Smbios;
-  SMBIOS_STRUCTURE_POINTER  SmbiosEnd;
-  CHAR8                     *String;
+  EFI_STATUS                    Status;
+  SMBIOS_TABLE_ENTRY_POINT      *SmbiosTable;
+  SMBIOS_TABLE_3_0_ENTRY_POINT  *Smbios30Table;
+  SMBIOS_STRUCTURE_POINTER      Smbios;
+  SMBIOS_STRUCTURE_POINTER      SmbiosEnd;
+  CHAR8                         *String;
+
+  ASSERT (SystemGuid != NULL);
 
   SmbiosTable = NULL;
-  Status      = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID **) &SmbiosTable);
-
-  if (EFI_ERROR (Status) || SmbiosTable == NULL) {
-    return EFI_NOT_FOUND;
-  }
-
-  Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;
-  SmbiosEnd.Raw = (UINT8 *) (UINTN) (SmbiosTable->TableAddress + SmbiosTable->TableLength);
+  Status = EfiGetSystemConfigurationTable (&gEfiSmbios3TableGuid, (VOID **) &Smbios30Table);
+  if (!(EFI_ERROR (Status) || Smbios30Table == NULL)) {
+    Smbios.Hdr = (SMBIOS_STRUCTURE *) (UINTN) Smbios30Table->TableAddress;
+    SmbiosEnd.Raw = (UINT8 *) (UINTN) (Smbios30Table->TableAddress + Smbios30Table->TableMaximumSize);
+  } else {
+    Status = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID **) &SmbiosTable);
+    if (EFI_ERROR (Status) || SmbiosTable == NULL) {
+      return EFI_NOT_FOUND;
+    }
+    Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;
+    SmbiosEnd.Raw = (UINT8 *) ((UINTN) SmbiosTable->TableAddress + SmbiosTable->TableLength);
+  }
 
   do {
@@ -3474 +3324 @@
   return EFI_NOT_FOUND;
 }
+
+/**
+  Create Dns QName according the queried domain name.
+
+  If DomainName is NULL, then ASSERT().
+
+  QName is a domain name represented as a sequence of labels,
+  where each label consists of a length octet followed by that
+  number of octets. The QName terminates with the zero
+  length octet for the null label of the root. Caller should
+  take responsibility to free the buffer in returned pointer.
+
+  @param  DomainName    The pointer to the queried domain name string.
+
+  @retval NULL          Failed to fill QName.
+  @return               QName filled successfully.
+
+**/
+CHAR8 *
+EFIAPI
+NetLibCreateDnsQName (
+  IN  CHAR16              *DomainName
+  )
+{
+  CHAR8                 *QueryName;
+  UINTN                 QueryNameSize;
+  CHAR8                 *Header;
+  CHAR8                 *Tail;
+  UINTN                 Len;
+  UINTN                 Index;
+
+  ASSERT (DomainName != NULL);
+
+  QueryName     = NULL;
+  QueryNameSize = 0;
+  Header        = NULL;
+  Tail          = NULL;
+
+  //
+  // One byte for first label length, one byte for terminated length zero.
+  //
+  QueryNameSize = StrLen (DomainName) + 2;
+
+  if (QueryNameSize > DNS_MAX_NAME_SIZE) {
+    return NULL;
+  }
+
+  QueryName = AllocateZeroPool (QueryNameSize);
+  if (QueryName == NULL) {
+    return NULL;
+  }
+
+  Header = QueryName;
+  Tail = Header + 1;
+  Len = 0;
+  for (Index = 0; DomainName[Index] != 0; Index++) {
+    *Tail = (CHAR8) DomainName[Index];
+    if (*Tail == '.') {
+      *Header = (CHAR8) Len;
+      Header = Tail;
+      Tail ++;
+      Len = 0;
+    } else {
+      Tail++;
+      Len++;
+    }
+  }
+  *Header = (CHAR8) Len;
+  *Tail = 0;
+
+  return QueryName;
+}