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

Timestamp:

May 9, 2016 5:49:58 PM (9 years ago)

Author:

vboxsync

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

107117

Message:

Main/USBProxyBackendUsbIp: Explicit check for VINF_SUCCESS after RTTcpReadNB because it returns VINF_TRY_AGAIN for non blocking sockets if there is no data available, hopefully fixes USB testing on Windows finally

File:

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

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

@@ -808 +808 @@
                      m->hSocket, m->pbRecvBuf, m->cbResidualRecv, cbRecvd));
 
-        if (RT_SUCCESS(rc))
-        {
+        if (rc == VINF_SUCCESS)
+        {
+            Assert(cbRecvd > 0);
             m->cbResidualRecv -= cbRecvd;
             m->pbRecvBuf      += cbRecvd;
@@ -822 +823 @@
             }
         }
-    } while (RT_SUCCESS(rc) && cbRecvd > 0);
+        else if (rc == VINF_TRY_AGAIN)
+            Assert(!cbRecvd);
+
+    } while (rc == VINF_SUCCESS && cbRecvd > 0);
+
+    if (rc == VINF_TRY_AGAIN)
+        rc = VINF_SUCCESS;
 
     LogFlowFunc(("returns rc=%Rrc\n", rc));