Changeset 53072 in vbox for trunk/src

Timestamp:

Oct 15, 2014 7:30:08 PM (10 years ago)

Author:

vboxsync

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

96577

Message:

VUSBSniffer: More fixes

File:

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

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

@@ -27 +27 @@
 #include <iprt/system.h>
 #include <iprt/semaphore.h>
+#include <iprt/time.h>
 
 #include "VUSBSniffer.h"
@@ -320 +321 @@
 
 /**
- * Commits the current block to the capture file.
+ * Aligns the current block data to a 32bit boundary.
  *
  * @returns VBox status code.
  * @param   pThis           The VUSB sniffer instance.
  */
-static int vusbSnifferBlockCommit(PVUSBSNIFFERINT pThis)
+static int vusbSnifferBlockAlign(PVUSBSNIFFERINT pThis)
 {
     int rc = VINF_SUCCESS;
 
-    AssertPtr(pThis->pBlockHdr);
+    Assert(pThis->cbBlockCur);
 
     /* Pad to 32bits. */
@@ -339 +340 @@
         rc = vusbSnifferBlockAddData(pThis, abPad, cbPad);
 
+    return rc;
+}
+
+/**
+ * Commits the current block to the capture file.
+ *
+ * @returns VBox status code.
+ * @param   pThis           The VUSB sniffer instance.
+ */
+static int vusbSnifferBlockCommit(PVUSBSNIFFERINT pThis)
+{
+    int rc = VINF_SUCCESS;
+
+    AssertPtr(pThis->pBlockHdr);
+
+    rc = vusbSnifferBlockAlign(pThis);
     if (RT_SUCCESS(rc))
     {
@@ -407 +424 @@
         rc = vusbSnifferBlockAddData(pThis, pvOption, cbOption);
         if (RT_SUCCESS(rc))
-        {
-            /* Pad to 32bits. */
-            uint8_t abPad[3] = { 0 };
-            uint32_t cbPad = RT_ALIGN_32(cbOption, 4) - cbOption;
-
-            Assert(cbPad <= 3);
-            if (cbPad)
-                rc = vusbSnifferBlockAddData(pThis, abPad, cbPad);
-        }
+            rc = vusbSnifferBlockAlign(pThis);
     }
 
@@ -535 +544 @@
             }
             RTSemFastMutexDestroy(pThis->hMtx);
+            pThis->hMtx = NIL_RTSEMFASTMUTEX;
         }
         VUSBSnifferDestroy(pThis);
@@ -582 +592 @@
     DumpFileUsbHeaderLnxMmapped UsbHdr;
     DumpFileUsbSetup UsbSetup;
-    uint64_t u64TimestampEvent = RTTimeNanoTS();
+    RTTIMESPEC TimeNow;
+    uint64_t u64TimestampEvent;
+
+    RTTimeNow(&TimeNow);
+    u64TimestampEvent = RTTimeSpecGetNano(&TimeNow);
 
     /* Start with the enhanced packet block. */
@@ -628 +642 @@
     bool fRecordData = false;
     size_t cbUrbLength = 0;
+    uint32_t cbCapturedLength = sizeof(UsbHdr);
 
     if (   pUrb->cbData
-        && (    (   pUrb->enmDir == VUSBDIRECTION_OUT
+        && (    (   (   pUrb->enmDir == VUSBDIRECTION_OUT
+                     || pUrb->enmDir == VUSBDIRECTION_SETUP)
                  && pUrb->enmType != VUSBXFERTYPE_CTRL
                  && pUrb->enmType != VUSBXFERTYPE_MSG
                  && enmEvent == VUSBSNIFFEREVENT_SUBMIT)
-             || (   pUrb->enmDir == VUSBDIRECTION_IN
+             || (   (   pUrb->enmDir == VUSBDIRECTION_IN
+                     || pUrb->enmDir == VUSBDIRECTION_SETUP)
                  && enmEvent == VUSBSNIFFEREVENT_COMPLETE)))
     {
-        Epb.u32CapturedLen = sizeof(UsbHdr) + pUrb->cbData;
-        Epb.u32PacketLen   = sizeof(UsbHdr) + pUrb->cbData;
+        cbCapturedLength += pUrb->cbData;
         fRecordData = true;
     }
-    else
-    {
-        Epb.u32CapturedLen = sizeof(UsbHdr);
-        Epb.u32PacketLen   = sizeof(UsbHdr);
-    }
 
     if (pUrb->enmType == VUSBXFERTYPE_MSG || pUrb->enmType == VUSBXFERTYPE_CTRL)
     {
         PVUSBSETUP pSetup = (PVUSBSETUP)pUrb->abData;
-        cbUrbLength = pSetup->wLength;
+        cbUrbLength = pSetup->wLength + sizeof(DumpFileUsbSetup);
     }
     else
         cbUrbLength = pUrb->cbData;
+
+    Epb.u32CapturedLen = cbCapturedLength;
+    Epb.u32PacketLen   = cbCapturedLength;
 
     UsbHdr.u8EndpointNumber = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0x00);