Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / UefiPxeBcDxe / PxeBcDhcp.c

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index b76461a70d109c2370082de7435c2afe5772adeb..ee17ea358dcaefee387db275ad217d5100e13460 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -62,11 +62,11 @@ PxeBcInitSeedPacket (
 \r
   Header        = &Seed->Dhcp4.Header;\r
 \r
-  NetZeroMem (Header, sizeof (EFI_DHCP4_HEADER));\r
+  ZeroMem (Header, sizeof (EFI_DHCP4_HEADER));\r
   Header->OpCode    = PXEBC_DHCP4_OPCODE_REQUEST;\r
   Header->HwType    = Mode.IfType;\r
   Header->HwAddrLen = (UINT8) Mode.HwAddressSize;\r
-  NetCopyMem (Header->ClientHwAddr, &Mode.CurrentAddress, Header->HwAddrLen);\r
+  CopyMem (Header->ClientHwAddr, &Mode.CurrentAddress, Header->HwAddrLen);\r
 \r
   Seed->Dhcp4.Magik     = PXEBC_DHCP4_MAGIC;\r
   Seed->Dhcp4.Option[0] = PXEBC_DHCP4_TAG_EOP;\r
@@ -90,7 +90,7 @@ PxeBcCopyEfiDhcp4Packet (
 {\r
   ASSERT (Dst->Size >= Src->Length);\r
 \r
-  NetCopyMem (&Dst->Dhcp4, &Src->Dhcp4, Src->Length);\r
+  CopyMem (&Dst->Dhcp4, &Src->Dhcp4, Src->Length);\r
   Dst->Length = Src->Length;\r
 }\r
 \r
@@ -119,7 +119,7 @@ PxeBcCopyProxyOffer (
   Offer = &Private->Dhcp4Offers[OfferIndex].Packet.Offer;\r
 \r
   PxeBcCopyEfiDhcp4Packet (&Private->ProxyOffer.Packet.Offer, Offer);\r
-  NetCopyMem (&Mode->ProxyOffer, &Offer->Dhcp4, Offer->Length);\r
+  CopyMem (&Mode->ProxyOffer, &Offer->Dhcp4, Offer->Length);\r
   Mode->ProxyOfferReceived = TRUE;\r
 \r
   PxeBcParseCachedDhcpPacket (&Private->ProxyOffer);\r
@@ -147,8 +147,8 @@ PxeBcParseCachedDhcpPacket (
   UINTN                   Index;\r
 \r
   CachedPacket->IsPxeOffer = FALSE;\r
-  NetZeroMem (CachedPacket->Dhcp4Option, sizeof (CachedPacket->Dhcp4Option));\r
-  NetZeroMem (&CachedPacket->PxeVendorOption, sizeof (CachedPacket->PxeVendorOption));\r
+  ZeroMem (CachedPacket->Dhcp4Option, sizeof (CachedPacket->Dhcp4Option));\r
+  ZeroMem (&CachedPacket->PxeVendorOption, sizeof (CachedPacket->PxeVendorOption));\r
 \r
   Offer   = &CachedPacket->Packet.Offer;\r
   Options = CachedPacket->Dhcp4Option;\r
@@ -169,7 +169,7 @@ PxeBcParseCachedDhcpPacket (
   //\r
   Option = Options[PXEBC_DHCP4_TAG_INDEX_CLASS_ID];\r
   if ((Option != NULL) && (Option->Length >= 9) &&\r
-    (NetCompareMem (Option->Data, DEFAULT_CLASS_ID_DATA, 9) == 0)) {\r
+    (CompareMem (Option->Data, DEFAULT_CLASS_ID_DATA, 9) == 0)) {\r
 \r
     CachedPacket->IsPxeOffer = TRUE;\r
   }\r
@@ -241,19 +241,6 @@ PxeBcParseCachedDhcpPacket (
       // return false since mtftp not supported currently.\r
       //\r
       return FALSE;\r
-#if 0\r
-      //\r
-      // WFM11A, make sure bootfile is present\r
-      //\r
-      if (CachedPacket->Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_BOOTFILE] == NULL) {\r
-        //\r
-        // Discard this offer.\r
-        //\r
-        return ;\r
-      }\r
-\r
-      OfferType = DHCP4_PACKET_TYPE_WFM11A;\r
-#endif\r
     } else {\r
       //\r
       // If the binl offer with only PXEClient.\r
@@ -296,7 +283,7 @@ PxeBcTryBinl (
     //\r
     // next server ip address is zero, use server id option instead.\r
     //\r
-    NetCopyMem (\r
+    CopyMem (\r
       &ServerIp.Addr[0],\r
       Private->Dhcp4Offers[Index].Dhcp4Option[PXEBC_DHCP4_TAG_INDEX_SERVER_ID]->Data,\r
       sizeof (EFI_IPv4_ADDRESS)\r
@@ -305,7 +292,7 @@ PxeBcTryBinl (
     //\r
     // use next server ip address.\r
     //\r
-    NetCopyMem (&ServerIp.Addr[0], &Offer->Dhcp4.Header.ServerAddr, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&ServerIp.Addr[0], &Offer->Dhcp4.Header.ServerAddr, sizeof (EFI_IPv4_ADDRESS));\r
   }\r
 \r
   CachedPacket = &Private->ProxyOffer;\r
@@ -340,7 +327,7 @@ PxeBcTryBinl (
   }\r
 \r
   Private->PxeBc.Mode->ProxyOfferReceived = TRUE;\r
-  NetCopyMem (&Private->PxeBc.Mode->ProxyOffer, &Reply->Dhcp4, Reply->Length);\r
+  CopyMem (&Private->PxeBc.Mode->ProxyOffer, &Reply->Dhcp4, Reply->Length);\r
 \r
   return TRUE;\r
 }\r
@@ -511,7 +498,7 @@ PxeBcCheckSelectedOffer (
     //\r
     // Copy the dhcp ack.\r
     //\r
-    NetCopyMem (&Mode->DhcpAck, &Ack->Dhcp4, Ack->Length);\r
+    CopyMem (&Mode->DhcpAck, &Ack->Dhcp4, Ack->Length);\r
   }\r
 \r
   return Status;\r
@@ -789,7 +776,7 @@ PxeBcDhcpCallBack (
                 );\r
   if (MaxMsgSize != NULL) {\r
     Value = HTONS (PXEBC_DHCP4_MAX_PACKET_SIZE);\r
-    NetCopyMem (MaxMsgSize->Data, &Value, sizeof (Value));\r
+    CopyMem (MaxMsgSize->Data, &Value, sizeof (Value));\r
   }\r
 \r
   if ((Dhcp4Event != Dhcp4SelectOffer) && (Callback != NULL)) {\r
@@ -814,7 +801,7 @@ PxeBcDhcpCallBack (
     //\r
     // Cache the dhcp discover packet, of which some information will be used later.\r
     //\r
-    NetCopyMem (Mode->DhcpDiscover.Raw, &Packet->Dhcp4, Packet->Length);\r
+    CopyMem (Mode->DhcpDiscover.Raw, &Packet->Dhcp4, Packet->Length);\r
 \r
     break;\r
 \r
@@ -901,7 +888,7 @@ PxeBcBuildDhcpOptions (
     OptList[Index]->Length  = sizeof (PXEBC_DHCP4_OPTION_MAX_MESG_SIZE);\r
     OptEnt.MaxMesgSize      = (PXEBC_DHCP4_OPTION_MAX_MESG_SIZE *) OptList[Index]->Data;\r
     Value                   = NTOHS (PXEBC_DHCP4_MAX_PACKET_SIZE);\r
-    NetCopyMem (&OptEnt.MaxMesgSize->Size, &Value, sizeof (UINT16));\r
+    CopyMem (&OptEnt.MaxMesgSize->Size, &Value, sizeof (UINT16));\r
     Index++;\r
     OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
   }\r
@@ -988,7 +975,7 @@ PxeBcBuildDhcpOptions (
   OptList[Index]->Length  = sizeof (PXEBC_DHCP4_OPTION_ARCH);\r
   OptEnt.Arch             = (PXEBC_DHCP4_OPTION_ARCH *) OptList[Index]->Data;\r
   Value                   = HTONS (SYS_ARCH);\r
-  NetCopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));\r
+  CopyMem (&OptEnt.Arch->Type, &Value, sizeof (UINT16));\r
   Index++;\r
   OptList[Index]          = GET_NEXT_DHCP_OPTION (OptList[Index - 1]);\r
 \r
@@ -998,9 +985,9 @@ PxeBcBuildDhcpOptions (
   OptList[Index]->OpCode  = PXEBC_DHCP4_TAG_CLASS_ID;\r
   OptList[Index]->Length  = sizeof (PXEBC_DHCP4_OPTION_CLID);\r
   OptEnt.Clid             = (PXEBC_DHCP4_OPTION_CLID *) OptList[Index]->Data;\r
-  NetCopyMem (OptEnt.Clid, DEFAULT_CLASS_ID_DATA, sizeof (PXEBC_DHCP4_OPTION_CLID));\r
+  CopyMem (OptEnt.Clid, DEFAULT_CLASS_ID_DATA, sizeof (PXEBC_DHCP4_OPTION_CLID));\r
   CvtNum (SYS_ARCH, OptEnt.Clid->ArchitectureType, sizeof (OptEnt.Clid->ArchitectureType));\r
-  NetCopyMem (OptEnt.Clid->InterfaceName, Private->Nii->StringId, sizeof (OptEnt.Clid->InterfaceName));\r
+  CopyMem (OptEnt.Clid->InterfaceName, Private->Nii->StringId, sizeof (OptEnt.Clid->InterfaceName));\r
   CvtNum (Private->Nii->MajorVer, OptEnt.Clid->UndiMajor, sizeof (OptEnt.Clid->UndiMajor));\r
   CvtNum (Private->Nii->MinorVer, OptEnt.Clid->UndiMinor, sizeof (OptEnt.Clid->UndiMinor));\r
   Index++;\r
@@ -1080,7 +1067,7 @@ PxeBcDiscvBootService (
     // Add vendor option of PXE_BOOT_ITEM\r
     //\r
     VendorOptLen      = (sizeof (EFI_DHCP4_PACKET_OPTION) - 1) * 2 + sizeof (PXEBC_OPTION_BOOT_ITEM) + 1;\r
-    OptList[OptCount] = NetAllocatePool (VendorOptLen);\r
+    OptList[OptCount] = AllocatePool (VendorOptLen);\r
     if (OptList[OptCount] == NULL) {\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r
@@ -1101,7 +1088,7 @@ PxeBcDiscvBootService (
   Status = Dhcp4->Build (Dhcp4, &Private->SeedPacket, 0, NULL, OptCount, OptList, &Token.Packet);\r
 \r
   if (IsDiscv) {\r
-    NetFreePool (OptList[OptCount - 1]);\r
+    gBS->FreePool (OptList[OptCount - 1]);\r
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -1110,24 +1097,24 @@ PxeBcDiscvBootService (
 \r
   Token.Packet->Dhcp4.Header.Xid      = NET_RANDOM (NetRandomInitSeed ());\r
   Token.Packet->Dhcp4.Header.Reserved = (UINT16) ((IsBCast) ? 0xf000 : 0x0);\r
-  NetCopyMem (&Token.Packet->Dhcp4.Header.ClientAddr, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Token.Packet->Dhcp4.Header.ClientAddr, &Private->StationIp, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   Token.RemotePort = Sport;\r
 \r
   if (DestIp == NULL) {\r
-    NetSetMem (&Token.RemoteAddress, sizeof (EFI_IPv4_ADDRESS), 0xff);\r
+    SetMem (&Token.RemoteAddress, sizeof (EFI_IPv4_ADDRESS), 0xff);\r
   } else {\r
-    NetCopyMem (&Token.RemoteAddress, DestIp, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Token.RemoteAddress, DestIp, sizeof (EFI_IPv4_ADDRESS));\r
   }\r
 \r
-  NetCopyMem (&Token.GatewayAddress, &Private->GatewayIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&Token.GatewayAddress, &Private->GatewayIp, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   if (!IsBCast) {\r
     Token.ListenPointCount            = 1;\r
     Token.ListenPoints                = &ListenPoint;\r
     Token.ListenPoints[0].ListenPort  = PXEBC_BS_DISCOVER_PORT;\r
-    NetCopyMem (&Token.ListenPoints[0].ListenAddress, &Private->StationIp, sizeof(EFI_IPv4_ADDRESS));\r
-    NetCopyMem (&Token.ListenPoints[0].SubnetMask, &Private->SubnetMask, sizeof(EFI_IPv4_ADDRESS));\r
+    CopyMem (&Token.ListenPoints[0].ListenAddress, &Private->StationIp, sizeof(EFI_IPv4_ADDRESS));\r
+    CopyMem (&Token.ListenPoints[0].SubnetMask, &Private->SubnetMask, sizeof(EFI_IPv4_ADDRESS));\r
   }\r
   //\r
   // Send Pxe Discover\r
@@ -1183,10 +1170,10 @@ PxeBcDiscvBootService (
       }\r
 \r
       if (IsDiscv) {\r
-        NetCopyMem (&(Mode->PxeDiscover), &(Token.Packet->Dhcp4), Token.Packet->Length);\r
+        CopyMem (&(Mode->PxeDiscover), &(Token.Packet->Dhcp4), Token.Packet->Length);\r
         Mode->PxeDiscoverValid = TRUE;\r
 \r
-        NetCopyMem (Mode->PxeReply.Raw, &Response->Dhcp4, Response->Length);\r
+        CopyMem (Mode->PxeReply.Raw, &Response->Dhcp4, Response->Length);\r
         Mode->PxeReplyReceived = TRUE;\r
       }\r
     } else {\r
@@ -1196,12 +1183,12 @@ PxeBcDiscvBootService (
     //\r
     // free the responselist\r
     //\r
-    NetFreePool (Token.ResponseList);\r
+    gBS->FreePool (Token.ResponseList);\r
   }\r
   //\r
   // Free the dhcp packet\r
   //\r
-  NetFreePool (Token.Packet);\r
+  gBS->FreePool (Token.Packet);\r
 \r
   return Status;\r
 }\r
@@ -1284,17 +1271,17 @@ PxeBcParseVendorOptions (
 \r
     case PXEBC_VENDOR_TAG_MTFTP_IP:\r
 \r
-      NetCopyMem (&VendorOption->MtftpIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&VendorOption->MtftpIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
       break;\r
 \r
     case PXEBC_VENDOR_TAG_MTFTP_CPORT:\r
 \r
-      NetCopyMem (&VendorOption->MtftpCPort, PxeOption->Data, sizeof (VendorOption->MtftpCPort));\r
+      CopyMem (&VendorOption->MtftpCPort, PxeOption->Data, sizeof (VendorOption->MtftpCPort));\r
       break;\r
 \r
     case PXEBC_VENDOR_TAG_MTFTP_SPORT:\r
 \r
-      NetCopyMem (&VendorOption->MtftpSPort, PxeOption->Data, sizeof (VendorOption->MtftpSPort));\r
+      CopyMem (&VendorOption->MtftpSPort, PxeOption->Data, sizeof (VendorOption->MtftpSPort));\r
       break;\r
 \r
     case PXEBC_VENDOR_TAG_MTFTP_TIMEOUT:\r
@@ -1314,7 +1301,7 @@ PxeBcParseVendorOptions (
 \r
     case PXEBC_VENDOR_TAG_DISCOVER_MCAST:\r
 \r
-      NetCopyMem (&VendorOption->DiscoverMcastIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&VendorOption->DiscoverMcastIp, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
       break;\r
 \r
     case PXEBC_VENDOR_TAG_BOOT_SERVERS:\r
@@ -1337,9 +1324,9 @@ PxeBcParseVendorOptions (
 \r
     case PXEBC_VENDOR_TAG_MCAST_ALLOC:\r
 \r
-      NetCopyMem (&VendorOption->McastIpBase, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
-      NetCopyMem (&VendorOption->McastIpBlock, PxeOption->Data + 4, sizeof (VendorOption->McastIpBlock));\r
-      NetCopyMem (&VendorOption->McastIpRange, PxeOption->Data + 6, sizeof (VendorOption->McastIpRange));\r
+      CopyMem (&VendorOption->McastIpBase, PxeOption->Data, sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&VendorOption->McastIpBlock, PxeOption->Data + 4, sizeof (VendorOption->McastIpBlock));\r
+      CopyMem (&VendorOption->McastIpRange, PxeOption->Data + 6, sizeof (VendorOption->McastIpRange));\r
       break;\r
 \r
     case PXEBC_VENDOR_TAG_CREDENTIAL_TYPES:\r
@@ -1350,8 +1337,8 @@ PxeBcParseVendorOptions (
 \r
     case PXEBC_VENDOR_TAG_BOOT_ITEM:\r
 \r
-      NetCopyMem (&VendorOption->BootSrvType, PxeOption->Data, sizeof (VendorOption->BootSrvType));\r
-      NetCopyMem (&VendorOption->BootSrvLayer, PxeOption->Data + 2, sizeof (VendorOption->BootSrvLayer));\r
+      CopyMem (&VendorOption->BootSrvType, PxeOption->Data, sizeof (VendorOption->BootSrvType));\r
+      CopyMem (&VendorOption->BootSrvLayer, PxeOption->Data + 2, sizeof (VendorOption->BootSrvLayer));\r
       break;\r
     }\r
 \r