Changeset 77662 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c

Timestamp:

Mar 12, 2019 12:40:12 PM (6 years ago)

Author:

vboxsync

Message:

EFI: First step in UDK2018 merge. Does not build yet.

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c (modified) (17 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c

@@ -2 +2 @@
   Help functions to access UDP service, it is used by both the DHCP and MTFTP.
 
-Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -216 +216 @@
   //
   if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {
+    if (((EFI_UDP4_RECEIVE_DATA *) RxData)->DataLength == 0) {
+      //
+      // Discard zero length data payload packet.
+      //
+      goto Resume;
+    }
 
     Netbuf = NetbufFromExt (
@@ -253 +259 @@
     EndPoint.RemoteAddr.Addr[0] = NTOHL (EndPoint.RemoteAddr.Addr[0]);
   } else {
+    if (((EFI_UDP6_RECEIVE_DATA *) RxData)->DataLength == 0) {
+      //
+      // Discard zero length data payload packet.
+      //
+      goto Resume;
+    }
 
     Netbuf = NetbufFromExt (
@@ -292 +304 @@
 
   RxToken->CallBack (Netbuf, &EndPoint, EFI_SUCCESS, RxToken->Context);
+  return;
+
+Resume:
+  if (RxToken->UdpIo->UdpVersion == UDP_IO_UDP4_VERSION) {
+    gBS->SignalEvent (((EFI_UDP4_RECEIVE_DATA *) RxData)->RecycleSignal);
+    RxToken->UdpIo->Protocol.Udp4->Receive (RxToken->UdpIo->Protocol.Udp4, &RxToken->Token.Udp4);
+  } else {
+    gBS->SignalEvent (((EFI_UDP6_RECEIVE_DATA *) RxData)->RecycleSignal);
+    RxToken->UdpIo->Protocol.Udp6->Receive (RxToken->UdpIo->Protocol.Udp6, &RxToken->Token.Udp6);
+  }
 }
 
@@ -389 +411 @@
   Wrap a transmit request into a new created UDP_TX_TOKEN.
 
+  If Packet is NULL, then ASSERT().
+  If Udp version is not UDP_IO_UDP4_VERSION or UDP_IO_UDP6_VERSION, then ASSERT().
+
   @param[in]  UdpIo                 The UdpIo to send packet to.
   @param[in]  Packet                The user's packet.
@@ -558 +583 @@
   Creates a UDP_IO to access the UDP service. It creates and configures
   a UDP child.
+
+  If Configure is NULL, then ASSERT().
+  If Udp version is not UDP_IO_UDP4_VERSION or UDP_IO_UDP6_VERSION, then ASSERT().
 
   It locates the UDP service binding prototype on the Controller parameter
@@ -728 +756 @@
 /**
   Cancel all the sent datagram that pass the selection criteria of ToCancel.
+
   If ToCancel is NULL, all the datagrams are cancelled.
+  If Udp version is not UDP_IO_UDP4_VERSION or UDP_IO_UDP6_VERSION, then ASSERT().
 
   @param[in]  UdpIo                 The UDP_IO to cancel packet.
@@ -743 +773 @@
   IN EFI_STATUS             IoStatus,
   IN UDP_IO_TO_CANCEL       ToCancel,        OPTIONAL
-  IN VOID                   *Context
+  IN VOID                   *Context         OPTIONAL
   )
 {
@@ -770 +800 @@
   Free the UDP_IO and all its related resources.
 
+  If Udp version is not UDP_IO_UDP4_VERSION or UDP_IO_UDP6_VERSION, then ASSERT().
+
   The function will cancel all sent datagram and receive request.
 
@@ -775 +807 @@
 
   @retval EFI_SUCCESS           The UDP_IO is freed.
+  @retval Others                Failed to free UDP_IO.
 
 **/
@@ -783 +816 @@
   )
 {
+  EFI_STATUS           Status;
   UDP_RX_TOKEN         *RxToken;
 
@@ -801 +835 @@
 
     if ((RxToken = UdpIo->RecvRequest) != NULL) {
-      UdpIo->Protocol.Udp4->Cancel (UdpIo->Protocol.Udp4, &RxToken->Token.Udp4);
+      Status = UdpIo->Protocol.Udp4->Cancel (UdpIo->Protocol.Udp4, &RxToken->Token.Udp4);
+      if (EFI_ERROR (Status)) {
+        return Status;
+      }
     }
 
@@ -807 +844 @@
     // Close then destroy the Udp4 child
     //
-    gBS->CloseProtocol (
-           UdpIo->UdpHandle,
-           &gEfiUdp4ProtocolGuid,
-           UdpIo->Image,
-           UdpIo->Controller
-           );
-
-    NetLibDestroyServiceChild (
-      UdpIo->Controller,
-      UdpIo->Image,
-      &gEfiUdp4ServiceBindingProtocolGuid,
-      UdpIo->UdpHandle
-      );
+    Status = gBS->CloseProtocol (
+                    UdpIo->UdpHandle,
+                    &gEfiUdp4ProtocolGuid,
+                    UdpIo->Image,
+                    UdpIo->Controller
+                    );
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+
+    Status = NetLibDestroyServiceChild (
+               UdpIo->Controller,
+               UdpIo->Image,
+               &gEfiUdp4ServiceBindingProtocolGuid,
+               UdpIo->UdpHandle
+               );
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
 
   } else {
 
     if ((RxToken = UdpIo->RecvRequest) != NULL) {
-      UdpIo->Protocol.Udp6->Cancel (UdpIo->Protocol.Udp6, &RxToken->Token.Udp6);
+      Status = UdpIo->Protocol.Udp6->Cancel (UdpIo->Protocol.Udp6, &RxToken->Token.Udp6);
+      if (EFI_ERROR (Status)) {
+        return Status;
+      }
     }
 
@@ -830 +876 @@
     // Close then destroy the Udp6 child
     //
-    gBS->CloseProtocol (
-           UdpIo->UdpHandle,
-           &gEfiUdp6ProtocolGuid,
-           UdpIo->Image,
-           UdpIo->Controller
-           );
-
-    NetLibDestroyServiceChild (
-      UdpIo->Controller,
-      UdpIo->Image,
-      &gEfiUdp6ServiceBindingProtocolGuid,
-      UdpIo->UdpHandle
-      );
-    }
+    Status = gBS->CloseProtocol (
+               UdpIo->UdpHandle,
+               &gEfiUdp6ProtocolGuid,
+               UdpIo->Image,
+               UdpIo->Controller
+               );
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+
+    Status = NetLibDestroyServiceChild (
+               UdpIo->Controller,
+               UdpIo->Image,
+               &gEfiUdp6ServiceBindingProtocolGuid,
+               UdpIo->UdpHandle
+               );
+    if (EFI_ERROR (Status)) {
+      return Status;
+    }
+  }
 
   if (!IsListEmpty(&UdpIo->Link)) {
@@ -857 +909 @@
   Clean up the UDP_IO without freeing it. The function is called when
   user wants to re-use the UDP_IO later.
+
+  If Udp version is not UDP_IO_UDP4_VERSION or UDP_IO_UDP6_VERSION, then ASSERT().
 
   It will release all the transmitted datagrams and receive request. It will
@@ -898 +952 @@
 /**
   Send a packet through the UDP_IO.
+
+  If Udp version is not UDP_IO_UDP4_VERSION or UDP_IO_UDP6_VERSION, then ASSERT().
 
   The packet will be wrapped in UDP_TX_TOKEN. Function Callback will be called
@@ -1009 +1065 @@
   Issue a receive request to the UDP_IO.
 
+  If Udp version is not UDP_IO_UDP4_VERSION or UDP_IO_UDP6_VERSION, then ASSERT().
+
   This function is called when upper-layer needs packet from UDP for processing.
   Only one receive request is acceptable at a time so a common usage model is