Changeset 85279 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 12, 2020 2:26:32 PM (5 years ago)

Author:

vboxsync

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

139256

Message:

Main/USBProxyBackendUsbIp.cpp: The 'unused' u32Status fields are actually signed and should be called i32Status. bugref:9790

File:

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

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

@@ -123 +123 @@
     uint16_t     u16Cmd;
     /** Status field, unused. */
-    int32_t      u32Status;
+    int32_t      i32Status;
 } UsbIpReqDevList;
 /** Pointer to a device list request. */
@@ -144 +144 @@
     uint16_t     u16Cmd;
     /** Status field, unused. */
-    int32_t      u32Status;
+    int32_t      i32Status;
     /** Number of exported devices. */
     uint32_t     u32DevicesExported;
@@ -782 +782 @@
         ReqDevList.u16Version = RT_H2N_U16(USBIP_VERSION);
         ReqDevList.u16Cmd     = RT_H2N_U16(USBIP_INDICATOR_REQ | USBIP_REQ_RET_DEVLIST);
-        ReqDevList.u32Status  = RT_H2N_U32(0);
+        ReqDevList.i32Status  = RT_H2N_S32(0);
+
         rc = RTTcpWrite(m->hSocket, &ReqDevList, sizeof(ReqDevList));
         if (RT_SUCCESS(rc))
@@ -895 +896 @@
             if (   RT_N2H_U16(m->Scratch.RetDevList.u16Version) == USBIP_VERSION
                 && RT_N2H_U16(m->Scratch.RetDevList.u16Cmd) == USBIP_REQ_RET_DEVLIST
-                && RT_N2H_U32(m->Scratch.RetDevList.u32Status) == USBIP_STATUS_SUCCESS)
+                && RT_N2H_S32(m->Scratch.RetDevList.i32Status) == USBIP_STATUS_SUCCESS)
+
             {
                 /* Populate the number of exported devices in the list and go to the next state. */
@@ -908 +910 @@
                 LogRelMax(10, ("USB/IP: Host sent an invalid reply to the list exported device request (Version: %#x Cmd: %#x Status: %#x)\n",
                                RT_N2H_U16(m->Scratch.RetDevList.u16Version), RT_N2H_U16(m->Scratch.RetDevList.u16Cmd),
-                               RT_N2H_U32(m->Scratch.RetDevList.u32Status)));
+                               RT_N2H_S32(m->Scratch.RetDevList.i32Status)));
                 /* Disconnect and start over. */
                 advanceState(kUsbIpRecvState_None);