Changeset 65854 in vbox for trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp

Timestamp:

Feb 23, 2017 11:48:49 AM (8 years ago)

Author:

vboxsync

Message:

Main/USBProxyBackendUsbIp: Don't prevent VBoxSVC from starting when the server is not reachable, just try to reconnect every 3 seconds. Smaller other fixes for stale USB device lists when the server is not reachable and a fix for saving the same USB source multiple times

File:

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

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

@@ -280 +280 @@
  * @returns S_OK on success and non-fatal failures, some COM error otherwise.
  */
-int USBProxyBackendUsbIp::init(USBProxyService *aUsbProxyService, const com::Utf8Str &strId, const com::Utf8Str &strAddress)
+int USBProxyBackendUsbIp::init(USBProxyService *pUsbProxyService, const com::Utf8Str &strId,
+                               const com::Utf8Str &strAddress, bool fLoadingSettings)
 {
     int rc = VINF_SUCCESS;
 
-    USBProxyBackend::init(aUsbProxyService, strId, strAddress);
+    USBProxyBackend::init(pUsbProxyService, strId, strAddress, fLoadingSettings);
 
     unconst(m_strBackend) = Utf8Str("USBIP");
@@ -318 +319 @@
                 if (RT_SUCCESS(rc))
                 {
-                    /* Connect to the USB/IP host. */
+                    /*
+                     * Connect to the USB/IP host. Be more graceful to connection errors
+                     * if we are instantiated while the settings are loaded to let
+                     * VBoxSVC start.
+                     *
+                     * The worker thread keeps trying to connect every few seconds until
+                     * either the USB source is removed by the user or the USB server is
+                     * reachable.
+                     */
                     rc = reconnect();
-                    if (RT_SUCCESS(rc))
+                    if (RT_SUCCESS(rc) || fLoadingSettings)
                         rc = start(); /* Start service thread. */
                 }
@@ -448 +457 @@
     /* Try to reconnect once when we enter if we lost the connection earlier. */
     if (m->hSocket == NIL_RTSOCKET)
-        rc = reconnect();
+        reconnect();
 
     /* Query a new device list upon entering. */
-    if (   RT_SUCCESS(rc)
+    if (   m->hSocket != NIL_RTSOCKET
         && m->enmRecvState == kUsbIpRecvState_None)
     {
@@ -474 +483 @@
         uint32_t fEventsRecv = 0;
 
-        /* Limit the waiting time to 1sec so we can either reconnect or get a new device list. */
+        /* Limit the waiting time to 3sec so we can either reconnect or get a new device list. */
         if (m->hSocket == NIL_RTSOCKET || m->enmRecvState == kUsbIpRecvState_None)
-            msWait = RT_MIN(1000, aMillies);
+            msWait = RT_MIN(3000, aMillies);
 
         rc = RTPoll(m->hPollSet, msWait, &fEventsRecv, &uIdReady);
@@ -549 +558 @@
                              || rc == VERR_NET_CONNECTION_RESET_BY_PEER
                              || rc == VERR_NET_CONNECTION_REFUSED)
+                    {
+                        /* Make sure the device list is clear. */
+                        RTSemFastMutexRequest(m->hMtxDevices);
+                        if (m->pUsbDevicesCur)
+                        {
+                            freeDeviceList(m->pUsbDevicesCur);
+                            fDeviceListChangedOrWokenUp = true;
+                            m->cUsbDevicesCur = 0;
+                            m->pUsbDevicesCur = NULL;
+                        }
+                        RTSemFastMutexRelease(m->hMtxDevices);
                         rc = VINF_SUCCESS;
+                    }
                 }
             }
@@ -815 +836 @@
                      m->hSocket, m->pbRecvBuf, m->cbResidualRecv, cbRecvd, rc));
 
-        if (rc == VINF_SUCCESS)
-        {
-            Assert(cbRecvd > 0);
+        if (   rc == VINF_SUCCESS
+            && cbRecvd > 0)
+        {
             m->cbResidualRecv -= cbRecvd;
             m->pbRecvBuf      += cbRecvd;
             /* In case we received everything for the current state process the data. */
-            if (   !m->cbResidualRecv
-                && cbRecvd > 0)
+            if (!m->cbResidualRecv)
             {
                 rc = processData();