Changeset 58371 in vbox

Timestamp:

Oct 22, 2015 10:40:49 AM (9 years ago)

Author:

vboxsync

Message:

DnD/VbglR3: Detect and handle VM session changes and do a reconnect if necessary.

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (7 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -758 +758 @@
      *        Use a union for the HGCM stuff then. */
 
-    /** IN:  HGCM client ID to use for communication. */
+    /** HGCM client ID to use for communication. */
     uint32_t uClientID;
-    /** IN:  Protocol version to use. */
+    /** The VM's current session ID. */
+    uint64_t uSessionID;
+    /** Protocol version to use. */
     uint32_t uProtocol;
-    /** OUT: Number of parameters retrieved. */
+    /** Number of parameters retrieved for the current command. */
     uint32_t uNumParms;
-    /** IN:  Max chunk size (in bytes) for data transfers. */
+    /** Max chunk size (in bytes) for data transfers. */
     uint32_t cbMaxChunkSize;
 } VBGLR3GUESTDNDCMDCTX, *PVBGLR3GUESTDNDCMDCTX;

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1361 +1361 @@
 
     /*
+     * Get the VM's session ID.
+     * This is not fatal in case we're running with an ancient VBox version.
+     */
+    pCtx->uSessionID = 0;
+    int rc2 = VbglR3GetSessionId(&pCtx->uSessionID);
+    LogFlowFunc(("uSessionID=%RU64, rc=%Rrc\n", pCtx->uSessionID, rc2));
+
+    /*
      * Check if the host is >= VBox 5.0 which in case supports GUEST_DND_CONNECT.
      */
@@ -1368 +1376 @@
         /* The guest property service might not be available. Not fatal. */
         uint32_t uGuestPropSvcClientID;
-        int rc2 = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
+        rc2 = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
         if (RT_SUCCESS(rc2))
         {
@@ -1417 +1425 @@
         }
 
-        int rc2 = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        rc2 = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc2))
             rc2 = Msg.hdr.result; /* Not fatal. */
@@ -1464 +1472 @@
 
     int rc = vbglR3DnDGetNextMsgType(pCtx, &uMsg, &uNumParms, true /* fWait */);
+    if (RT_SUCCESS(rc))
+    {
+        /* Check for VM session change. */
+        uint64_t uSessionID;
+        int rc2 = VbglR3GetSessionId(&uSessionID);
+        if (   RT_SUCCESS(rc2)
+            && (uSessionID != pCtx->uSessionID))
+        {
+            LogFlowFunc(("VM session ID changed to %RU64, doing reconnect\n", uSessionID));
+
+            /* Try a reconnect to the DnD service. */
+            rc2 = VbglR3DnDDisconnect(pCtx);
+            AssertRC(rc2);
+            rc2 = VbglR3DnDConnect(pCtx);
+            AssertRC(rc2);
+
+            /* At this point we continue processing the messsages with the new client ID. */
+        }
+    }
+
     if (RT_SUCCESS(rc))
     {
@@ -1559 +1587 @@
     }
 
+    if (RT_FAILURE(rc))
+        LogFlowFunc(("Returning error %Rrc\n", rc));
     return rc;
 }
@@ -2068 +2098 @@
         if (strRootDest.isNotEmpty())
         {
-            void    *pvURIList = (void *)strRootDest.c_str();        /* URI root list. */
+            void *pvURIList  = (void *)strRootDest.c_str(); /* URI root list. */
             uint32_t cbURLIist = (uint32_t)strRootDest.length() + 1; /* Include string termination. */
 
@@ -2169 +2199 @@
         rc = Msg.hdr.result;
 
-    LogFlowFunc(("Sending error %Rrc returned with rc=%Rrc\n", rcErr, rc));
+    if (RT_FAILURE(rc))
+        LogFlowFunc(("Sending error %Rrc failed with rc=%Rrc\n", rcErr, rc));
     return rc;
 }