Changeset 80468 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Aug 28, 2019 9:57:23 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Made the event source and event IDs more non-deterministic.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp (modified) (12 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp

@@ -24 +24 @@
 #include <iprt/semaphore.h>
 #include <iprt/path.h>
+#include <iprt/rand.h>
 
 #include <iprt/errcore.h>
@@ -35 +36 @@
  *
  * @returns VBox status code.
- * @param   uID                 Event ID to associate payload to.
+ * @param   uID                 Payload ID to set for this payload. Useful for consequtive payloads.
  * @param   pvData              Data block to associate to this payload.
  * @param   cbData              Size (in bytes) of data block to associate.
@@ -97 +98 @@
  * @returns VBox status code.
  * @param   pEvent              Event to initialize.
- * @param   uID                 ID to use for the event.
- */
-int SharedClipboardEventCreate(PSHAREDCLIPBOARDEVENT pEvent, uint16_t uID)
+ * @param   uID                 Event ID to use.
+ */
+int SharedClipboardEventCreate(PSHAREDCLIPBOARDEVENT pEvent, VBOXCLIPBOARDEVENTID uID)
 {
     AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
@@ -145 +146 @@
  * @param   uID                 ID to use for event source.
  */
-int SharedClipboardEventSourceCreate(PSHAREDCLIPBOARDEVENTSOURCE pSource, uint16_t uID)
+int SharedClipboardEventSourceCreate(PSHAREDCLIPBOARDEVENTSOURCE pSource, VBOXCLIPBOARDEVENTSOURCEID uID)
 {
     AssertPtrReturn(pSource, VERR_INVALID_POINTER);
@@ -156 +157 @@
 
     pSource->uID          = uID;
-    pSource->uEventIDNext = 1; /* Event ID 0 always is reserved (marks "unused"). */
+    /* Choose a random event ID starting point. */
+    pSource->uEventIDNext = RTRandU32() % VBOX_SHARED_CLIPBOARD_MAX_EVENTS;
 
     LogFlowFuncLeaveRC(rc);
@@ -189 +191 @@
  * @param   pSource             Event source to generate event for.
  */
-uint16_t SharedClipboardEventIDGenerate(PSHAREDCLIPBOARDEVENTSOURCE pSource)
+VBOXCLIPBOARDEVENTID SharedClipboardEventIDGenerate(PSHAREDCLIPBOARDEVENTSOURCE pSource)
 {
     AssertPtrReturn(pSource, 0);
 
     LogFlowFunc(("uSource=%RU16: New event: %RU16\n", pSource->uID, pSource->uEventIDNext));
-    return pSource->uEventIDNext++; /** @todo Improve this. */
+    return pSource->uEventIDNext++; /** @todo Handle rollovers? */
 }
 
@@ -204 +206 @@
  * @param   uID                 Event ID to get.
  */
-inline PSHAREDCLIPBOARDEVENT sharedClipboardEventGet(PSHAREDCLIPBOARDEVENTSOURCE pSource, uint16_t uID)
+inline PSHAREDCLIPBOARDEVENT sharedClipboardEventGet(PSHAREDCLIPBOARDEVENTSOURCE pSource, VBOXCLIPBOARDEVENTID uID)
 {
     PSHAREDCLIPBOARDEVENT pEvIt;
@@ -223 +225 @@
  * @param   uID                 Event ID to register.
  */
-int SharedClipboardEventRegister(PSHAREDCLIPBOARDEVENTSOURCE pSource, uint16_t uID)
+int SharedClipboardEventRegister(PSHAREDCLIPBOARDEVENTSOURCE pSource, VBOXCLIPBOARDEVENTID uID)
 {
     AssertPtrReturn(pSource, VERR_INVALID_POINTER);
@@ -266 +268 @@
  * @param   uID                 Event ID to unregister.
  */
-int SharedClipboardEventUnregister(PSHAREDCLIPBOARDEVENTSOURCE pSource, uint16_t uID)
+int SharedClipboardEventUnregister(PSHAREDCLIPBOARDEVENTSOURCE pSource, VBOXCLIPBOARDEVENTID uID)
 {
     AssertPtrReturn(pSource, VERR_INVALID_POINTER);
@@ -305 +307 @@
  *                              SharedClipboardPayloadFree().
  */
-int SharedClipboardEventWait(PSHAREDCLIPBOARDEVENTSOURCE pSource, uint16_t uID, RTMSINTERVAL uTimeoutMs,
+int SharedClipboardEventWait(PSHAREDCLIPBOARDEVENTSOURCE pSource, VBOXCLIPBOARDEVENTID uID, RTMSINTERVAL uTimeoutMs,
                              PSHAREDCLIPBOARDEVENTPAYLOAD* ppPayload)
 {
@@ -340 +342 @@
  * @param   pPayload            Event payload to associate. Takes ownership. Optional.
  */
-int SharedClipboardEventSignal(PSHAREDCLIPBOARDEVENTSOURCE pSource, uint16_t uID,
+int SharedClipboardEventSignal(PSHAREDCLIPBOARDEVENTSOURCE pSource, VBOXCLIPBOARDEVENTID uID,
                                PSHAREDCLIPBOARDEVENTPAYLOAD pPayload)
 {
@@ -376 +378 @@
  * @param   uID                 Event ID to detach payload for.
  */
-void SharedClipboardEventPayloadDetach(PSHAREDCLIPBOARDEVENTSOURCE pSource, uint16_t uID)
+void SharedClipboardEventPayloadDetach(PSHAREDCLIPBOARDEVENTSOURCE pSource, VBOXCLIPBOARDEVENTID uID)
 {
     AssertPtrReturnVoid(pSource);