Changeset 47695 in vbox for trunk/src/VBox/HostServices/GuestControl/service.cpp

Timestamp:

Aug 13, 2013 2:40:20 PM (11 years ago)

Author:

vboxsync

Message:

Additions/GuestCtrl: Use a separate filter mask + value for message filtering.

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/GuestControl/service.cpp

@@ -287 +287 @@
     int CopyTo(VBOXHGCMSVCPARM paDstParms[], uint32_t cDstParms) const
     {
-        LogFlowFunc(("pHostCmd=%p, mMsgType=%RU32, mParmCount=%RU32, mContextID=%RU32\n",
-                     this, mMsgType, mParmCount, mContextID));
+        LogFlowFunc(("pHostCmd=%p, mMsgType=%RU32, mParmCount=%RU32, mContextID=%RU32 (Session %RU32)\n",
+                     this, mMsgType, mParmCount, mContextID, VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(mContextID)));
 
         int rc = VINF_SUCCESS;
@@ -478 +478 @@
         : mSvcHelpers(NULL),
           mID(0),
-          mFlags(0), mContextFilter(0),
+          mFlags(0),
+          mFilterMask(0), mFilterValue(0),
           mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
           mHostCmdTS(0),
@@ -487 +488 @@
         : mSvcHelpers(pSvcHelpers),
           mID(uClientID),
-          mFlags(0), mContextFilter(0),
+          mFlags(0),
+          mFilterMask(0), mFilterValue(0),
           mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
           mHostCmdTS(0),
@@ -571 +573 @@
         if (mFlags & CLIENTSTATE_FLAG_CONTEXTFILTER)
         {
-            fWant =
-                (pHostCmd->mContextID & mContextFilter) == pHostCmd->mContextID;
+            fWant = (pHostCmd->mContextID & mFilterMask) == mFilterValue;
         }
         else /* Client is interested in all commands. */
             fWant = true;
 
-        LogFlowFunc(("[Client %RU32] mFlags=0x%x, mContextID=%RU32 (session %RU32), mContextFilter=0x%x, fWant=%RTbool\n",
+        LogFlowFunc(("[Client %RU32] mFlags=0x%x, mContextID=%RU32 (session %RU32), mFilterMask=0x%x, mFilterValue=%RU32, fWant=%RTbool\n",
                      mID, mFlags, pHostCmd->mContextID,
                      VBOX_GUESTCTRL_CONTEXTID_GET_SESSION(pHostCmd->mContextID),
-                     mContextFilter, fWant));
+                     mFilterMask, mFilterValue, fWant));
 
         return fWant;
@@ -831 +832 @@
     /** Client flags. @sa CLIENTSTATE_FLAG_ flags. */
     uint32_t mFlags;
-    /** The context ID filter, based on the flags set. */
-    uint32_t mContextFilter;
+    /** The context ID filter mask, if any. */
+    uint32_t mFilterMask;
+    /** The context ID filter value, if any. */
+    uint32_t mFilterValue;
     /** Host command list to process. */
     HostCmdList mHostCmdList;
@@ -1152 +1155 @@
         return VERR_NOT_FOUND; /* Should never happen. */
 
-    if (cParms != 3)
+    if (cParms != 4)
         return VERR_INVALID_PARAMETER;
 
-    uint32_t uMaskAdd, uMaskRemove;
-    int rc = paParms[0].getUInt32(&uMaskAdd);
+    uint32_t uValue, uMaskAdd, uMaskRemove;
+    int rc = paParms[0].getUInt32(&uValue);
     if (RT_SUCCESS(rc))
-        rc = paParms[1].getUInt32(&uMaskRemove);
+        rc = paParms[1].getUInt32(&uMaskAdd);
+    if (RT_SUCCESS(rc))
+        rc = paParms[2].getUInt32(&uMaskRemove);
+    /** @todo paParm[3] (flags) not used yet. */
     if (RT_SUCCESS(rc))
     {
@@ -1165 +1171 @@
         clientState.mFlags |= CLIENTSTATE_FLAG_CONTEXTFILTER;
         if (uMaskAdd)
-            clientState.mContextFilter |= uMaskAdd;
+            clientState.mFilterMask |= uMaskAdd;
         if (uMaskRemove)
-            clientState.mContextFilter &= ~uMaskRemove;
-
-        LogFlowFunc(("[Client %RU32] Setting message filter=0x%x set (flags=0x%x, maskAdd=0x%x, maskRemove=0x%x)\n",
-                     u32ClientID, clientState.mContextFilter, clientState.mFlags,
-                     uMaskAdd, uMaskRemove));
+            clientState.mFilterMask &= ~uMaskRemove;
+
+        clientState.mFilterValue = uValue;
+
+        LogFlowFunc(("[Client %RU32] Setting message filterMask=0x%x, filterVal=%RU32 set (flags=0x%x, maskAdd=0x%x, maskRemove=0x%x)\n",
+                     u32ClientID, clientState.mFilterMask, clientState.mFilterValue,
+                     clientState.mFlags, uMaskAdd, uMaskRemove));
     }
 
@@ -1196 +1204 @@
 
     clientState.mFlags &= ~CLIENTSTATE_FLAG_CONTEXTFILTER;
-    clientState.mContextFilter = 0;
+    clientState.mFilterMask = 0;
+    clientState.mFilterValue = 0;
 
     LogFlowFunc(("[Client %RU32} Unset message filter\n", u32ClientID));