X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=NetworkPkg%2FUefiPxeBcDxe%2FPxeBcImpl.c;h=5f693729d612d2fa274261c2aadf6f0f8b8518e3;hp=ba7f9485949ef74f36a8c3b77ab93d2a7d570f4d;hb=9063c328dff827ef9deb1ce0dde75112c496e072;hpb=db999bd39b90f3515ac66c33534bd6ac95113e4d

diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
index ba7f948594..5f693729d6 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
@@ -529,6 +529,7 @@ EfiPxeBcDiscover (
   UINT16                          Index;
   EFI_STATUS                      Status;
   EFI_PXE_BASE_CODE_IP_FILTER     IpFilter;
+  EFI_PXE_BASE_CODE_DISCOVER_INFO *NewCreatedInfo;
 
   if (This == NULL) {
     return EFI_INVALID_PARAMETER;
@@ -541,6 +542,7 @@ EfiPxeBcDiscover (
   SrvList                 = NULL;
   Status                  = EFI_DEVICE_ERROR;
   Private->Function       = EFI_PXE_BASE_CODE_FUNCTION_DISCOVER;
+  NewCreatedInfo          = NULL;
 
   if (!Mode->Started) {
     return EFI_NOT_STARTED;
@@ -594,12 +596,12 @@ EfiPxeBcDiscover (
     //
     // 2. Extract the discover information from the cached packets if unspecified.
     //
-    Info   = &DefaultInfo;
-    Status = PxeBcExtractDiscoverInfo (Private, Type, Info, &BootSvrEntry, &SrvList);
+    NewCreatedInfo = &DefaultInfo;
+    Status = PxeBcExtractDiscoverInfo (Private, Type, &NewCreatedInfo, &BootSvrEntry, &SrvList);
     if (EFI_ERROR (Status)) {
       goto ON_EXIT;
     }
-
+    Info = NewCreatedInfo;
   } else {
     //
     // 3. Take the pass-in information as the discover info, and validate the server list.
@@ -634,30 +636,7 @@ EfiPxeBcDiscover (
 
   Private->IsDoDiscover = TRUE;
 
-  if (Info->UseUCast) {
-    //
-    // Do discover by unicast.
-    //
-    for (Index = 0; Index < Info->IpCnt; Index++) {
-      if (BootSvrEntry == NULL) {
-        CopyMem (&Private->ServerIp, &SrvList[Index].IpAddr, sizeof (EFI_IP_ADDRESS));
-      } else {
-        ASSERT (!Mode->UsingIpv6);
-        ZeroMem (&Private->ServerIp, sizeof (EFI_IP_ADDRESS));
-        CopyMem (&Private->ServerIp, &BootSvrEntry->IpAddr[Index], sizeof (EFI_IPv4_ADDRESS));
-      }
-
-      Status = PxeBcDiscoverBootServer (
-                 Private,
-                 Type,
-                 Layer,
-                 UseBis,
-                 &SrvList[Index].IpAddr,
-                 0,
-                 NULL
-                 );
-    }
-  } else if (Info->UseMCast) {
+  if (Info->UseMCast) {
     //
     // Do discover by multicast.
     //
@@ -667,8 +646,8 @@ EfiPxeBcDiscover (
                Layer,
                UseBis,
                &Info->ServerMCastIp,
-               0,
-               NULL
+               Info->IpCnt,
+               SrvList
                );
 
   } else if (Info->UseBCast) {
@@ -685,6 +664,30 @@ EfiPxeBcDiscover (
                Info->IpCnt,
                SrvList
                );
+
+  } else if (Info->UseUCast) {
+    //
+    // Do discover by unicast.
+    //
+    for (Index = 0; Index < Info->IpCnt; Index++) {
+      if (BootSvrEntry == NULL) {
+        CopyMem (&Private->ServerIp, &SrvList[Index].IpAddr, sizeof (EFI_IP_ADDRESS));
+      } else {
+        ASSERT (!Mode->UsingIpv6);
+        ZeroMem (&Private->ServerIp, sizeof (EFI_IP_ADDRESS));
+        CopyMem (&Private->ServerIp, &BootSvrEntry->IpAddr[Index], sizeof (EFI_IPv4_ADDRESS));
+      }
+
+      Status = PxeBcDiscoverBootServer (
+                 Private,
+                 Type,
+                 Layer,
+                 UseBis,
+                 &Private->ServerIp,
+                 Info->IpCnt,
+                 SrvList
+                 );
+      }
   }
 
   if (EFI_ERROR (Status)) {
@@ -698,8 +701,8 @@ EfiPxeBcDiscover (
       if (!EFI_ERROR (Status)) {
         CopyMem (
           &Mode->PxeReply.Dhcpv6,
-          &Private->PxeReply.Dhcp6.Packet.Offer,
-          Private->PxeReply.Dhcp6.Packet.Offer.Length
+          &Private->PxeReply.Dhcp6.Packet.Ack.Dhcp6,
+          Private->PxeReply.Dhcp6.Packet.Ack.Length
           );
         Mode->PxeReplyReceived = TRUE;
         Mode->PxeDiscoverValid = TRUE;
@@ -709,8 +712,8 @@ EfiPxeBcDiscover (
       if (!EFI_ERROR (Status)) {
         CopyMem (
           &Mode->PxeReply.Dhcpv4,
-          &Private->PxeReply.Dhcp4.Packet.Offer,
-          Private->PxeReply.Dhcp4.Packet.Offer.Length
+          &Private->PxeReply.Dhcp4.Packet.Ack.Dhcp4,
+          Private->PxeReply.Dhcp4.Packet.Ack.Length
           );
         Mode->PxeReplyReceived = TRUE;
         Mode->PxeDiscoverValid = TRUE;
@@ -720,6 +723,10 @@ EfiPxeBcDiscover (
 
 ON_EXIT:
 
+  if (NewCreatedInfo != NULL && NewCreatedInfo != &DefaultInfo) {
+    FreePool (NewCreatedInfo);
+  }
+  
   if (Mode->UsingIpv6) {
     Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);
   } else {