Changeset 98288 in vbox for trunk/src/VBox/Main/src-server/generic/USBProxyBackendUsbIp.cpp

Timestamp:

Jan 24, 2023 3:32:43 PM (2 years ago)

Author:

vboxsync

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

155493

Message:

Main/src-server: rc -> hrc/vrc (partial). bugref:10223

File:

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

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

@@ -297 +297 @@
                                const com::Utf8Str &strAddress, bool fLoadingSettings)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     USBProxyBackend::init(pUsbProxyService, strId, strAddress, fLoadingSettings);
@@ -322 +322 @@
 
     /* Setup wakeup pipe and poll set first. */
-    rc = RTSemFastMutexCreate(&m->hMtxDevices);
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTPipeCreate(&m->hWakeupPipeR, &m->hWakeupPipeW, 0);
-        if (RT_SUCCESS(rc))
-        {
-            rc = RTPollSetCreate(&m->hPollSet);
-            if (RT_SUCCESS(rc))
+    vrc = RTSemFastMutexCreate(&m->hMtxDevices);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = RTPipeCreate(&m->hWakeupPipeR, &m->hWakeupPipeW, 0);
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = RTPollSetCreate(&m->hPollSet);
+            if (RT_SUCCESS(vrc))
             {
-                rc = RTPollSetAddPipe(m->hPollSet, m->hWakeupPipeR,
-                                      RTPOLL_EVT_READ, USBIP_POLL_ID_PIPE);
-                if (RT_SUCCESS(rc))
+                vrc = RTPollSetAddPipe(m->hPollSet, m->hWakeupPipeR, RTPOLL_EVT_READ, USBIP_POLL_ID_PIPE);
+                if (RT_SUCCESS(vrc))
                 {
                     /*
@@ -344 +343 @@
                      * reachable.
                      */
-                    rc = reconnect();
-                    if (RT_SUCCESS(rc) || fLoadingSettings)
-                        rc = start(); /* Start service thread. */
+                    vrc = reconnect();
+                    if (RT_SUCCESS(vrc) || fLoadingSettings)
+                        vrc = start(); /* Start service thread. */
                 }
 
-                if (RT_FAILURE(rc))
+                if (RT_FAILURE(vrc))
                 {
                     RTPollSetRemove(m->hPollSet, USBIP_POLL_ID_PIPE);
@@ -358 +357 @@
             }
 
-            if (RT_FAILURE(rc))
+            if (RT_FAILURE(vrc))
             {
                 int rc2 = RTPipeClose(m->hWakeupPipeR);
@@ -367 +366 @@
             }
         }
-        if (RT_FAILURE(rc))
+        if (RT_FAILURE(vrc))
         {
             RTSemFastMutexDestroy(m->hMtxDevices);
@@ -374 +373 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -397 +396 @@
         disconnect();
 
-        int rc = RTPollSetRemove(m->hPollSet, USBIP_POLL_ID_PIPE);
-        AssertRC(rc);
-        rc = RTPollSetDestroy(m->hPollSet);
-        AssertRC(rc);
-        rc = RTPipeClose(m->hWakeupPipeR);
-        AssertRC(rc);
-        rc = RTPipeClose(m->hWakeupPipeW);
-        AssertRC(rc);
+        int vrc = RTPollSetRemove(m->hPollSet, USBIP_POLL_ID_PIPE);
+        AssertRC(vrc);
+        vrc = RTPollSetDestroy(m->hPollSet);
+        AssertRC(vrc);
+        vrc = RTPipeClose(m->hWakeupPipeR);
+        AssertRC(vrc);
+        vrc = RTPipeClose(m->hWakeupPipeW);
+        AssertRC(vrc);
 
         m->hPollSet = NIL_RTPOLLSET;
@@ -468 +467 @@
 int USBProxyBackendUsbIp::wait(RTMSINTERVAL aMillies)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     bool fDeviceListChangedOrWokenUp = false;
 
@@ -483 +482 @@
         && m->enmRecvState == kUsbIpRecvState_None)
     {
-        rc = startListExportedDevicesReq();
-        if (RT_FAILURE(rc))
+        vrc = startListExportedDevicesReq();
+        if (RT_FAILURE(vrc))
             disconnect();
     }
@@ -496 +495 @@
     while (   !fDeviceListChangedOrWokenUp
            && (aMillies == RT_INDEFINITE_WAIT || aMillies > 0)
-           && RT_SUCCESS(rc))
+           && RT_SUCCESS(vrc))
     {
         RTMSINTERVAL msWait = aMillies;
@@ -507 +506 @@
             msWait = RT_MIN(3000, aMillies);
 
-        rc = RTPoll(m->hPollSet, msWait, &fEventsRecv, &uIdReady);
-        if (RT_SUCCESS(rc))
+        vrc = RTPoll(m->hPollSet, msWait, &fEventsRecv, &uIdReady);
+        if (RT_SUCCESS(vrc))
         {
             if (uIdReady == USBIP_POLL_ID_PIPE)
@@ -516 +515 @@
                 size_t cbRead = 0;
 
-                rc = RTPipeRead(m->hWakeupPipeR, &bRead, 1, &cbRead);
-                Assert(RT_SUCCESS(rc) && cbRead == 1);
+                vrc = RTPipeRead(m->hWakeupPipeR, &bRead, 1, &cbRead);
+                Assert(RT_SUCCESS(vrc) && cbRead == 1);
                 fDeviceListChangedOrWokenUp = true;
             }
@@ -523 +522 @@
             {
                 if (fEventsRecv & RTPOLL_EVT_READ)
-                    rc = receiveData();
-                if (   RT_SUCCESS(rc)
+                    vrc = receiveData();
+                if (   RT_SUCCESS(vrc)
                     && (fEventsRecv & RTPOLL_EVT_ERROR))
-                    rc = VERR_NET_SHUTDOWN;
+                    vrc = VERR_NET_SHUTDOWN;
 
                 /*
@@ -549 +548 @@
 
                 /* 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)
+                if (vrc == VERR_NET_SHUTDOWN || vrc == VERR_BROKEN_PIPE || vrc == VERR_NET_CONNECTION_RESET_BY_PEER)
                 {
                     Log(("USB/IP: Lost connection to host \"%s\", trying to reconnect...\n", m->pszHost));
                     disconnect();
-                    rc = VINF_SUCCESS;
+                    vrc = VINF_SUCCESS;
                 }
             }
@@ -559 +558 @@
             {
                 AssertMsgFailed(("Invalid poll ID returned\n"));
-                rc = VERR_INVALID_STATE;
+                vrc = VERR_INVALID_STATE;
             }
             aMillies -= (RTMSINTERVAL)(RTTimeMilliTS() - msPollStart);
         }
-        else if (rc == VERR_TIMEOUT)
+        else if (vrc == VERR_TIMEOUT)
         {
             aMillies -= msWait;
@@ -571 +570 @@
                 if (m->hSocket == NIL_RTSOCKET)
                 {
-                    rc = reconnect();
-                    if (RT_SUCCESS(rc))
-                        rc = startListExportedDevicesReq();
-                    else if (   rc == VERR_NET_SHUTDOWN
-                             || rc == VERR_BROKEN_PIPE
-                             || rc == VERR_NET_CONNECTION_RESET_BY_PEER
-                             || rc == VERR_NET_CONNECTION_REFUSED)
+                    vrc = reconnect();
+                    if (RT_SUCCESS(vrc))
+                        vrc = startListExportedDevicesReq();
+                    else if (   vrc == VERR_NET_SHUTDOWN
+                             || vrc == VERR_BROKEN_PIPE
+                             || vrc == VERR_NET_CONNECTION_RESET_BY_PEER
+                             || vrc == VERR_NET_CONNECTION_REFUSED)
                     {
                         if (hasDevListChanged(m->pHead))
                             fDeviceListChangedOrWokenUp = true;
-                        rc = VINF_SUCCESS;
+                        vrc = VINF_SUCCESS;
                     }
                 }
@@ -588 +587 @@
     }
 
-    LogFlowFunc(("return rc=%Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("return vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -599 +598 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = RTPipeWriteBlocking(m->hWakeupPipeW, "", 1, NULL);
-    if (RT_SUCCESS(rc))
+    int vrc = RTPipeWriteBlocking(m->hWakeupPipeW, "", 1, NULL);
+    if (RT_SUCCESS(vrc))
         RTPipeFlush(m->hWakeupPipeW);
-    LogFlowFunc(("returning %Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("returning %Rrc\n", vrc));
+    return vrc;
 }
 
@@ -705 +704 @@
     if (m->hSocket != NIL_RTSOCKET)
     {
-        int rc = RTPollSetRemove(m->hPollSet, USBIP_POLL_ID_SOCKET);
-        NOREF(rc);
-        Assert(RT_SUCCESS(rc) || rc == VERR_POLL_HANDLE_ID_NOT_FOUND);
+        int vrc = RTPollSetRemove(m->hPollSet, USBIP_POLL_ID_SOCKET);
+        NOREF(vrc);
+        Assert(RT_SUCCESS(vrc) || vrc == VERR_POLL_HANDLE_ID_NOT_FOUND);
 
         RTTcpClientCloseEx(m->hSocket, false /*fGracefulShutdown*/);
@@ -730 +729 @@
 
     /* Connect to the USB/IP host. */
-    int rc = RTTcpClientConnect(m->pszHost, m->uPort, &m->hSocket);
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTTcpSetSendCoalescing(m->hSocket, false);
-        if (RT_FAILURE(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,
-                                USBIP_POLL_ID_SOCKET);
-        if (RT_FAILURE(rc))
+    int vrc = RTTcpClientConnect(m->pszHost, m->uPort, &m->hSocket);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = RTTcpSetSendCoalescing(m->hSocket, false);
+        if (RT_FAILURE(vrc))
+            LogRelMax(5, ("USB/IP: Disabling send coalescing failed (vrc=%Rrc), continuing nevertheless but expect increased latency\n", vrc));
+
+        vrc = RTPollSetAddSocket(m->hPollSet, m->hSocket, RTPOLL_EVT_READ | RTPOLL_EVT_ERROR, USBIP_POLL_ID_SOCKET);
+        if (RT_FAILURE(vrc))
         {
             RTTcpClientCloseEx(m->hSocket, false /*fGracefulShutdown*/);
@@ -763 +761 @@
     }
 
-    LogFlowFunc(("returns rc=%Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("returns vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -774 +772 @@
 int USBProxyBackendUsbIp::startListExportedDevicesReq()
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     LogFlowFunc(("\n"));
@@ -784 +782 @@
     Assert(m->enmRecvState == kUsbIpRecvState_None);
     if (m->enmRecvState != kUsbIpRecvState_None)
-        rc = reconnect();
-
-    if (RT_SUCCESS(rc))
+        vrc = reconnect();
+
+    if (RT_SUCCESS(vrc))
     {
         /* Send of the request. */
@@ -794 +792 @@
         ReqDevList.i32Status  = RT_H2N_S32(0);
 
-        rc = RTTcpWrite(m->hSocket, &ReqDevList, sizeof(ReqDevList));
-        if (RT_SUCCESS(rc))
+        vrc = RTTcpWrite(m->hSocket, &ReqDevList, sizeof(ReqDevList));
+        if (RT_SUCCESS(vrc))
             advanceState(kUsbIpRecvState_Hdr);
     }
 
-    LogFlowFunc(("returns rc=%Rrc\n", rc));
-    return rc;
+    LogFlowFunc(("returns vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -852 +850 @@
 int USBProxyBackendUsbIp::receiveData()
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     size_t cbRecvd = 0;
 
@@ -859 +857 @@
     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, rc));
-
-        if (   rc == VINF_SUCCESS
+        vrc = RTTcpReadNB(m->hSocket, m->pbRecvBuf, m->cbResidualRecv, &cbRecvd);
+
+        LogFlowFunc(("RTTcpReadNB(%#p, %#p, %zu, %zu) -> %Rrc\n", m->hSocket, m->pbRecvBuf, m->cbResidualRecv, cbRecvd, vrc));
+
+        if (   vrc == VINF_SUCCESS
             && cbRecvd > 0)
         {
@@ -872 +869 @@
             if (!m->cbResidualRecv)
             {
-                rc = processData();
-                if (   RT_SUCCESS(rc)
+                vrc = processData();
+                if (   RT_SUCCESS(vrc)
                     && m->enmRecvState == kUsbIpRecvState_None)
                     break;
             }
         }
-        else if (rc == VINF_TRY_AGAIN)
+        else if (vrc == 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));
-    return rc;
+    } while (vrc == VINF_SUCCESS && cbRecvd > 0);
+
+    if (vrc == VINF_TRY_AGAIN)
+        vrc = VINF_SUCCESS;
+
+    LogFlowFunc(("returns vrc=%Rrc\n", vrc));
+    return vrc;
 }
 
@@ -897 +894 @@
 int USBProxyBackendUsbIp::processData()
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     switch (m->enmRecvState)
@@ -924 +921 @@
                 advanceState(kUsbIpRecvState_None);
                 disconnect();
-                rc = VERR_NET_SHUTDOWN;
+                vrc = VERR_NET_SHUTDOWN;
             }
             break;
@@ -932 +929 @@
             /* Create a new device and add it to the list. */
             usbProxyBackendUsbIpExportedDeviceN2H(&m->Scratch.ExportedDevice);
-            rc = addDeviceToList(&m->Scratch.ExportedDevice);
-            if (RT_SUCCESS(rc))
+            vrc = addDeviceToList(&m->Scratch.ExportedDevice);
+            if (RT_SUCCESS(vrc))
             {
                 m->cInterfacesLeft = m->Scratch.ExportedDevice.bNumInterfaces;
@@ -974 +971 @@
     }
 
-    return rc;
+    return vrc;
 }
 
@@ -986 +983 @@
 int USBProxyBackendUsbIp::addDeviceToList(PUsbIpExportedDevice pDev)
 {
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     PUSBDEVICE pNew = (PUSBDEVICE)RTMemAllocZ(sizeof(USBDEVICE));
     if (!pNew)
@@ -1055 +1052 @@
     }
     else
-        rc = VERR_NO_STR_MEMORY;
-
-    if (RT_FAILURE(rc))
+        vrc = VERR_NO_STR_MEMORY;
+
+    if (RT_FAILURE(vrc))
     {
         if (pNew->pszManufacturer)
@@ -1070 +1067 @@
     }
 
-    return rc;
+    return vrc;
 }