Changeset 60800 in vbox for trunk/src/VBox/Devices/USB/usbip

Timestamp:

May 3, 2016 8:46:12 AM (9 years ago)

Author:

vboxsync

Message:

Device/USBProxyDevice-usbip: Fixes for corner cases in the protocol

File:

• trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp

@@ -82 +82 @@
 /** Pipe stalled. */
 #define USBIP_STATUS_PIPE_STALLED            INT32_C(-32)
+/** URB was unlinked by a call to usb_unlink_urb(). */
+#define USBIP_STATUS_URB_UNLINKED            INT32_C(-104)
 /** Short read. */
 #define USBIP_STATUS_SHORT_READ              INT32_C(-121)
@@ -582 +584 @@
         case USBIP_STATUS_PIPE_STALLED:
             return VINF_SUCCESS;
+        case USBIP_STATUS_URB_UNLINKED:
+            return VERR_TRY_AGAIN;
         default:
+            LogFlowFunc(("i32Status=%d\n", i32Status));
             return VERR_INVALID_STATE;
     }
 
+    LogFlowFunc(("i32Status=%d\n", i32Status));
     return VERR_INVALID_STATE;
 }
@@ -855 +861 @@
 {
     int rc = VINF_SUCCESS;
+    unsigned iTry = 0;
 
     UsbIpReqSubmit ReqSubmit;
@@ -874 +881 @@
     usbProxyUsbIpReqSubmitH2N(&ReqSubmit);
 
-    /* Send the command. */
-    rc = RTTcpWrite(pProxyDevUsbIp->hSocket, &ReqSubmit, sizeof(ReqSubmit));
-    if (RT_SUCCESS(rc))
-    {
-        /* Wait for the response. */
-        /** @todo: Don't wait indefinitely long. */
-        UsbIpRetSubmit RetSubmit;
-        rc = RTTcpRead(pProxyDevUsbIp->hSocket, &RetSubmit, sizeof(RetSubmit), NULL);
+    do
+    {
+        /* Send the command. */
+        rc = RTTcpWrite(pProxyDevUsbIp->hSocket, &ReqSubmit, sizeof(ReqSubmit));
         if (RT_SUCCESS(rc))
         {
-            usbProxyUsbIpRetSubmitN2H(&RetSubmit);
-            rc = usbProxyUsbIpStatusConvertFromStatus(RetSubmit.u32Status);
+            /* Wait for the response. */
+            /** @todo: Don't wait indefinitely long. */
+            UsbIpRetSubmit RetSubmit;
+            rc = RTTcpRead(pProxyDevUsbIp->hSocket, &RetSubmit, sizeof(RetSubmit), NULL);
+            if (RT_SUCCESS(rc))
+            {
+                usbProxyUsbIpRetSubmitN2H(&RetSubmit);
+                rc = usbProxyUsbIpStatusConvertFromStatus(RetSubmit.u32Status);
+            }
         }
-    }
+    } while (   rc == VERR_TRY_AGAIN
+             && iTry++ < 10);
     return rc;
 }
@@ -1032 +1043 @@
                                 usbProxyUsbIpRetSubmitN2H(&pProxyDevUsbIp->BufRet.RetSubmit);
 
+                                /* We still have to receive the transfer buffer, even in case of an error. */
                                 pProxyDevUsbIp->pUrbUsbIp->pVUsbUrb->enmStatus = usbProxyUsbIpVUsbStatusConvertFromStatus(pProxyDevUsbIp->BufRet.RetSubmit.u32Status);
-                                if (   pProxyDevUsbIp->pUrbUsbIp->pVUsbUrb->enmDir == VUSBDIRECTION_IN
-                                    && pProxyDevUsbIp->pUrbUsbIp->pVUsbUrb->enmStatus == VUSBSTATUS_OK)
+                                if (pProxyDevUsbIp->pUrbUsbIp->pVUsbUrb->enmDir == VUSBDIRECTION_IN)
                                 {
                                     uint8_t *pbData = NULL;
@@ -1050 +1061 @@
                                     }
 
-                                    usbProxyUsbIpRecvStateAdvance(pProxyDevUsbIp, USBPROXYUSBIPRECVSTATE_URB_BUFFER,
-                                                                  pbData, pProxyDevUsbIp->BufRet.RetSubmit.u32ActualLength);
+                                    if (pProxyDevUsbIp->BufRet.RetSubmit.u32ActualLength)
+                                        usbProxyUsbIpRecvStateAdvance(pProxyDevUsbIp, USBPROXYUSBIPRECVSTATE_URB_BUFFER,
+                                                                      pbData, pProxyDevUsbIp->BufRet.RetSubmit.u32ActualLength);
+                                    else
+                                    {
+                                        pUrbUsbIp = pProxyDevUsbIp->pUrbUsbIp;
+                                        usbProxyUsbIpResetRecvState(pProxyDevUsbIp);
+                                    }
                                 }
                                 else
                                 {
-                                    Assert(   pProxyDevUsbIp->pUrbUsbIp->pVUsbUrb->enmDir == VUSBDIRECTION_OUT
-                                           || pProxyDevUsbIp->pUrbUsbIp->pVUsbUrb->enmStatus != VUSBSTATUS_OK);
+                                    Assert(pProxyDevUsbIp->pUrbUsbIp->pVUsbUrb->enmDir == VUSBDIRECTION_OUT);
                                     pUrbUsbIp = pProxyDevUsbIp->pUrbUsbIp;
                                     usbProxyUsbIpResetRecvState(pProxyDevUsbIp);