Changeset 53060 in vbox for trunk

Timestamp:

Oct 15, 2014 12:09:51 PM (11 years ago)

Author:

vboxsync

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

96562

Message:

VUSBSniffer: Fixes

File:

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

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

@@ -221 +221 @@
 typedef DumpFileUsbHeaderLnxMmapped *PDumpFileUsbHeaderLnxMmapped;
 
+AssertCompileSize(DumpFileUsbHeaderLnxMmapped, 64);
+
 /**
  * USB packet isochronous descriptor.
@@ -291 +293 @@
 
 /**
+ * Adds new data to the current block.
+ *
+ * @returns VBox status code.
+ * @param   pThis           The VUSB sniffer instance.
+ * @param   pvData          The data to add.
+ * @param   cbData          Amount of data to add.
+ */
+static int vusbSnifferBlockAddData(PVUSBSNIFFERINT pThis, const void *pvData, uint32_t cbData)
+{
+    int rc = VINF_SUCCESS;
+
+    Assert(pThis->cbBlockCur);
+    AssertPtr(pThis->pBlockHdr);
+
+    void *pv = vusbSnifferBlockAllocSpace(pThis, cbData);
+    if (pv)
+        memcpy(pv, pvData, cbData);
+    else
+        rc = VERR_NO_MEMORY;
+
+    return rc;
+}
+
+/**
  * Commits the current block to the capture file.
  *
@@ -302 +328 @@
     AssertPtr(pThis->pBlockHdr);
 
-    /* Update the block total length field. */
-    uint32_t *pcbTotalLength = (uint32_t *)vusbSnifferBlockAllocSpace(pThis, 4);
-    if (pcbTotalLength)
-    {
-        *pcbTotalLength = pThis->cbBlockCur;
-        pThis->pBlockHdr->u32BlockTotalLength = pThis->cbBlockCur;
-
-        /* Write the data. */
-        rc = RTFileWrite(pThis->hFile, pThis->pbBlockData, pThis->cbBlockCur, NULL);
-        pThis->cbBlockCur = 0;
-        pThis->pBlockHdr  = NULL;
-    }
-    else
-        rc = VERR_NO_MEMORY;
+    /* Pad to 32bits. */
+    uint8_t abPad[3] = { 0 };
+    uint32_t cbPad = RT_ALIGN_32(pThis->cbBlockCur, 4) - pThis->cbBlockCur;
+
+    Assert(cbPad <= 3);
+    if (cbPad)
+        rc = vusbSnifferBlockAddData(pThis, abPad, cbPad);
+
+    if (RT_SUCCESS(rc))
+    {
+        /* Update the block total length field. */
+        uint32_t *pcbTotalLength = (uint32_t *)vusbSnifferBlockAllocSpace(pThis, 4);
+        if (pcbTotalLength)
+        {
+            *pcbTotalLength = pThis->cbBlockCur;
+            pThis->pBlockHdr->u32BlockTotalLength = pThis->cbBlockCur;
+
+            /* Write the data. */
+            rc = RTFileWrite(pThis->hFile, pThis->pbBlockData, pThis->cbBlockCur, NULL);
+            pThis->cbBlockCur = 0;
+            pThis->pBlockHdr  = NULL;
+        }
+        else
+            rc = VERR_NO_MEMORY;
+    }
 
     return rc;
@@ -338 +375 @@
     if (pThis->pBlockHdr)
         memcpy(pThis->pBlockHdr, pBlockHdr, cbData);
-    else
-        rc = VERR_NO_MEMORY;
-
-    return rc;
-}
-
-/**
- * Adds new data to the current block.
- *
- * @returns VBox status code.
- * @param   pThis           The VUSB sniffer instance.
- * @param   pvData          The data to add.
- * @param   cbData          Amount of data to add.
- */
-static int vusbSnifferBlockAddData(PVUSBSNIFFERINT pThis, const void *pvData, uint32_t cbData)
-{
-    int rc = VINF_SUCCESS;
-
-    Assert(pThis->cbBlockCur);
-    AssertPtr(pThis->pBlockHdr);
-
-    void *pv = vusbSnifferBlockAllocSpace(pThis, cbData);
-    if (pv)
-        memcpy(pv, pvData, cbData);
     else
         rc = VERR_NO_MEMORY;
@@ -562 +575 @@
     Epb.u32TimestampHigh        = (u64TimestampEvent >> 32) & UINT32_C(0xffffffff);
     Epb.u32TimestampLow         = u64TimestampEvent & UINT32_C(0xffffffff);
-    Epb.u32CapturedLen          = sizeof(UsbHdr) + pUrb->cbData;
-    Epb.u32PacketLen            = sizeof(UsbHdr) + pUrb->cbData;
 
     UsbHdr.u64Id = (uint64_t)pUrb; /** @todo: check whether the pointer is a good ID. */
@@ -601 +612 @@
 
     bool fRecordData = false;
+    size_t cbUrbLength = 0;
 
     if (   pUrb->cbData
@@ -609 +621 @@
              || (   pUrb->enmDir == VUSBDIRECTION_IN
                  && enmEvent == VUSBSNIFFEREVENT_COMPLETE)))
+    {
+        Epb.u32CapturedLen = sizeof(UsbHdr) + pUrb->cbData;
+        Epb.u32PacketLen   = sizeof(UsbHdr) + pUrb->cbData;
         fRecordData = true;
-
-    UsbHdr.u8EndpointNumber = pUrb->EndPt | pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0x00;
+    }
+    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;
+    }
+    else
+        cbUrbLength = pUrb->cbData;
+
+    UsbHdr.u8EndpointNumber = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? 0x80 : 0x00);
     UsbHdr.u8DeviceAddress  = pUrb->DstAddress;
     UsbHdr.u16BusId         = 0;
-    UsbHdr.u8SetupFlag      = pUrb->enmType == VUSBXFERTYPE_MSG || pUrb->enmType == VUSBXFERTYPE_CTRL ? 0 : 1;
     UsbHdr.u8DataFlag       = fRecordData ? 0 : 1;
     UsbHdr.u64TimestampSec  = u64TimestampEvent / RT_NS_1SEC_64;;
     UsbHdr.u32TimestampUSec = u64TimestampEvent / RT_NS_1US_64 - UsbHdr.u64TimestampSec * RT_US_1SEC;
     UsbHdr.i32Status        = pUrb->enmStatus;
-    UsbHdr.u32UrbLength     = pUrb->cbData;
+    UsbHdr.u32UrbLength     = cbUrbLength;
     UsbHdr.u32DataLength    = fRecordData ? pUrb->cbData : 0;
     UsbHdr.i32Interval      = 0;
     UsbHdr.i32StartFrame    = 0;
     UsbHdr.u32XferFlags     = 0;
-    UsbHdr.u32NumDesc       = pUrb->enmType == VUSBXFERTYPE_ISOC ? : 0;
-
-    if (   pUrb->enmType == VUSBXFERTYPE_CTRL
-        || pUrb->enmType == VUSBXFERTYPE_MSG)
+    UsbHdr.u32NumDesc       = pUrb->enmType == VUSBXFERTYPE_ISOC ? pUrb->cIsocPkts : 0;
+
+    if (   (pUrb->enmType == VUSBXFERTYPE_MSG || pUrb->enmType == VUSBXFERTYPE_CTRL)
+        && enmEvent == VUSBSNIFFEREVENT_SUBMIT)
     {
         PVUSBSETUP pSetup = (PVUSBSETUP)pUrb->abData;
@@ -636 +664 @@
         UsbHdr.u.UsbSetup.wIndex        = pSetup->wIndex;
         UsbHdr.u.UsbSetup.wLength       = pSetup->wLength;
-    }
+        UsbHdr.u8SetupFlag              = 0;
+    }
+    else
+        UsbHdr.u8SetupFlag  = '-'; /* Follow usbmon source here. */
 
     rc = vusbSnifferBlockNew(pThis, &Epb.Hdr, sizeof(Epb));
@@ -642 +673 @@
         rc = vusbSnifferBlockAddData(pThis, &UsbHdr, sizeof(UsbHdr));
 
-    /* Add Isochronous descriptors now. */
-    for (unsigned i = 0; i < pUrb->cIsocPkts && RT_SUCCESS(rc); i++)
-    {
-        DumpFileUsbIsoDesc IsoDesc;
-        IsoDesc.i32Status = pUrb->aIsocPkts[i].enmStatus;
-        IsoDesc.u32Offset = pUrb->aIsocPkts[i].off;
-        IsoDesc.u32Len    = pUrb->aIsocPkts[i].cb;
-        rc = vusbSnifferBlockAddData(pThis, &IsoDesc, sizeof(IsoDesc));
+    if (pUrb->enmType == VUSBXFERTYPE_ISOC)
+    {
+        /* Add Isochronous descriptors now. */
+        for (unsigned i = 0; i < pUrb->cIsocPkts && RT_SUCCESS(rc); i++)
+        {
+            DumpFileUsbIsoDesc IsoDesc;
+            IsoDesc.i32Status = pUrb->aIsocPkts[i].enmStatus;
+            IsoDesc.u32Offset = pUrb->aIsocPkts[i].off;
+            IsoDesc.u32Len    = pUrb->aIsocPkts[i].cb;
+            rc = vusbSnifferBlockAddData(pThis, &IsoDesc, sizeof(IsoDesc));
+        }
     }
 
@@ -658 +692 @@
 
     if (RT_SUCCESS(rc))
+        rc = vusbSnifferAddOption(pThis, DUMPFILE_OPTION_CODE_END, NULL, 0);
+
+    if (RT_SUCCESS(rc))
         rc = vusbSnifferBlockCommit(pThis);