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

Timestamp:

Nov 24, 2009 3:45:00 PM (15 years ago)

Author:

vboxsync

Message:

SSM,Main: Fixed error propagation on the target side so that a source side cancellation ends up a s VERR_SSM_CANCELLED instead of VERR_SSM_LOADED_TOO_MUCH.

File:

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

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -148 +148 @@
     uint32_t    u32Magic;
     /** The size of the data block following this header.
-     * 0 indicates the end of the stream. */
+     * 0 indicates the end of the stream, while UINT32_MAX indicates
+     * cancelation. */
     uint32_t    cb;
 } TELEPORTERTCPHDR;
@@ -388 +389 @@
                 return rc;
             }
-            if (   Hdr.u32Magic != TELEPORTERTCPHDR_MAGIC
-                || Hdr.cb > TELEPORTERTCPHDR_MAX_SIZE)
-            {
+
+            if (RT_UNLIKELY(   Hdr.u32Magic != TELEPORTERTCPHDR_MAGIC
+                            || Hdr.cb > TELEPORTERTCPHDR_MAX_SIZE
+                            || Hdr.cb == 0))
+            {
+                if (    Hdr.u32Magic == TELEPORTERTCPHDR_MAGIC
+                    &&  (   Hdr.cb == 0
+                         || Hdr.cb == UINT32_MAX)
+                   )
+                {
+                    pState->mfEndOfStream = true;
+                    pState->mcbReadBlock  = 0;
+                    return Hdr.cb ? VERR_SSM_CANCELLED : VERR_EOF;
+                }
                 pState->mfIOError = true;
                 LogRel(("Teleporter/TCP: Invalid block: u32Magic=%#x cb=%#x\n", Hdr.u32Magic, Hdr.cb));
@@ -397 +409 @@
 
             pState->mcbReadBlock = Hdr.cb;
-            if (!Hdr.cb)
-            {
-                pState->mfEndOfStream = true;
-                return VERR_EOF;
-            }
-
             if (pState->mfStopReading)
                 return VERR_EOF;
@@ -499 +505 @@
  * @copydoc SSMSTRMOPS::pfnClose
  */
-static DECLCALLBACK(int) teleporterTcpOpClose(void *pvUser)
+static DECLCALLBACK(int) teleporterTcpOpClose(void *pvUser, bool fCancelled)
 {
     TeleporterState *pState = (TeleporterState *)pvUser;
@@ -505 +511 @@
     if (pState->mfIsSource)
     {
-        TELEPORTERTCPHDR EofHdr = { TELEPORTERTCPHDR_MAGIC, 0 };
+        TELEPORTERTCPHDR EofHdr;
+        EofHdr.u32Magic = TELEPORTERTCPHDR_MAGIC;
+        EofHdr.cb       = fCancelled ? UINT32_MAX : 0;
         int rc = RTTcpWrite(pState->mhSocket, &EofHdr, sizeof(EofHdr));
         if (RT_SUCCESS(rc))