Changeset 81286 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Oct 15, 2019 4:37:37 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Added IMachine::clipboardFileTransfersEnabled attribute (getter/setter) for enabling/disabling the feature. Disabled by default.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• VBoxSharedClipboardSvc-transfers.cpp (modified) (2 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -197 +197 @@
 
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+int shclSvcTransferModeSet(uint32_t fMode);
 int shclSvcTransferStart(PSHCLCLIENT pClient, SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource, PSHCLTRANSFER *ppTransfer);
 int shclSvcTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer);

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp

@@ -40 +40 @@
 *   Externals                                                                                                                    *
 *********************************************************************************************************************************/
-extern SHCLEXTSTATE g_ExtState;
-extern PVBOXHGCMSVCHELPERS g_pHelpers;
+extern uint32_t             g_fTransferMode;
+extern SHCLEXTSTATE         g_ExtState;
+extern PVBOXHGCMSVCHELPERS  g_pHelpers;
+extern ClipboardClientMap   g_mapClients;
 extern ClipboardClientQueue g_listClientsDeferred;
 
@@ -2186 +2188 @@
 }
 
+/**
+ * Sets the host service's (file) transfer mode.
+ *
+ * @returns VBox status code.
+ * @param   uMode               Transfer mode to set.
+ */
+int shclSvcTransferModeSet(uint32_t fMode)
+{
+    AssertReturn(!(fMode & ~VBOX_SHCL_TRANSFER_MODE_VALID_MASK), VERR_INVALID_FLAGS);
+
+    g_fTransferMode = fMode;
+
+    LogRel2(("Shared Clipboard: Transfer mode set to 0x%x\n", g_fTransferMode));
+
+    /* If file transfers are being disabled, make sure to also reset (destroy) all pending transfers. */
+    if (g_fTransferMode == VBOX_SHCL_TRANSFER_MODE_DISABLED)
+    {
+        ClipboardClientMap::const_iterator itClient = g_mapClients.begin();
+        while (itClient != g_mapClients.end())
+        {
+            PSHCLCLIENT pClient = itClient->second;
+            AssertPtr(pClient);
+
+            shclSvcClientTransfersReset(pClient);
+
+            ++itClient;
+        }
+    }
+
+    LogFlowFuncLeaveRC(VINF_SUCCESS);
+    return VINF_SUCCESS;
+}

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -235 +235 @@
 
 static RTCRITSECT g_CritSect;
-static uint32_t g_uMode;
+/** Global Shared Clipboard mode. */
+static uint32_t g_uMode  = VBOX_SHCL_MODE_OFF;
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+/** Global Shared Clipboard (file) transfer mode. */
+uint32_t g_fTransferMode = VBOX_SHCL_TRANSFER_MODE_DISABLED;
+#endif
 
 /** Is the clipboard running in headless mode? */
@@ -1537 +1542 @@
         {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-            rc = shclSvcTransferHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
+            if (g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_ENABLED)
+            {
+                rc = shclSvcTransferHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
+            }
+            else
+                rc = VERR_ACCESS_DENIED;
 #else
             rc = VERR_NOT_IMPLEMENTED;
@@ -1637 +1647 @@
         }
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+        case VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE:
+        {
+            if (cParms != 1)
+            {
+                rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                uint32_t u32TransferMode;
+                rc = HGCMSvcGetU32(&paParms[0], &u32TransferMode);
+                if (RT_SUCCESS(rc))
+                    rc = shclSvcTransferModeSet(u32TransferMode);
+            }
+            break;
+        }
+#endif
         case VBOX_SHCL_HOST_FN_SET_HEADLESS:
         {