From 5e0cdec1961f8a19936f997702b49bdb555a4fce Mon Sep 17 00:00:00 2001 From: Zhang Lubo Date: Tue, 14 Jul 2015 04:02:35 +0000 Subject: [PATCH] NetworkPkg: Fix an error that the call function declared implicitly. Use NetRandomInitSeed() instead of AsmReadTsc() to generate a random seed. Macro definition of EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE for EBC architecture. Add some space to make codes more standard. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Zhang Lubo Reviewed-by: Fu Siyuan Reviewed-by: jiaxinwu git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17941 6f19259b-4bc3-4df7-8a09-765794883524 --- NetworkPkg/DnsDxe/DnsImpl.c | 16 ++++++++-------- NetworkPkg/HttpBootDxe/HttpBootDhcp4.h | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c index b196d181ca..42d51f0ed7 100644 --- a/NetworkPkg/DnsDxe/DnsImpl.c +++ b/NetworkPkg/DnsDxe/DnsImpl.c @@ -1574,8 +1574,8 @@ ConstructDNSQueryIp ( // // Fill header // - DnsHeader = (DNS_HEADER *)Frag.Bulk; - DnsHeader->Identification = (UINT16)AsmReadTsc (); + DnsHeader = (DNS_HEADER *) Frag.Bulk; + DnsHeader->Identification = (UINT16)NET_RANDOM (NetRandomInitSeed()); DnsHeader->Flags.Uint16 = 0x0000; DnsHeader->Flags.Bits.RD = 1; DnsHeader->Flags.Bits.OpCode = DNS_FLAGS_OPCODE_STANDARD; @@ -1585,12 +1585,12 @@ ConstructDNSQueryIp ( DnsHeader->AuthorityNum = 0; DnsHeader->AditionalNum = 0; - DnsHeader->Identification = HTONS(DnsHeader->Identification); - DnsHeader->Flags.Uint16 = HTONS(DnsHeader->Flags.Uint16); - DnsHeader->QuestionsNum = HTONS(DnsHeader->QuestionsNum); - DnsHeader->AnswersNum = HTONS(DnsHeader->AnswersNum); - DnsHeader->AuthorityNum = HTONS(DnsHeader->AuthorityNum); - DnsHeader->AditionalNum = HTONS(DnsHeader->AditionalNum); + DnsHeader->Identification = HTONS (DnsHeader->Identification); + DnsHeader->Flags.Uint16 = HTONS (DnsHeader->Flags.Uint16); + DnsHeader->QuestionsNum = HTONS (DnsHeader->QuestionsNum); + DnsHeader->AnswersNum = HTONS (DnsHeader->AnswersNum); + DnsHeader->AuthorityNum = HTONS (DnsHeader->AuthorityNum); + DnsHeader->AditionalNum = HTONS (DnsHeader->AditionalNum); Frag.Len = sizeof (*DnsHeader); diff --git a/NetworkPkg/HttpBootDxe/HttpBootDhcp4.h b/NetworkPkg/HttpBootDxe/HttpBootDhcp4.h index 42a3874444..47e07aaa85 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootDhcp4.h +++ b/NetworkPkg/HttpBootDxe/HttpBootDhcp4.h @@ -82,6 +82,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE 0x0012 #elif defined (MDE_CPU_AARCH64) #define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE 0x0013 +#elif defined (MDE_CPU_EBC) +#define EFI_HTTP_BOOT_CLIENT_SYSTEM_ARCHITECTURE 0x0011 #endif /// DHCP offer types among HTTP boot.