Changeset 38432 in vbox for trunk/src

Timestamp:

Aug 12, 2011 12:00:20 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73476

Message:

Main/USB: don't propagate remote filtera to USBProxyService

File:

• trunk/src/VBox/Main/src-server/USBControllerImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/USBControllerImpl.cpp

@@ -534 +534 @@
 
     /* notify the proxy (only when it makes sense) */
-    if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
+    if (filter->getData().mActive && Global::IsOnline(adep.machineState())
+#ifdef RT_OS_WINDOWS
+        && filter->getData().mRemote.isMatch (false)
+#endif
+    )
     {
         USBProxyService *service = m->pHost->usbProxyService();
@@ -605 +609 @@
 
     /* notify the proxy (only when it makes sense) */
-    if (filter->getData().mActive && Global::IsOnline(adep.machineState()))
+    if (filter->getData().mActive && Global::IsOnline(adep.machineState())
+#ifdef RT_OS_WINDOWS
+        && filter->getData().mRemote.isMatch (false)
+#endif
+    )
     {
         USBProxyService *service = m->pHost->usbProxyService();
@@ -768 +776 @@
                 /* notify the proxy (only when it makes sense) */
                 if ((*it)->getData().mActive &&
-                    Global::IsOnline (adep.machineState()))
+                    Global::IsOnline (adep.machineState())
+#ifdef RT_OS_WINDOWS
+                    && (*it)->getData().mRemote.isMatch (false)
+#endif
+                )
                 {
                     USBDeviceFilter *filter = *it;
@@ -792 +804 @@
                 {
                     /* notify the proxy (only when necessary) */
-                    if ((*it)->getData().mActive)
+                    if ((*it)->getData().mActive
+#ifdef RT_OS_WINDOWS
+                            && (*it)->getData().mRemote.isMatch (false)
+#endif
+                            )
                     {
                         USBDeviceFilter *flt = *it; /* resolve ambiguity */
@@ -1014 +1030 @@
         if (aActiveChanged)
         {
-            /* insert/remove the filter from the proxy */
-            if (aFilter->getData().mActive)
+#ifdef RT_OS_WINDOWS
+            if (aFilter->getData().mRemote.isMatch (false))
+#endif
             {
-                ComAssertRet(aFilter->getId() == NULL, E_FAIL);
-                aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
-            }
-            else
-            {
-                ComAssertRet(aFilter->getId() != NULL, E_FAIL);
-                service->removeFilter(aFilter->getId());
-                aFilter->getId() = NULL;
+                /* insert/remove the filter from the proxy */
+                if (aFilter->getData().mActive)
+                {
+                    ComAssertRet(aFilter->getId() == NULL, E_FAIL);
+                    aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
+                }
+                else
+                {
+                    ComAssertRet(aFilter->getId() != NULL, E_FAIL);
+                    service->removeFilter(aFilter->getId());
+                    aFilter->getId() = NULL;
+                }
             }
         }
@@ -1034 +1055 @@
                 ComAssertRet(aFilter->getId() != NULL, E_FAIL);
                 service->removeFilter(aFilter->getId());
-                aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
+#ifdef RT_OS_WINDOWS
+                if (aFilter->getData().mRemote.isMatch (false))
+#endif
+                {
+                    aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
+                }
             }
         }
@@ -1210 +1236 @@
 
         /* notify the proxy (only if the filter is active) */
-        if (flt->getData().mActive)
+        if (flt->getData().mActive
+#ifdef RT_OS_WINDOWS
+                && flt->getData().mRemote.isMatch (false) /* and if the filter is NOT remote */
+#endif
+                )
         {
             if (aInsertFilters)