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

Timestamp:

Oct 13, 2009 1:04:29 PM (15 years ago)

Author:

vboxsync

Message:

Main/LiveMigration: Make sure the end-of-stream marker is read before ACK'ing the load command.

File:

• trunk/src/VBox/Main/ConsoleImpl-LiveMigration.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImpl-LiveMigration.cpp

@@ -166 +166 @@
 
     AssertReturn(cchBuf > 1, VERR_INTERNAL_ERROR);
-
-    /* dead simple (stupid) approach. */
+    *pszBuf = '\0';
+
+    /* dead simple approach. */
     for (;;)
     {
@@ -174 +175 @@
         if (RT_FAILURE(rc))
         {
-            *pszBuf = '\0';
             LogRel(("Migration: RTTcpRead -> %Rrc while reading string ('%s')\n", rc, pszStart));
             return rc;
@@ -180 +180 @@
         if (    ch == '\n'
             ||  ch == '\0')
-        {
-            *pszBuf = '\0';
             return VINF_SUCCESS;
-        }
         if (cchBuf <= 1)
         {
-            *pszBuf = '\0';
             LogRel(("Migration: String buffer overflow: '%s'\n", pszStart));
             return VERR_BUFFER_OVERFLOW;
         }
         *pszBuf++ = ch;
+        *pszBuf = '\0';
         cchBuf--;
     }
@@ -953 +950 @@
             }
 
+            /* The EOS might not have been read, make sure it is. */
+            pState->mfStopReading = false;
+            size_t cbRead;
+            vrc = migrationTcpOpRead(pvUser, pState->moffStream, szCmd, 1, &cbRead);
+            if (vrc != VERR_EOF)
+            {
+                LogRel(("Migration: Draining migrationTcpOpRead -> %Rrc\n", vrc));
+                migrationTcpWriteNACK(pState, vrc);
+                break;
+            }
+
             vrc = migrationTcpWriteACK(pState);
             if (RT_FAILURE(vrc))