MdeModulePkg/UefiBootManagerLib: Separate boot description functions.

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

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index ce26b322bcb2cf619e705ae1e66af847fa019930..ebc3e125a21736148ba9fb609bc19b6d25a11e67 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -1,7 +1,8 @@
 /** @file\r
   Network library.\r
 \r
-Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2005 - 2016, 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
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -853,11 +854,11 @@ Ip6Swap128 (
 }\r
 \r
 /**\r
-  Initialize a random seed using current time.\r
+  Initialize a random seed using current time and monotonic count.\r
 \r
-  Get current time first. Then initialize a random seed based on some basic\r
-  mathematics operation on the hour, day, minute, second, nanosecond and year\r
-  of the current time.\r
+  Get current time and monotonic count first. Then initialize a random seed \r
+  based on some basic mathematics operation on the hour, day, minute, second,\r
+  nanosecond and year of the current time and the monotonic count value.\r
 \r
   @return The random seed initialized with current time.\r
 \r
@@ -870,12 +871,16 @@ NetRandomInitSeed (
 {\r
   EFI_TIME                  Time;\r
   UINT32                    Seed;\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.Nanosecond;\r
   Seed ^= Time.Year << 7;\r
 \r
+  gBS->GetNextMonotonicCount (&MonotonicCount);\r
+  Seed += (UINT32) MonotonicCount;\r
+\r
   return Seed;\r
 }\r
 \r
@@ -3250,22 +3255,27 @@ NetLibGetSystemGuid (
   OUT EFI_GUID              *SystemGuid\r
   )\r
 {\r
-  EFI_STATUS                Status;\r
-  SMBIOS_TABLE_ENTRY_POINT  *SmbiosTable;\r
-  SMBIOS_STRUCTURE_POINTER  Smbios;\r
-  SMBIOS_STRUCTURE_POINTER  SmbiosEnd;\r
-  CHAR8                     *String;\r
+  EFI_STATUS                    Status;\r
+  SMBIOS_TABLE_ENTRY_POINT      *SmbiosTable;\r
+  SMBIOS_TABLE_3_0_ENTRY_POINT  *Smbios30Table;\r
+  SMBIOS_STRUCTURE_POINTER      Smbios;\r
+  SMBIOS_STRUCTURE_POINTER      SmbiosEnd;\r
+  CHAR8                         *String;\r
 \r
   SmbiosTable = NULL;\r
-  Status      = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID **) &SmbiosTable);\r
-\r
-  if (EFI_ERROR (Status) || SmbiosTable == NULL) {\r
-    return EFI_NOT_FOUND;\r
+  Status = EfiGetSystemConfigurationTable (&gEfiSmbios3TableGuid, (VOID **) &Smbios30Table);\r
+  if (!(EFI_ERROR (Status) || Smbios30Table == NULL)) {\r
+    Smbios.Hdr = (SMBIOS_STRUCTURE *) (UINTN) Smbios30Table->TableAddress;\r
+    SmbiosEnd.Raw = (UINT8 *) (UINTN) (Smbios30Table->TableAddress + Smbios30Table->TableMaximumSize);\r
+  } else {\r
+    Status = EfiGetSystemConfigurationTable (&gEfiSmbiosTableGuid, (VOID **) &SmbiosTable);\r
+    if (EFI_ERROR (Status) || SmbiosTable == NULL) {\r
+      return EFI_NOT_FOUND;\r
+    }\r
+    Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;\r
+    SmbiosEnd.Raw = (UINT8 *) (UINTN) (SmbiosTable->TableAddress + SmbiosTable->TableLength);\r
   }\r
 \r
-  Smbios.Hdr    = (SMBIOS_STRUCTURE *) (UINTN) SmbiosTable->TableAddress;\r
-  SmbiosEnd.Raw = (UINT8 *) (UINTN) (SmbiosTable->TableAddress + SmbiosTable->TableLength);\r
-\r
   do {\r
     if (Smbios.Hdr->Type == 1) {\r
       if (Smbios.Hdr->Length < 0x19) {\r
@@ -3316,3 +3326,70 @@ NetLibGetSystemGuid (
   } while (Smbios.Raw < SmbiosEnd.Raw);\r
   return EFI_NOT_FOUND;\r
 }\r
+\r
+/**\r
+  Create Dns QName according the queried domain name. \r
+  QName is a domain name represented as a sequence of labels, \r
+  where each label consists of a length octet followed by that \r
+  number of octets. The QName terminates with the zero \r
+  length octet for the null label of the root. Caller should \r
+  take responsibility to free the buffer in returned pointer.\r
+\r
+  @param  DomainName    The pointer to the queried domain name string.  \r
+\r
+  @retval NULL          Failed to fill QName.\r
+  @return               QName filled successfully.\r
+  \r
+**/ \r
+CHAR8 *\r
+EFIAPI\r
+NetLibCreateDnsQName (\r
+  IN  CHAR16              *DomainName\r
+  )\r
+{\r
+  CHAR8                 *QueryName;\r
+  UINTN                 QueryNameSize;\r
+  CHAR8                 *Header;\r
+  CHAR8                 *Tail;\r
+  UINTN                 Len;\r
+  UINTN                 Index;\r
+\r
+  QueryName     = NULL;\r
+  QueryNameSize = 0;\r
+  Header        = NULL;\r
+  Tail          = NULL;\r
+\r
+  //\r
+  // One byte for first label length, one byte for terminated length zero. \r
+  //\r
+  QueryNameSize = StrLen (DomainName) + 2;\r
+  \r
+  if (QueryNameSize > DNS_MAX_NAME_SIZE) {\r
+    return NULL;\r
+  }\r
+\r
+  QueryName = AllocateZeroPool (QueryNameSize);\r
+  if (QueryName == NULL) {\r
+    return NULL;\r
+  }\r
+  \r
+  Header = QueryName;\r
+  Tail = Header + 1;\r
+  Len = 0;\r
+  for (Index = 0; DomainName[Index] != 0; Index++) {\r
+    *Tail = (CHAR8) DomainName[Index];\r
+    if (*Tail == '.') {\r
+      *Header = (CHAR8) Len;\r
+      Header = Tail;\r
+      Tail ++;\r
+      Len = 0;\r
+    } else {\r
+      Tail++;\r
+      Len++;\r
+    }\r
+  }\r
+  *Header = (CHAR8) Len;\r
+  *Tail = 0;\r
+\r
+  return QueryName;\r
+}
\ No newline at end of file