Changeset 43697 in vbox for trunk/src/VBox/HostServices

Timestamp:

Oct 22, 2012 3:03:03 PM (12 years ago)

Author:

vboxsync

Message:

GuestProperties: complete a notification request if the client submits exactly the same request.

File:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (6 diffs)

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

@@ -134 +134 @@
 struct GuestCall
 {
+    uint32_t u32ClientId;
     /** The call handle */
     VBOXHGCMCALLHANDLE mHandle;
@@ -144 +145 @@
 
     /** The standard constructor */
-    GuestCall() : mFunction(0) {}
+    GuestCall() : u32ClientId(0), mFunction(0) {}
     /** The normal constructor */
-    GuestCall(VBOXHGCMCALLHANDLE aHandle, uint32_t aFunction,
+    GuestCall(uint32_t aClientId, VBOXHGCMCALLHANDLE aHandle, uint32_t aFunction,
               VBOXHGCMSVCPARM aParms[], int aRc)
-              : mHandle(aHandle), mFunction(aFunction), mParms(aParms),
+              : u32ClientId(aClientId), mHandle(aHandle), mFunction(aFunction), mParms(aParms),
                 mRc(aRc) {}
 };
@@ -371 +372 @@
     int delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGuest);
     int enumProps(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
-    int getNotification(VBOXHGCMCALLHANDLE callHandle, uint32_t cParms,
+    int getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms,
                         VBOXHGCMSVCPARM paParms[]);
     int getOldNotificationInternal(const char *pszPattern,
@@ -1014 +1015 @@
  * @throws  can throw std::bad_alloc
  */
-int Service::getNotification(VBOXHGCMCALLHANDLE callHandle, uint32_t cParms,
+int Service::getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms,
                              VBOXHGCMSVCPARM paParms[])
 {
@@ -1047 +1048 @@
     if (RT_SUCCESS(rc) && prop.isNull())
     {
-        mGuestWaiters.push_back(GuestCall(callHandle, GET_NOTIFICATION,
+        /*
+         * Check if the client already had the same request.
+         * Complete the old request with an error in this case.
+         * Protection against clients, which cancel and resubmits requests.
+         */
+        CallList::iterator it = mGuestWaiters.begin();
+        while (it != mGuestWaiters.end())
+        {
+            const char *pszPatternsExisting;
+            uint32_t cchPatternsExisting;
+            int rc3 = it->mParms[0].getString(&pszPatternsExisting, &cchPatternsExisting);
+
+            if (   RT_SUCCESS(rc3)
+                && u32ClientId == it->u32ClientId
+                && RTStrCmp(pszPatterns, pszPatternsExisting) == 0)
+            {
+                /* Complete the old request. */
+                mpHelpers->pfnCallComplete(it->mHandle, VERR_INTERRUPTED);
+                it = mGuestWaiters.erase(it);
+            }
+            else
+                ++it;
+        }
+
+        mGuestWaiters.push_back(GuestCall(u32ClientId, callHandle, GET_NOTIFICATION,
                                           paParms, rc));
         rc = VINF_HGCM_ASYNC_EXECUTE;
@@ -1238 +1263 @@
             case GET_NOTIFICATION:
                 LogFlowFunc(("GET_NOTIFICATION\n"));
-                rc = getNotification(callHandle, cParms, paParms);
+                rc = getNotification(u32ClientID, callHandle, cParms, paParms);
                 break;