Changeset 60551 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 18, 2016 5:37:22 PM (9 years ago)

Author:

vboxsync

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

106680

Message:

Main/USBProxyService,USBProxyBackendUsbIp: Fixes

Location:

trunk/src/VBox/Main/src-server

Files:

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

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

@@ -155 +155 @@
          ++it)
     {
-        USBProxyBackend *pUsbProxyBackend = *it;
+        ComObjPtr<USBProxyBackend> pUsbProxyBackend = *it;
         void *pvId = pUsbProxyBackend->insertFilter(aFilter);
 
@@ -172 +172 @@
          ++it)
     {
-        USBProxyBackend *pUsbProxyBackend = it->first;
+        ComObjPtr<USBProxyBackend> pUsbProxyBackend = it->first;
         pUsbProxyBackend->removeFilter(it->second);
     }
@@ -236 +236 @@
         {
             mBackends.erase(it);
-            UsbProxyBackend->uninit();
+
+            /*
+             * The proxy backend uninit method will be called when the pointer goes
+             * out of scope.
+             */
 
             alock.release();

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

@@ -380 +380 @@
         rc = RTPipeClose(m->hWakeupPipeW);
         AssertRC(rc);
+
+        m->hPollSet = NIL_RTPOLLSET;
+        m->hWakeupPipeR = NIL_RTPIPE;
+        m->hWakeupPipeW = NIL_RTPIPE;
     }
 
@@ -385 +389 @@
         RTStrFree(m->pszHost);
     if (m->hMtxDevices != NIL_RTSEMFASTMUTEX)
+    {
         RTSemFastMutexDestroy(m->hMtxDevices);
+        m->hMtxDevices = NIL_RTSEMFASTMUTEX;
+    }
 
     delete m;
@@ -455 +462 @@
 
     /* Query a new device list upon entering. */
-    if (m->enmRecvState == kUsbIpRecvState_None)
+    if (   RT_SUCCESS(rc)
+        && m->enmRecvState == kUsbIpRecvState_None)
     {
         rc = startListExportedDevicesReq();
@@ -695 +703 @@
             m->hSocket = NIL_RTSOCKET;
         }
+        else
+            LogRel(("USB/IP: Connected to host \"%s\"\n", m->pszHost));
     }
 
@@ -907 +917 @@
         pNew->enmState           = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;
         pNew->u64SerialHash      = 0;
-        pNew->bBus               = (uint8_t)pDev->u32BusNum;
-        pNew->bPort              = (uint8_t)pDev->u32DevNum;
+        /** @todo: The following is not correct but is required to to get USB testing working
+         * because only the port can be part of a filter (adding the required attributes for the bus
+         * breaks API and ABI compatibility).
+         * Filtering by port number is required for USB testing to connect to the correct device
+         * in case there are multiple ones.
+         */
+        pNew->bBus               = (uint8_t)pDev->u32DevNum;
+        pNew->bPort              = (uint8_t)pDev->u32BusNum;
 
         switch (pDev->u32Speed)