Sync one bug on PxeBC module from R8.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3782 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
index 3e04c0d77e1bbfa742a95afa5fafa2488d68fe02..a61b6acff7865a3ebb94366567154da4ad4dec7c 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
@@ -1421,7 +1421,7 @@ DeclineOffer (
     OP_PAD\r
     );\r
   DHCPDECLINEoptions.DhcpMessageType.Type = DHCPDECLINE;\r
     OP_PAD\r
     );\r
   DHCPDECLINEoptions.DhcpMessageType.Type = DHCPDECLINE;\r

-  CopyMem (&DHCPDECLINEoptions.OpDeclineEnd, &DHCP_REQ_OPTIONS, sizeof (struct requestopendstr));\r
+  CopyMem (&DHCPDECLINEoptions.OpDeclineEnd, &DHCP_REQ_OPTIONS, sizeof (DHCPDECLINEoptions.OpDeclineEnd));\r

 \r
   {\r
     EFI_IP_ADDRESS  TmpIp;\r
 \r
   {\r
     EFI_IP_ADDRESS  TmpIp;\r


@@ -1729,8 +1729,7 @@ TryFinishDORA (
   //\r
   DhcpRxBuf = &DHCPV4_ACK_BUFFER;\r
   DHCPV4_OPTIONS_BUFFER.DhcpMessageType.Type  = DHCPREQUEST;\r
   //\r
   DhcpRxBuf = &DHCPV4_ACK_BUFFER;\r
   DHCPV4_OPTIONS_BUFFER.DhcpMessageType.Type  = DHCPREQUEST;\r

-  CopyMem (&DHCP_REQ_OPTIONS, &RequestOpEndStr, sizeof (RequestOpEndStr));\r
-//  DHCP_REQ_OPTIONS = RequestOpEndStr;\r
+  CopyMem (&DHCP_REQ_OPTIONS, &RequestOpEndStr, sizeof (DHCP_REQ_OPTIONS));\r

   DHCP_REQ_OPTIONS.OpReqIP.Ip = *(EFI_IPv4_ADDRESS *) &RxBuf[OfferIx].u.Dhcpv4.yiaddr;\r
 \r
   CopyMem (\r
   DHCP_REQ_OPTIONS.OpReqIP.Ip = *(EFI_IPv4_ADDRESS *) &RxBuf[OfferIx].u.Dhcpv4.yiaddr;\r
 \r
   CopyMem (\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
index 6a42646ab3de5603937b9f3ccab82a5d63421ddb..b065a53f3a31d290ae671187ce08bf7de5fc2020 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
@@ -778,7 +778,7 @@ MtftpListen (
   //\r
   do {\r
     if ((SaveReplyLen = ReplyLen) > BufferSize) {\r
   //\r
   do {\r
     if ((SaveReplyLen = ReplyLen) > BufferSize) {\r

-      SaveReplyLen = (UINTN) BufferSize;\r
+      SaveReplyLen = 0;\r

     }\r
 \r
     /* %%TBD - add big block number support */\r
     }\r
 \r
     /* %%TBD - add big block number support */\r


@@ -1818,8 +1818,10 @@ PxeBcMtftp (
     *(PacketSizePtr = &PacketSize) = MAX_TFTP_PKT_SIZE;\r
   }\r
 \r
     *(PacketSizePtr = &PacketSize) = MAX_TFTP_PKT_SIZE;\r
   }\r
 \r

-  if (*PacketSizePtr > *BufferSizePtr) {\r
-    *PacketSizePtr = (UINTN) *BufferSizePtr;\r
+  if ((*PacketSizePtr > *BufferSizePtr) &&\r
+    (Operation != EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE) &&\r
+    (Operation != EFI_PXE_BASE_CODE_MTFTP_GET_FILE_SIZE)) {\r
+    *PacketSizePtr = MAX ((UINTN) *BufferSizePtr, MIN_TFTP_PKT_SIZE);\r

   }\r
 \r
   if (*PacketSizePtr < MIN_TFTP_PKT_SIZE) {\r
   }\r
 \r
   if (*PacketSizePtr < MIN_TFTP_PKT_SIZE) {\r