Changeset 77662 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.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/DxeTcpIoLib/DxeTcpIoLib.c (modified) (11 diffs)

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

@@ -3 +3 @@
   It provides the helper routines to access TCP service.
 
-Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2010 - 2017, 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
@@ -531 +531 @@
 
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.
-  @param[in]       Timeout   The time to wait for connection done.
+  @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.
 
   @retval EFI_SUCCESS            Connect to the other endpoint of the TCP socket
@@ -547 +547 @@
 TcpIoConnect (
   IN OUT TCP_IO             *TcpIo,
-  IN     EFI_EVENT          Timeout
+  IN     EFI_EVENT          Timeout        OPTIONAL
   )
 {
@@ -577 +577 @@
   }
 
-  while (!TcpIo->IsConnDone && EFI_ERROR (gBS->CheckEvent (Timeout))) {
+  while (!TcpIo->IsConnDone && ((Timeout == NULL) || EFI_ERROR (gBS->CheckEvent (Timeout)))) {
     if (TcpIo->TcpVersion == TCP_VERSION_4) {
       Tcp4->Poll (Tcp4);
@@ -586 +586 @@
 
   if (!TcpIo->IsConnDone) {
+    if (TcpIo->TcpVersion == TCP_VERSION_4) {
+      Tcp4->Cancel (Tcp4, &TcpIo->ConnToken.Tcp4Token.CompletionToken);
+    } else {
+      Tcp6->Cancel (Tcp6, &TcpIo->ConnToken.Tcp6Token.CompletionToken);
+    }
     Status = EFI_TIMEOUT;
   } else {
@@ -598 +603 @@
 
   @param[in, out]  TcpIo     The TcpIo wrapping the TCP socket.
-  @param[in]       Timeout   The time to wait for connection done.
+  @param[in]       Timeout   The time to wait for connection done. Set to NULL for infinite wait.
 
 
@@ -616 +621 @@
 TcpIoAccept (
   IN OUT TCP_IO             *TcpIo,
-  IN     EFI_EVENT          Timeout
+  IN     EFI_EVENT          Timeout        OPTIONAL
   )
 {
@@ -647 +652 @@
   }
 
-  while (!TcpIo->IsListenDone && EFI_ERROR (gBS->CheckEvent (Timeout))) {
+  while (!TcpIo->IsListenDone && ((Timeout == NULL) || EFI_ERROR (gBS->CheckEvent (Timeout)))) {
     if (TcpIo->TcpVersion == TCP_VERSION_4) {
       Tcp4->Poll (Tcp4);
@@ -656 +661 @@
 
   if (!TcpIo->IsListenDone) {
+    if (TcpIo->TcpVersion == TCP_VERSION_4) {
+      Tcp4->Cancel (Tcp4, &TcpIo->ListenToken.Tcp4Token.CompletionToken);
+    } else {
+      Tcp6->Cancel (Tcp6, &TcpIo->ListenToken.Tcp6Token.CompletionToken);
+    }
     Status = EFI_TIMEOUT;
   } else {
@@ -861 +871 @@
   @param[in]       AsyncMode   Is this receive asyncronous or not.
   @param[in]       Timeout     The time to wait for receiving the amount of data the Packet
-                               can hold.
+                               can hold. Set to NULL for infinite wait.
 
   @retval EFI_SUCCESS            The required amount of data is received from the socket.
@@ -878 +888 @@
   IN     NET_BUF            *Packet,
   IN     BOOLEAN            AsyncMode,
-  IN     EFI_EVENT          Timeout
+  IN     EFI_EVENT          Timeout       OPTIONAL
   )
 {