Changeset 60755 in vbox

Timestamp:

Apr 29, 2016 10:00:11 AM (8 years ago)

Author:

vboxsync

Message:

Main/USBProxyBackend: Fixes

Location:

trunk/src/VBox/Main/src-server

Files:

• USBProxyService.cpp (modified) (6 diffs)
• generic/USBProxyBackendUsbIp.cpp (modified) (3 diffs)

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

@@ -345 +345 @@
         &&  fRunFilters)
     {
-        USBProxyBackend *pUsbProxyBackend = pHostDevice->i_getUsbProxyBackend();
         Assert(aDone && pHostDevice->i_getUnistate() == kHostUSBDeviceState_HeldByProxy && pHostDevice->i_getMachine().isNull());
         devLock.release();
@@ -400 +399 @@
             || pHostDevice->i_getUnistate() == kHostUSBDeviceState_Capturable)
         {
-            USBProxyBackend *pUsbProxyBackend = pHostDevice->i_getUsbProxyBackend();
             devLock.release();
             runMachineFilters(aMachine, pHostDevice);
@@ -463 +461 @@
                 &&  fRunFilters)
             {
-                USBProxyBackend *pUsbProxyBackend = pHostDevice->i_getUsbProxyBackend();
                 Assert(   aDone
                        && pHostDevice->i_getUnistate() == kHostUSBDeviceState_HeldByProxy
@@ -546 +543 @@
  */
 void USBProxyService::i_deviceAdded(ComObjPtr<HostUSBDevice> &aDevice,
-                                    PUSBDEVICE aUSBDevice)
+                                    PUSBDEVICE pDev)
 {
     /*
@@ -562 +559 @@
 
     /* Add to our list. */
-    PCUSBDEVICE pDev = aDevice->i_getUsbData();
     HostUSBDeviceList::iterator it = mDevices.begin();
     while (it != mDevices.end())
@@ -901 +897 @@
     AssertReturn(isWriteLockOnCurrentThread(), E_FAIL);
 
+    /** @todo */
+    NOREF(aPropertyNames);
+    NOREF(aPropertyValues);
+
     /* Check whether the ID is used first. */
     for (USBProxyBackendList::iterator it = mBackends.begin();

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

@@ -521 +521 @@
                     }
                 }
-                else if (rc == VERR_NET_SHUTDOWN || rc == VERR_BROKEN_PIPE)
+                else if (rc == VERR_NET_SHUTDOWN || rc == VERR_BROKEN_PIPE || rc == VERR_NET_CONNECTION_RESET_BY_PEER)
                 {
                     Log(("USB/IP: Lost connection to host \"%s\", trying to reconnect...\n", m->pszHost));
@@ -550 +550 @@
     }
 
+    LogFlowFunc(("return rc=%Rrc\n", rc));
     return rc;
 }
@@ -992 +993 @@
 {
     /** @todo */
+    NOREF(pDevices);
     return true;
 }