Changeset 60742 in vbox for trunk/src/VBox/Main/src-server/generic

Timestamp:

Apr 28, 2016 1:55:03 PM (9 years ago)

Author:

vboxsync

Message:

Main/USBProxy{Service|Backend}: Rework interaction between thos two to be more sane than it currently is (calling into each other back and forth)

File:

• trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp

@@ -435 +435 @@
 
 
-bool USBProxyBackendUsbIp::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,
-                                             SessionMachine **aIgnoreMachine)
-{
-    AssertReturn(aDevice, false);
-    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
-    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
-    if (    aUSBDevice->enmState == USBDEVICESTATE_USED_BY_HOST_CAPTURABLE
-        &&  aDevice->i_getUsbData()->enmState == USBDEVICESTATE_USED_BY_HOST)
-        LogRel(("USBProxy: Device %04x:%04x (%s) has become accessible.\n",
-                aUSBDevice->idVendor, aUSBDevice->idProduct, aUSBDevice->pszAddress));
-    devLock.release();
-    return updateDeviceStateFake(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
-}
-
-
 int USBProxyBackendUsbIp::wait(RTMSINTERVAL aMillies)
 {
@@ -504 +489 @@
                 if (fEventsRecv & RTPOLL_EVT_READ)
                     rc = receiveData();
-                else if (fEventsRecv & RTPOLL_EVT_ERROR)
+                if (   RT_SUCCESS(rc)
+                    && (fEventsRecv & RTPOLL_EVT_ERROR))
                     rc = VERR_NET_SHUTDOWN;