Changeset 53168 in vbox

Timestamp:

Oct 31, 2014 11:42:33 AM (10 years ago)

Author:

vboxsync

Message:

VUSBSniffer: Don't include the setup URB data twice in the packet

File:

• trunk/src/VBox/Devices/USB/VUSBSniffer.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/USB/VUSBSniffer.cpp

@@ -598 +598 @@
     uint32_t cbCapturedLength = sizeof(UsbHdr);
     uint32_t cIsocPkts = 0;
+    uint8_t *pbData = NULL;
 
     RTTimeNow(&TimeNow);
@@ -628 +629 @@
     }
     cbDataLength = cbUrbLength;
+    pbData = &pUrb->abData[0];
 
     switch (pUrb->enmType)
@@ -673 +675 @@
             cbDataLength = 0;
     }
+    else if (pUrb->enmDir == VUSBDIRECTION_SETUP)
+        cbDataLength -= sizeof(VUSBSETUP);
 
     Epb.u32CapturedLen = cbCapturedLength + cbDataLength;
@@ -727 +731 @@
         if (   RT_SUCCESS(rc)
             && cbDataLength)
-            rc = vusbSnifferBlockAddData(pThis, pUrb->abData, pUrb->cbData);
+            rc = vusbSnifferBlockAddData(pThis, pbData, cbDataLength);
 
         if (RT_SUCCESS(rc))