Changeset 38441 in vbox

Timestamp:

Aug 12, 2011 4:25:06 PM (13 years ago)

Author:

vboxsync

Message:

Main/USB: do not propagate remote filter to USBProxyService for all platforms

File:

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

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

@@ -535 +535 @@
     /* notify the proxy (only when it makes sense) */
     if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-#ifdef RT_OS_WINDOWS
-        && filter->getData().mRemote.isMatch (false)
-#endif
-    )
+        && filter->getData().mRemote.isMatch (false))
     {
         USBProxyService *service = m->pHost->usbProxyService();
@@ -610 +607 @@
     /* notify the proxy (only when it makes sense) */
     if (filter->getData().mActive && Global::IsOnline(adep.machineState())
-#ifdef RT_OS_WINDOWS
-        && filter->getData().mRemote.isMatch (false)
-#endif
-    )
+        && filter->getData().mRemote.isMatch (false))
     {
         USBProxyService *service = m->pHost->usbProxyService();
@@ -777 +771 @@
                 if ((*it)->getData().mActive &&
                     Global::IsOnline (adep.machineState())
-#ifdef RT_OS_WINDOWS
-                    && (*it)->getData().mRemote.isMatch (false)
-#endif
-                )
+                    && (*it)->getData().mRemote.isMatch (false))
                 {
                     USBDeviceFilter *filter = *it;
@@ -805 +796 @@
                     /* notify the proxy (only when necessary) */
                     if ((*it)->getData().mActive
-#ifdef RT_OS_WINDOWS
-                            && (*it)->getData().mRemote.isMatch (false)
-#endif
-                            )
+                            && (*it)->getData().mRemote.isMatch (false))
                     {
                         USBDeviceFilter *flt = *it; /* resolve ambiguity */
@@ -1030 +1018 @@
         if (aActiveChanged)
         {
-#ifdef RT_OS_WINDOWS
             if (aFilter->getData().mRemote.isMatch (false))
-#endif
             {
                 /* insert/remove the filter from the proxy */
@@ -1055 +1041 @@
                 ComAssertRet(aFilter->getId() != NULL, E_FAIL);
                 service->removeFilter(aFilter->getId());
-#ifdef RT_OS_WINDOWS
                 if (aFilter->getData().mRemote.isMatch (false))
-#endif
                 {
                     aFilter->getId() = service->insertFilter(&aFilter->getData().mUSBFilter);
@@ -1237 +1221 @@
         /* notify the proxy (only if the filter is active) */
         if (flt->getData().mActive
-#ifdef RT_OS_WINDOWS
                 && flt->getData().mRemote.isMatch (false) /* and if the filter is NOT remote */
-#endif
                 )
         {