Changeset 60745 in vbox for trunk

Timestamp:

Apr 28, 2016 3:47:49 PM (9 years ago)

Author:

vboxsync

Message:

Main/USBProxyBackendUsbIp: Start over if the server sends garbage instead of stopping, some logging adjustments

File:

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

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

@@ -523 +523 @@
                 else if (rc == VERR_NET_SHUTDOWN || rc == VERR_BROKEN_PIPE)
                 {
-                    LogRelMax(10, ("USB/IP: Lost connection to host \"%s\", trying to reconnect...\n", m->pszHost));
+                    Log(("USB/IP: Lost connection to host \"%s\", trying to reconnect...\n", m->pszHost));
                     disconnect();
                     rc = VINF_SUCCESS;
@@ -685 +685 @@
         rc = RTTcpSetSendCoalescing(m->hSocket, false);
         if (RT_FAILURE(rc))
-            LogRel(("USB/IP: Disabling send coalescing failed (rc=%Rrc), continuing nevertheless but expect increased latency\n", rc));
+            LogRelMax(5, ("USB/IP: Disabling send coalescing failed (rc=%Rrc), continuing nevertheless but expect increased latency\n", rc));
 
         rc = RTPollSetAddSocket(m->hPollSet, m->hSocket, RTPOLL_EVT_READ | RTPOLL_EVT_ERROR,
@@ -695 +695 @@
         }
         else
-            LogRel(("USB/IP: Connected to host \"%s\"\n", m->pszHost));
+            LogFlowFunc(("Connected to host \"%s\"\n", m->pszHost));
     }
 
@@ -833 +833 @@
                                RT_N2H_U16(m->Scratch.RetDevList.u16Version), RT_N2H_U16(m->Scratch.RetDevList.u16Cmd),
                                RT_N2H_U32(m->Scratch.RetDevList.u32Status)));
-                rc = VERR_INVALID_STATE;
+                /* Disconnect and start over. */
+                advanceState(kUsbIpRecvState_None);
+                disconnect();
+                rc = VERR_NET_SHUTDOWN;
             }
             break;