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

Timestamp:

Apr 27, 2016 8:02:31 AM (9 years ago)

Author:

vboxsync

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

106897

Message:

Main/USBProxyBackendUsbIp.cpp: Fixes for Windows, RTPoll returns with both the read and error events set so we have to check for available data first before handling the error

File:

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

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

@@ -412 +412 @@
     Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_Capturing);
     devLock.release();
-    interruptWait();
 
     return VINF_SUCCESS;
@@ -431 +430 @@
     Assert(aDevice->i_getUnistate() == kHostUSBDeviceState_ReleasingToHost);
     devLock.release();
-    interruptWait();
 
     return VINF_SUCCESS;
@@ -504 +502 @@
             else if (uIdReady == USBIP_POLL_ID_SOCKET)
             {
-                if (fEventsRecv & RTPOLL_EVT_ERROR)
+                if (fEventsRecv & RTPOLL_EVT_READ)
+                    rc = receiveData();
+                else if (fEventsRecv & RTPOLL_EVT_ERROR)
                     rc = VERR_NET_SHUTDOWN;
-                else
-                    rc = receiveData();
+
                 if (RT_SUCCESS(rc))
                 {
@@ -788 +787 @@
 int USBProxyBackendUsbIp::receiveData()
 {
+    int rc = VINF_SUCCESS;
     size_t cbRecvd = 0;
-    int rc = RTTcpReadNB(m->hSocket, m->pbRecvBuf, m->cbResidualRecv, &cbRecvd);
-    if (RT_SUCCESS(rc))
-    {
-        m->cbResidualRecv -= cbRecvd;
-        m->pbRecvBuf      += cbRecvd;
-        /* In case we received everything for the current state process the data. */
-        if (!m->cbResidualRecv)
-            rc = processData();
-    }
+
+    do
+    {
+        rc = RTTcpReadNB(m->hSocket, m->pbRecvBuf, m->cbResidualRecv, &cbRecvd);
+        if (RT_SUCCESS(rc))
+        {
+            m->cbResidualRecv -= cbRecvd;
+            m->pbRecvBuf      += cbRecvd;
+            /* In case we received everything for the current state process the data. */
+            if (!m->cbResidualRecv)
+            {
+                rc = processData();
+                if (   RT_SUCCESS(rc)
+                    && m->enmRecvState == kUsbIpRecvState_None)
+                    break;
+            }
+        }
+    } while (RT_SUCCESS(rc) && cbRecvd > 0);
 
     return rc;