Changeset 24770 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 18, 2009 6:16:21 PM (15 years ago)

Author:

vboxsync

Message:

Main: fixed teleportation cancellation.

File:

• trunk/src/VBox/Main/ConsoleImplTeleporter.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -283 +283 @@
     AssertReturn(pState->mfIsSource, VERR_INVALID_HANDLE);
 
+    /* Poll for incoming NACKs and errors from the other side */
+    int rc = RTTcpSelectOne(pState->mhSocket, 0);
+    if (rc != VERR_TIMEOUT)
+    {
+        if (RT_SUCCESS(rc))
+        {
+            LogRel(("Teleporter/TCP: Incoming data found before write, assuming it's a cancel.\n"));
+            rc = VERR_SSM_CANCELLED;
+        }
+        else
+            LogRel(("Teleporter/TCP: RTTcpSelectOne -> %Rrc before write.\n", rc));
+        return rc;
+    }
+
     for (;;)
     {
@@ -289 +303 @@
         Hdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
         Hdr.cb       = RT_MIN((uint32_t)cbToWrite, TELEPORTERTCPHDR_MAX_SIZE);
-        int rc = RTTcpWrite(pState->mhSocket, &Hdr, sizeof(Hdr));
+        rc = RTTcpWrite(pState->mhSocket, &Hdr, sizeof(Hdr));
         if (RT_FAILURE(rc))
         {