MdeModulePkg/PrintLib: Add safe print functions [A|U]ValueToStringS

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

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index afcde8199a5ccff9eb3d1938c7bd2a0d40e3475d..4861095435e6b13eadd2d83856219addb2344b8d 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -1,8 +1,8 @@
 /** @file\r
   Help functions to access UDP service, it is used by both the DHCP and MTFTP.\r
 \r
-Copyright (c) 2005 - 2009, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2005 - 2016, Intel Corporation. All rights reserved.<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<BR>\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -130,6 +130,7 @@ UdpIoOnDgramSent (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 UdpIoRecycleDgram (\r
   IN VOID                   *Context\r
   )\r
@@ -214,6 +215,12 @@ UdpIoOnDgramRcvdDpc (
   // Build a NET_BUF from the UDP receive data, then deliver it up.\r
   //\r
   if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
+    if (((EFI_UDP4_RECEIVE_DATA *) RxData)->DataLength == 0) {\r
+      //\r
+      // Discard zero length data payload packet.\r
+      //\r
+      goto Resume;\r
+    }\r
 \r
     Netbuf = NetbufFromExt (\r
                (NET_FRAGMENT *)((EFI_UDP4_RECEIVE_DATA *) RxData)->FragmentTable,\r
@@ -251,6 +258,12 @@ UdpIoOnDgramRcvdDpc (
     EndPoint.LocalAddr.Addr[0]  = NTOHL (EndPoint.LocalAddr.Addr[0]);\r
     EndPoint.RemoteAddr.Addr[0] = NTOHL (EndPoint.RemoteAddr.Addr[0]);\r
   } else {\r
+    if (((EFI_UDP6_RECEIVE_DATA *) RxData)->DataLength == 0) {\r
+      //\r
+      // Discard zero length data payload packet.\r
+      //\r
+      goto Resume;\r
+    }\r
 \r
     Netbuf = NetbufFromExt (\r
                (NET_FRAGMENT *)((EFI_UDP6_RECEIVE_DATA *) RxData)->FragmentTable,\r
@@ -290,6 +303,16 @@ UdpIoOnDgramRcvdDpc (
   }\r
 \r
   RxToken->CallBack (Netbuf, &EndPoint, EFI_SUCCESS, RxToken->Context);\r
+  return;\r
+\r
+Resume:\r
+  if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {\r
+    gBS->SignalEvent (((EFI_UDP4_RECEIVE_DATA *) RxData)->RecycleSignal);\r
+    RxToken->UdpIo->Protocol.Udp4->Receive (RxToken->UdpIo->Protocol.Udp4, &RxToken->Token.Udp4);\r
+  } else {\r
+    gBS->SignalEvent (((EFI_UDP6_RECEIVE_DATA *) RxData)->RecycleSignal);\r
+    RxToken->UdpIo->Protocol.Udp6->Receive (RxToken->UdpIo->Protocol.Udp6, &RxToken->Token.Udp6);\r
+  }\r
 }\r
 \r
 /**\r
@@ -803,7 +826,7 @@ UdpIoFreeIo (
     }\r
 \r
     //\r
-    // Close then destory the Udp4 child\r
+    // Close then destroy the Udp4 child\r
     //\r
     gBS->CloseProtocol (\r
            UdpIo->UdpHandle,\r
@@ -826,7 +849,7 @@ UdpIoFreeIo (
     }\r
 \r
     //\r
-    // Close then destory the Udp6 child\r
+    // Close then destroy the Udp6 child\r
     //\r
     gBS->CloseProtocol (\r
            UdpIo->UdpHandle,\r
@@ -970,6 +993,7 @@ UdpIoSendDatagram (
   @retval FALSE             The packet is not to be cancelled.\r
 **/\r
 BOOLEAN\r
+EFIAPI\r
 UdpIoCancelSingleDgram (\r
   IN UDP_TX_TOKEN           *Token,\r
   IN VOID                   *Context\r