MdeModulePkg: Update IP4 stack to support point-to-point link with 31-bit mask.

[mirror_edk2.git] / MdeModulePkg / Library / DxeNetLib / DxeNetLib.c

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 7700f0ff825f9bc76edd875f085c304ae2b762d2..b8544b89ab8d3f5bee7b5e94c1eb12f615b170c2 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Network library.\r
 \r
 /** @file\r
   Network library.\r
 \r

-Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2017, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -301,7 +301,7 @@ ON_EXIT:
   Build a syslog packet, including the Ethernet/Ip/Udp headers\r
   and user's message.\r
 \r
   Build a syslog packet, including the Ethernet/Ip/Udp headers\r
   and user's message.\r
 \r

-  @param[in]  Level     Syslog servity level\r
+  @param[in]  Level     Syslog severity level\r

   @param[in]  Module    The module that generates the log\r
   @param[in]  File      The file that contains the current log\r
   @param[in]  Line      The line of code in the File that contains the current log\r
   @param[in]  Module    The module that generates the log\r
   @param[in]  File      The file that contains the current log\r
   @param[in]  Line      The line of code in the File that contains the current log\r


@@ -475,7 +475,7 @@ NetDebugASPrint (
   This function will locate a instance of SNP then send the message through it.\r
   Because it isn't open the SNP BY_DRIVER, apply caution when using it.\r
 \r
   This function will locate a instance of SNP then send the message through it.\r
   Because it isn't open the SNP BY_DRIVER, apply caution when using it.\r
 \r

-  @param Level    The servity level of the message.\r
+  @param Level    The severity level of the message.\r

   @param Module   The Moudle that generates the log.\r
   @param File     The file that contains the log.\r
   @param Line     The exact line that contains the log.\r
   @param Module   The Moudle that generates the log.\r
   @param File     The file that contains the log.\r
   @param Line     The exact line that contains the log.\r


@@ -580,6 +580,11 @@ NetGetMaskLength (
   Return the class of the IP address, such as class A, B, C.\r
   Addr is in host byte order.\r
 \r
   Return the class of the IP address, such as class A, B, C.\r
   Addr is in host byte order.\r
 \r

+  [ATTENTION]\r
+  Classful addressing (IP class A/B/C) has been deprecated according to RFC4632.\r
+  Caller of this function could only check the returned value against\r
+  IP4_ADDR_CLASSD (multicast) or IP4_ADDR_CLASSE (reserved) now.\r
+\r

   The address of class A  starts with 0.\r
   If the address belong to class A, return IP4_ADDR_CLASSA.\r
   The address of class B  starts with 10.\r
   The address of class A  starts with 0.\r
   If the address belong to class A, return IP4_ADDR_CLASSA.\r
   The address of class B  starts with 10.\r


@@ -628,12 +633,13 @@ NetGetIpClass (
 \r
 /**\r
   Check whether the IP is a valid unicast address according to\r
 \r
 /**\r
   Check whether the IP is a valid unicast address according to\r

-  the netmask. If NetMask is zero, use the IP address's class to get the default mask.\r
+  the netmask. \r

 \r
 \r

-  If Ip is 0, IP is not a valid unicast address.\r
-  Class D address is used for multicasting and class E address is reserved for future. If Ip\r
-  belongs to class D or class E, IP is not a valid unicast address.\r
-  If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address.\r
+  ASSERT if NetMask is zero.\r
+  \r
+  If all bits of the host address of IP are 0 or 1, IP is also not a valid unicast address,\r
+  except when the originator is one of the endpoints of a point-to-point link with a 31-bit\r
+  mask (RFC3021).\r

 \r
   @param[in]  Ip                    The IP to check against.\r
   @param[in]  NetMask               The mask of the IP.\r
 \r
   @param[in]  Ip                    The IP to check against.\r
   @param[in]  NetMask               The mask of the IP.\r


@@ -648,20 +654,18 @@ NetIp4IsUnicast (
   IN IP4_ADDR               NetMask\r
   )\r
 {\r
   IN IP4_ADDR               NetMask\r
   )\r
 {\r

-  INTN                      Class;\r
-\r
-  Class = NetGetIpClass (Ip);\r
-\r
-  if ((Ip == 0) || (Class >= IP4_ADDR_CLASSD)) {\r
+  ASSERT (NetMask != 0);\r
+  \r
+  if (Ip == 0 || IP4_IS_LOCAL_BROADCAST (Ip)) {\r

     return FALSE;\r
   }\r
 \r
     return FALSE;\r
   }\r
 \r

-  if (NetMask == 0) {\r
-    NetMask = gIp4AllMasks[Class << 3];\r
-  }\r
-\r
-  if (((Ip &~NetMask) == ~NetMask) || ((Ip &~NetMask) == 0)) {\r
-    return FALSE;\r
+  if (NetGetMaskLength (NetMask) != 31) {\r
+    if (((Ip &~NetMask) == ~NetMask) || ((Ip &~NetMask) == 0)) {\r
+      return FALSE;\r
+    }\r
+  } else {\r
+    return TRUE;\r

   }\r
 \r
   return TRUE;\r
   }\r
 \r
   return TRUE;\r


@@ -874,7 +878,7 @@ NetRandomInitSeed (
   UINT64                    MonotonicCount;\r
 \r
   gRT->GetTime (&Time, NULL);\r
   UINT64                    MonotonicCount;\r
 \r
   gRT->GetTime (&Time, NULL);\r

-  Seed = (~Time.Hour << 24 | Time.Day << 16 | Time.Minute << 8 | Time.Second);\r
+  Seed = (Time.Hour << 24 | Time.Day << 16 | Time.Minute << 8 | Time.Second);\r

   Seed ^= Time.Nanosecond;\r
   Seed ^= Time.Year << 7;\r
 \r
   Seed ^= Time.Nanosecond;\r
   Seed ^= Time.Year << 7;\r
 \r


@@ -1151,7 +1155,7 @@ NetDestroyLinkList (
   @param[in]  ChildHandleBuffer  An array of child handles to be freed. May be NULL\r
                                  if NumberOfChildren is 0.\r
 \r
   @param[in]  ChildHandleBuffer  An array of child handles to be freed. May be NULL\r
                                  if NumberOfChildren is 0.\r
 \r

-  @retval TURE                   Found the input Handle in ChildHandleBuffer.\r
+  @retval TRUE                   Found the input Handle in ChildHandleBuffer.\r

   @retval FALSE                  Can't find the input Handle in ChildHandleBuffer.\r
 \r
 **/\r
   @retval FALSE                  Can't find the input Handle in ChildHandleBuffer.\r
 \r
 **/\r


@@ -1636,7 +1640,7 @@ NetMapRemoveTail (
 /**\r
   Iterate through the netmap and call CallBack for each item.\r
 \r
 /**\r
   Iterate through the netmap and call CallBack for each item.\r
 \r

-  It will contiue the traverse if CallBack returns EFI_SUCCESS, otherwise, break\r
+  It will continue the traverse if CallBack returns EFI_SUCCESS, otherwise, break\r

   from the loop. It returns the CallBack's last return value. This function is\r
   delete safe for the current item.\r
 \r
   from the loop. It returns the CallBack's last return value. This function is\r
   delete safe for the current item.\r
 \r


@@ -2227,6 +2231,7 @@ NetLibGetMacString (
   UINT16                       VlanId;\r
   CHAR16                       *String;\r
   UINTN                        Index;\r
   UINT16                       VlanId;\r
   CHAR16                       *String;\r
   UINTN                        Index;\r

+  UINTN                        BufferSize;\r

 \r
   ASSERT (MacString != NULL);\r
 \r
 \r
   ASSERT (MacString != NULL);\r
 \r


@@ -2243,7 +2248,8 @@ NetLibGetMacString (
   // If VLAN is configured, it will need extra 5 characters like "\0005".\r
   // Plus one unicode character for the null-terminator.\r
   //\r
   // If VLAN is configured, it will need extra 5 characters like "\0005".\r
   // Plus one unicode character for the null-terminator.\r
   //\r

-  String = AllocateZeroPool ((2 * HwAddressSize + 5 + 1) * sizeof (CHAR16));\r
+  BufferSize = (2 * HwAddressSize + 5 + 1) * sizeof (CHAR16);\r
+  String = AllocateZeroPool (BufferSize);\r

   if (String == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   if (String == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r


@@ -2254,7 +2260,14 @@ NetLibGetMacString (
   //\r
   HwAddress = &MacAddress.Addr[0];\r
   for (Index = 0; Index < HwAddressSize; Index++) {\r
   //\r
   HwAddress = &MacAddress.Addr[0];\r
   for (Index = 0; Index < HwAddressSize; Index++) {\r

-    String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(HwAddress++), 2);\r
+    UnicodeValueToStringS (\r
+      String,\r
+      BufferSize - ((UINTN)String - (UINTN)*MacString),\r
+      PREFIX_ZERO | RADIX_HEX,\r
+      *(HwAddress++),\r
+      2\r
+      );\r
+    String += StrnLenS (String, (BufferSize - ((UINTN)String - (UINTN)*MacString)) / sizeof (CHAR16));\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -2263,7 +2276,14 @@ NetLibGetMacString (
   VlanId = NetLibGetVlanId (ServiceHandle);\r
   if (VlanId != 0) {\r
     *String++ = L'\\';\r
   VlanId = NetLibGetVlanId (ServiceHandle);\r
   if (VlanId != 0) {\r
     *String++ = L'\\';\r

-    String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, VlanId, 4);\r
+    UnicodeValueToStringS (\r
+      String,\r
+      BufferSize - ((UINTN)String - (UINTN)*MacString),\r
+      PREFIX_ZERO | RADIX_HEX,\r
+      VlanId,\r
+      4\r
+      );\r
+    String += StrnLenS (String, (BufferSize - ((UINTN)String - (UINTN)*MacString)) / sizeof (CHAR16));\r

   }\r
 \r
   //\r
   }\r
 \r
   //\r


@@ -2711,61 +2731,21 @@ NetLibAsciiStrToIp4 (
   OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
   )\r
 {\r
   OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
   )\r
 {\r

-  UINT8                          Index;\r
-  CHAR8                          *Ip4Str;\r
-  CHAR8                          *TempStr;\r
-  UINTN                          NodeVal;\r
+  RETURN_STATUS                  Status;\r
+  CHAR8                          *EndPointer;\r

 \r
 \r

-  if ((String == NULL) || (Ip4Address == NULL)) {\r
+  Status = AsciiStrToIpv4Address (String, &EndPointer, Ip4Address, NULL);\r
+  if (RETURN_ERROR (Status) || (*EndPointer != '\0')) {\r

     return EFI_INVALID_PARAMETER;\r
     return EFI_INVALID_PARAMETER;\r

+  } else {\r
+    return EFI_SUCCESS;\r

   }\r
   }\r

-\r
-  Ip4Str = (CHAR8 *) String;\r
-\r
-  for (Index = 0; Index < 4; Index++) {\r
-    TempStr = Ip4Str;\r
-\r
-    while ((*Ip4Str != '\0') && (*Ip4Str != '.')) {\r
-      if (!NET_IS_DIGIT (*Ip4Str)) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-      Ip4Str++;\r
-    }\r
-\r
-    //\r
-    // The IPv4 address is X.X.X.X\r
-    //\r
-    if (*Ip4Str == '.') {\r
-      if (Index == 3) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-    } else {\r
-      if (Index != 3) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-    }\r
-\r
-    //\r
-    // Convert the string to IPv4 address. AsciiStrDecimalToUintn stops at the\r
-    // first character that is not a valid decimal character, '.' or '\0' here.\r
-    //\r
-    NodeVal = AsciiStrDecimalToUintn (TempStr);\r
-    if (NodeVal > 0xFF) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
-\r
-    Ip4Address->Addr[Index] = (UINT8) NodeVal;\r
-\r
-    Ip4Str++;\r
-  }\r
-\r
-  return EFI_SUCCESS;\r

 }\r
 \r
 \r
 /**\r
   Convert one Null-terminated ASCII string to EFI_IPv6_ADDRESS. The format of the\r
 }\r
 \r
 \r
 /**\r
   Convert one Null-terminated ASCII string to EFI_IPv6_ADDRESS. The format of the\r

-  string is defined in RFC 4291 - Text Pepresentation of Addresses.\r
+  string is defined in RFC 4291 - Text Representation of Addresses.\r

 \r
   @param[in]      String         The pointer to the Ascii string.\r
   @param[out]     Ip6Address     The pointer to the converted IPv6 address.\r
 \r
   @param[in]      String         The pointer to the Ascii string.\r
   @param[out]     Ip6Address     The pointer to the converted IPv6 address.\r


@@ -2781,182 +2761,15 @@ NetLibAsciiStrToIp6 (
   OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
   )\r
 {\r
   OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
   )\r
 {\r

-  UINT8                          Index;\r
-  CHAR8                          *Ip6Str;\r
-  CHAR8                          *TempStr;\r
-  CHAR8                          *TempStr2;\r
-  UINT8                          NodeCnt;\r
-  UINT8                          TailNodeCnt;\r
-  UINT8                          AllowedCnt;\r
-  UINTN                          NodeVal;\r
-  BOOLEAN                        Short;\r
-  BOOLEAN                        Update;\r
-  BOOLEAN                        LeadZero;\r
-  UINT8                          LeadZeroCnt;\r
-  UINT8                          Cnt;\r
-\r
-  if ((String == NULL) || (Ip6Address == NULL)) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  Ip6Str      = (CHAR8 *) String;\r
-  AllowedCnt  = 6;\r
-  LeadZeroCnt = 0;\r
+  RETURN_STATUS                  Status;\r
+  CHAR8                          *EndPointer;\r

 \r
 \r

-  //\r
-  // An IPv6 address leading with : looks strange.\r
-  //\r
-  if (*Ip6Str == ':') {\r
-    if (*(Ip6Str + 1) != ':') {\r
-      return EFI_INVALID_PARAMETER;\r
-    } else {\r
-      AllowedCnt = 7;\r
-    }\r
-  }\r
-\r
-  ZeroMem (Ip6Address, sizeof (EFI_IPv6_ADDRESS));\r
-\r
-  NodeCnt     = 0;\r
-  TailNodeCnt = 0;\r
-  Short       = FALSE;\r
-  Update      = FALSE;\r
-  LeadZero    = FALSE;\r
-\r
-  for (Index = 0; Index < 15; Index = (UINT8) (Index + 2)) {\r
-    TempStr = Ip6Str;\r
-\r
-    while ((*Ip6Str != '\0') && (*Ip6Str != ':')) {\r
-      Ip6Str++;\r
-    }\r
-\r
-    if ((*Ip6Str == '\0') && (Index != 14)) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
-\r
-    if (*Ip6Str == ':') {\r
-      if (*(Ip6Str + 1) == ':') {\r
-        if ((NodeCnt > 6) || \r
-            ((*(Ip6Str + 2) != '\0') && (AsciiStrHexToUintn (Ip6Str + 2) == 0))) {\r
-          //\r
-          // ::0 looks strange. report error to user.\r
-          //\r
-          return EFI_INVALID_PARAMETER;\r
-        }\r
-        if ((NodeCnt == 6) && (*(Ip6Str + 2) != '\0') && \r
-            (AsciiStrHexToUintn (Ip6Str + 2) != 0)) {\r
-          return EFI_INVALID_PARAMETER;\r
-        }\r
-\r
-        //\r
-        // Skip the abbreviation part of IPv6 address.\r
-        //\r
-        TempStr2 = Ip6Str + 2;\r
-        while ((*TempStr2 != '\0')) {\r
-          if (*TempStr2 == ':') {\r
-            if (*(TempStr2 + 1) == ':') {\r
-              //\r
-              // :: can only appear once in IPv6 address.\r
-              //\r
-              return EFI_INVALID_PARAMETER;\r
-            }\r
-\r
-            TailNodeCnt++;\r
-            if (TailNodeCnt >= (AllowedCnt - NodeCnt)) {\r
-              //\r
-              // :: indicates one or more groups of 16 bits of zeros.\r
-              //\r
-              return EFI_INVALID_PARAMETER;\r
-            }\r
-          }\r
-\r
-          TempStr2++;\r
-        }\r
-\r
-        Short  = TRUE;\r
-        Update = TRUE;\r
-\r
-        Ip6Str = Ip6Str + 2;\r
-      } else {\r
-        if (*(Ip6Str + 1) == '\0') {\r
-          return EFI_INVALID_PARAMETER;\r
-        }\r
-        Ip6Str++;\r
-        NodeCnt++;\r
-        if ((Short && (NodeCnt > 6)) || (!Short && (NodeCnt > 7))) {\r
-          //\r
-          // There are more than 8 groups of 16 bits of zeros.\r
-          //\r
-          return EFI_INVALID_PARAMETER;\r
-        }\r
-      }\r
-    }\r
-\r
-    //\r
-    // Convert the string to IPv6 address. AsciiStrHexToUintn stops at the first\r
-    // character that is not a valid hexadecimal character, ':' or '\0' here.\r
-    //\r
-    NodeVal = AsciiStrHexToUintn (TempStr);\r
-    if ((NodeVal > 0xFFFF) || (Index > 14)) {\r
-      return EFI_INVALID_PARAMETER;\r
-    }\r
-    if (NodeVal != 0) {\r
-      if ((*TempStr  == '0') && \r
-          ((*(TempStr + 2) == ':') || (*(TempStr + 3) == ':') || \r
-          (*(TempStr + 2) == '\0') || (*(TempStr + 3) == '\0'))) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-      if ((*TempStr  == '0') && (*(TempStr + 4) != '\0') && \r
-          (*(TempStr + 4) != ':')) { \r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-    } else {\r
-      if (((*TempStr  == '0') && (*(TempStr + 1) == '0') && \r
-          ((*(TempStr + 2) == ':') || (*(TempStr + 2) == '\0'))) ||\r
-          ((*TempStr  == '0') && (*(TempStr + 1) == '0') && (*(TempStr + 2) == '0') && \r
-          ((*(TempStr + 3) == ':') || (*(TempStr + 3) == '\0')))) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-    }\r
-\r
-    Cnt = 0;\r
-    while ((TempStr[Cnt] != ':') && (TempStr[Cnt] != '\0')) {\r
-      Cnt++; \r
-    }\r
-    if (LeadZeroCnt == 0) {\r
-      if ((Cnt == 4) && (*TempStr  == '0')) {\r
-        LeadZero = TRUE;\r
-        LeadZeroCnt++;\r
-      }\r
-      if ((Cnt != 0) && (Cnt < 4)) {\r
-        LeadZero = FALSE;\r
-        LeadZeroCnt++;\r
-      }\r
-    } else {\r
-      if ((Cnt == 4) && (*TempStr  == '0') && !LeadZero) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-      if ((Cnt != 0) && (Cnt < 4) && LeadZero) {\r
-        return EFI_INVALID_PARAMETER;\r
-      }\r
-    } \r
-\r
-    Ip6Address->Addr[Index] = (UINT8) (NodeVal >> 8);\r
-    Ip6Address->Addr[Index + 1] = (UINT8) (NodeVal & 0xFF);\r
-\r
-    //\r
-    // Skip the groups of zeros by ::\r
-    //\r
-    if (Short && Update) {\r
-      Index  = (UINT8) (16 - (TailNodeCnt + 2) * 2);\r
-      Update = FALSE;\r
-    }\r
-  }\r
-\r
-  if ((!Short && Index != 16) || (*Ip6Str != '\0')) {\r
+  Status = AsciiStrToIpv6Address (String, &EndPointer, Ip6Address, NULL);\r
+  if (RETURN_ERROR (Status) || (*EndPointer != '\0')) {\r

     return EFI_INVALID_PARAMETER;\r
     return EFI_INVALID_PARAMETER;\r

+  } else {\r
+    return EFI_SUCCESS;\r

   }\r
   }\r

-\r
-  return EFI_SUCCESS;\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -2968,7 +2781,6 @@ NetLibAsciiStrToIp6 (
 \r
   @retval EFI_SUCCESS            Convert to IPv4 address successfully.\r
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip4Address is NULL.\r
 \r
   @retval EFI_SUCCESS            Convert to IPv4 address successfully.\r
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip4Address is NULL.\r

-  @retval EFI_OUT_OF_RESOURCES   Fail to perform the operation due to lack of resource.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -2978,40 +2790,27 @@ NetLibStrToIp4 (
   OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
   )\r
 {\r
   OUT      EFI_IPv4_ADDRESS      *Ip4Address\r
   )\r
 {\r

-  CHAR8                          *Ip4Str;\r
-  UINTN                          StringSize;\r
-  EFI_STATUS                     Status;\r
+  RETURN_STATUS                  Status;\r
+  CHAR16                         *EndPointer;\r

 \r
 \r

-  if ((String == NULL) || (Ip4Address == NULL)) {\r
+  Status = StrToIpv4Address (String, &EndPointer, Ip4Address, NULL);\r
+  if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {\r

     return EFI_INVALID_PARAMETER;\r
     return EFI_INVALID_PARAMETER;\r

+  } else {\r
+    return EFI_SUCCESS;\r

   }\r
   }\r

-\r
-  StringSize = StrLen (String) + 1;\r
-  Ip4Str = (CHAR8 *) AllocatePool (StringSize * sizeof (CHAR8));\r
-  if (Ip4Str == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-\r
-  UnicodeStrToAsciiStrS (String, Ip4Str, StringSize);\r
-\r
-  Status = NetLibAsciiStrToIp4 (Ip4Str, Ip4Address);\r
-\r
-  FreePool (Ip4Str);\r
-\r
-  return Status;\r

 }\r
 \r
 \r
 /**\r
   Convert one Null-terminated Unicode string to EFI_IPv6_ADDRESS.  The format of\r
 }\r
 \r
 \r
 /**\r
   Convert one Null-terminated Unicode string to EFI_IPv6_ADDRESS.  The format of\r

-  the string is defined in RFC 4291 - Text Pepresentation of Addresses.\r
+  the string is defined in RFC 4291 - Text Representation of Addresses.\r

 \r
   @param[in]      String         The pointer to the Ascii string.\r
   @param[out]     Ip6Address     The pointer to the converted IPv6 address.\r
 \r
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.\r
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.\r
 \r
   @param[in]      String         The pointer to the Ascii string.\r
   @param[out]     Ip6Address     The pointer to the converted IPv6 address.\r
 \r
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.\r
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.\r

-  @retval EFI_OUT_OF_RESOURCES   Fail to perform the operation due to lack of resource.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -3021,32 +2820,20 @@ NetLibStrToIp6 (
   OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
   )\r
 {\r
   OUT      EFI_IPv6_ADDRESS      *Ip6Address\r
   )\r
 {\r

-  CHAR8                          *Ip6Str;\r
-  UINTN                          StringSize;\r
-  EFI_STATUS                     Status;\r
+  RETURN_STATUS                  Status;\r
+  CHAR16                         *EndPointer;\r

 \r
 \r

-  if ((String == NULL) || (Ip6Address == NULL)) {\r
+  Status = StrToIpv6Address (String, &EndPointer, Ip6Address, NULL);\r
+  if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {\r

     return EFI_INVALID_PARAMETER;\r
     return EFI_INVALID_PARAMETER;\r

+  } else {\r
+    return EFI_SUCCESS;\r

   }\r
   }\r

-\r
-  StringSize = StrLen (String) + 1;\r
-  Ip6Str = (CHAR8 *) AllocatePool (StringSize * sizeof (CHAR8));\r
-  if (Ip6Str == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-\r
-  UnicodeStrToAsciiStrS (String, Ip6Str, StringSize);\r
-\r
-  Status = NetLibAsciiStrToIp6 (Ip6Str, Ip6Address);\r
-\r
-  FreePool (Ip6Str);\r
-\r
-  return Status;\r

 }\r
 \r
 /**\r
   Convert one Null-terminated Unicode string to EFI_IPv6_ADDRESS and prefix length.\r
 }\r
 \r
 /**\r
   Convert one Null-terminated Unicode string to EFI_IPv6_ADDRESS and prefix length.\r

-  The format of the string is defined in RFC 4291 - Text Pepresentation of Addresses\r
+  The format of the string is defined in RFC 4291 - Text Representation of Addresses\r

   Prefixes: ipv6-address/prefix-length.\r
 \r
   @param[in]      String         The pointer to the Ascii string.\r
   Prefixes: ipv6-address/prefix-length.\r
 \r
   @param[in]      String         The pointer to the Ascii string.\r


@@ -3055,7 +2842,6 @@ NetLibStrToIp6 (
 \r
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.\r
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.\r
 \r
   @retval EFI_SUCCESS            Convert to IPv6 address successfully.\r
   @retval EFI_INVALID_PARAMETER  The string is mal-formated or Ip6Address is NULL.\r

-  @retval EFI_OUT_OF_RESOURCES   Fail to perform the operation due to lack of resource.\r

 \r
 **/\r
 EFI_STATUS\r
 \r
 **/\r
 EFI_STATUS\r


@@ -3066,82 +2852,15 @@ NetLibStrToIp6andPrefix (
   OUT      UINT8                 *PrefixLength\r
   )\r
 {\r
   OUT      UINT8                 *PrefixLength\r
   )\r
 {\r

-  CHAR8                          *Ip6Str;\r
-  UINTN                          StringSize;\r
-  CHAR8                          *PrefixStr;\r
-  CHAR8                          *TempStr;\r
-  EFI_STATUS                     Status;\r
-  UINT8                          Length;\r
-\r
-  if ((String == NULL) || (Ip6Address == NULL) || (PrefixLength == NULL)) {\r
-    return EFI_INVALID_PARAMETER;\r
-  }\r
-\r
-  StringSize = StrLen (String) + 1;\r
-  Ip6Str = (CHAR8 *) AllocatePool (StringSize * sizeof (CHAR8));\r
-  if (Ip6Str == NULL) {\r
-    return EFI_OUT_OF_RESOURCES;\r
-  }\r
-\r
-  UnicodeStrToAsciiStrS (String, Ip6Str, StringSize);\r
+  RETURN_STATUS                  Status;\r
+  CHAR16                         *EndPointer;\r

 \r
 \r

-  //\r
-  // Get the sub string describing prefix length.\r
-  //\r
-  TempStr = Ip6Str;\r
-  while (*TempStr != '\0' && (*TempStr != '/')) {\r
-    TempStr++;\r
-  }\r
-\r
-  if (*TempStr == '/') {\r
-    PrefixStr = TempStr + 1;\r
+  Status = StrToIpv6Address (String, &EndPointer, Ip6Address, PrefixLength);\r
+  if (RETURN_ERROR (Status) || (*EndPointer != L'\0')) {\r
+    return EFI_INVALID_PARAMETER;\r

   } else {\r
   } else {\r

-    PrefixStr = NULL;\r
-  }\r
-\r
-  //\r
-  // Get the sub string describing IPv6 address and convert it.\r
-  //\r
-  *TempStr = '\0';\r
-\r
-  Status = NetLibAsciiStrToIp6 (Ip6Str, Ip6Address);\r
-  if (EFI_ERROR (Status)) {\r
-    goto Exit;\r
-  }\r
-\r
-  //\r
-  // If input string doesn't indicate the prefix length, return 0xff.\r
-  //\r
-  Length = 0xFF;\r
-\r
-  //\r
-  // Convert the string to prefix length\r
-  //\r
-  if (PrefixStr != NULL) {\r
-\r
-    Status = EFI_INVALID_PARAMETER;\r
-    Length = 0;\r
-    while (*PrefixStr != '\0') {\r
-      if (NET_IS_DIGIT (*PrefixStr)) {\r
-        Length = (UINT8) (Length * 10 + (*PrefixStr - '0'));\r
-        if (Length > IP6_PREFIX_MAX) {\r
-          goto Exit;\r
-        }\r
-      } else {\r
-        goto Exit;\r
-      }\r
-\r
-      PrefixStr++;\r
-    }\r
+    return EFI_SUCCESS;\r

   }\r
   }\r

-\r
-  *PrefixLength = Length;\r
-  Status        = EFI_SUCCESS;\r
-\r
-Exit:\r
-\r
-  FreePool (Ip6Str);\r
-  return Status;\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -3282,7 +3001,7 @@ NetLibGetSystemGuid (
       return EFI_NOT_FOUND;\r
     }\r
     Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;\r
       return EFI_NOT_FOUND;\r
     }\r
     Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;\r

-    SmbiosEnd.Raw = (UINT8 *) (UINTN) (SmbiosTable->TableAddress + SmbiosTable->TableLength);\r
+    SmbiosEnd.Raw = (UINT8 *) ((UINTN) SmbiosTable->TableAddress + SmbiosTable->TableLength);\r

   }\r
 \r
   do {\r
   }\r
 \r
   do {\r


@@ -3401,4 +3120,4 @@ NetLibCreateDnsQName (
   *Tail = 0;\r
 \r
   return QueryName;\r
   *Tail = 0;\r
 \r
   return QueryName;\r

-}
\ No newline at end of file
+}\r