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

Timestamp:

May 2, 2016 11:58:20 AM (9 years ago)

Author:

vboxsync

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

106983

Message:

Main/USBProxyBackendUsbIp: Fixes

File:

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

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

@@ -499 +499 @@
                     rc = VERR_NET_SHUTDOWN;
 
-                if (RT_SUCCESS(rc))
+                /*
+                 * If we are in the none state again we received the previous request
+                 * and have a new device list to compare the old against.
+                 */
+                if (m->enmRecvState == kUsbIpRecvState_None)
                 {
-                    /*
-                     * If we are in the none state again we received the previous request
-                     * and have a new device list to compare the old against.
-                     */
-                    if (m->enmRecvState == kUsbIpRecvState_None)
-                    {
-                        if (hasDevListChanged(m->pHead))
-                            fDeviceListChangedOrWokenUp = true;
-
-                        /* Update to the new list in any case now that we have it anyway. */
-                        RTSemFastMutexRequest(m->hMtxDevices);
-                        freeDeviceList(m->pUsbDevicesCur);
-                        m->cUsbDevicesCur = m->cDevicesCur;
-                        m->pUsbDevicesCur = m->pHead;
-                        RTSemFastMutexRelease(m->hMtxDevices);
-
-                        m->pHead = NULL;
-                        resetRecvState();
-                    }
+                    if (hasDevListChanged(m->pHead))
+                        fDeviceListChangedOrWokenUp = true;
+
+                    /* Update to the new list in any case now that we have it anyway. */
+                    RTSemFastMutexRequest(m->hMtxDevices);
+                    freeDeviceList(m->pUsbDevicesCur);
+                    m->cUsbDevicesCur = m->cDevicesCur;
+                    m->pUsbDevicesCur = m->pHead;
+                    RTSemFastMutexRelease(m->hMtxDevices);
+
+                    m->pHead = NULL;
+                    resetRecvState();
                 }
-                else if (rc == VERR_NET_SHUTDOWN || rc == VERR_BROKEN_PIPE || rc == VERR_NET_CONNECTION_RESET_BY_PEER)
+
+                /* Current USB/IP server closes the connection after each request, don't abort but try again. */
+                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));
@@ -573 +572 @@
     PUSBDEVICE pFirst = NULL;
     PUSBDEVICE *ppNext = &pFirst;
+
+    LogFlowThisFunc(("\n"));
 
     /* Create a deep copy of the device list. */
@@ -614 +615 @@
     RTSemFastMutexRelease(m->hMtxDevices);
 
+    LogFlowThisFunc(("returning %#p\n", pFirst));
     return pFirst;
 }
@@ -641 +643 @@
 void USBProxyBackendUsbIp::resetRecvState()
 {
+    LogFlowFunc(("\n"));
     freeDeviceList(m->pHead);
     m->pHead          = NULL;
@@ -649 +652 @@
     m->pbRecvBuf      = &m->Scratch.abRecv[0];
     m->cDevicesLeft   = 0;
+    LogFlowFunc(("\n"));
 }
 
@@ -658 +662 @@
 void USBProxyBackendUsbIp::disconnect()
 {
+    LogFlowFunc(("\n"));
+
     if (m->hSocket != NIL_RTSOCKET)
     {
@@ -668 +674 @@
 
     resetRecvState();
+    LogFlowFunc(("returns\n"));
 }
 
@@ -677 +684 @@
 int USBProxyBackendUsbIp::reconnect()
 {
+    LogFlowFunc(("\n"));
+
     /* Make sure we are disconnected. */
     disconnect();
@@ -699 +708 @@
     }
 
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -710 +720 @@
 {
     int rc = VINF_SUCCESS;
+
+    LogFlowFunc(("\n"));
 
     /*
@@ -731 +743 @@
     }
 
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -742 +755 @@
 void USBProxyBackendUsbIp::advanceState(USBIPRECVSTATE enmRecvState)
 {
+    LogFlowFunc(("enmRecvState=%u\n", enmRecvState));
+
     switch (enmRecvState)
     {
@@ -770 +785 @@
 
     m->enmRecvState = enmRecvState;
+    LogFlowFunc(("returns\n"));
 }
 
@@ -783 +799 @@
     size_t cbRecvd = 0;
 
+    LogFlowFunc(("\n"));
+
     do
     {
         rc = RTTcpReadNB(m->hSocket, m->pbRecvBuf, m->cbResidualRecv, &cbRecvd);
+
+        LogFlowFunc(("RTTcpReadNB(%#p, %#p, %zu, %zu) -> %Rrc\n",
+                     m->hSocket, m->pbRecvBuf, m->cbResidualRecv, cbRecvd));
+
         if (RT_SUCCESS(rc))
         {
@@ -791 +813 @@
             m->pbRecvBuf      += cbRecvd;
             /* In case we received everything for the current state process the data. */
-            if (!m->cbResidualRecv)
+            if (   !m->cbResidualRecv
+                && cbRecvd > 0)
             {
                 rc = processData();
@@ -801 +824 @@
     } while (RT_SUCCESS(rc) && cbRecvd > 0);
 
+    LogFlowFunc(("returns rc=%Rrc\n", rc));
     return rc;
 }
@@ -899 +923 @@
 int USBProxyBackendUsbIp::addDeviceToList(PUsbIpExportedDevice pDev)
 {
+    int rc = VINF_SUCCESS;
     PUSBDEVICE pNew = (PUSBDEVICE)RTMemAllocZ(sizeof(USBDEVICE));
     if (!pNew)
@@ -910 +935 @@
     /* Make sure the Bus id is 0 terminated. */
     pDev->szBusId[31] = '\0';
-    int rc = RTStrAPrintf((char **)&pNew->pszAddress, "usbip://%s:%u:%s", m->pszHost, m->uPort, &pDev->szBusId[0]);
-    if (RT_SUCCESS(rc))
+    pNew->pszAddress = RTStrAPrintf2("usbip://%s:%u:%s", m->pszHost, m->uPort, &pDev->szBusId[0]);
+    if (RT_LIKELY(pNew->pszAddress))
     {
         pNew->idVendor           = pDev->u16VendorId;
@@ -966 +991 @@
         m->cDevicesCur++;
     }
+    else
+        rc = VERR_NO_STR_MEMORY;
 
     if (RT_FAILURE(rc))