Changeset 53067 in vbox for trunk/src

Timestamp:

Oct 15, 2014 1:10:29 PM (10 years ago)

Author:

vboxsync

Message:

Add possibility to configure a single USB traffic sniffer for a complete roothub (must be configured through extra data)

Location:

trunk/src/VBox/Devices/USB

Files:

• DrvVUSBRootHub.cpp (modified) (6 diffs)
• VUSBInternal.h (modified) (2 diffs)
• VUSBUrb.cpp (modified) (1 diff)

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

@@ -499 +499 @@
 #endif
 
+    /* If there is a sniffer on the roothub record the URB there. */
+    if (pRh->hSniffer != VUSBSNIFFER_NIL)
+    {
+        int rc = VUSBSnifferRecordEvent(pRh->hSniffer, pUrb, VUSBSNIFFEREVENT_SUBMIT);
+        if (RT_FAILURE(rc))
+            LogRel(("VUSB: Capturing URB submit event on the root hub failed with %Rrc\n", rc));
+    }
+
     /*
      * The device was resolved when we allocated the URB.
@@ -888 +896 @@
         pRh->Hub.pszName = NULL;
     }
+    if (pRh->hSniffer != VUSBSNIFFER_NIL)
+        VUSBSnifferDestroy(pRh->hSniffer);
     RTCritSectDelete(&pRh->CritSectDevices);
     RTCritSectDelete(&pRh->CritSectFreeUrbs);
@@ -907 +917 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "\0"))
+    if (!CFGMR3AreValuesValid(pCfg, "CaptureFilename\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
@@ -927 +937 @@
     if (RT_FAILURE(rc))
         return rc;
+
+    char *pszCaptureFilename = NULL;
+    rc = CFGMR3QueryStringAlloc(pCfg, "CaptureFilename", &pszCaptureFilename);
+    if (   RT_FAILURE(rc)
+        && rc != VERR_CFGM_VALUE_NOT_FOUND)
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                   N_("Configuration error: Failed to query value of \"CaptureFilename\""));
 
     /*
@@ -958 +975 @@
     pThis->IRhConnector.pfnAttachDevice = vusbRhAttachDevice;
     pThis->IRhConnector.pfnDetachDevice = vusbRhDetachDevice;
+    pThis->hSniffer                     = VUSBSNIFFER_NIL;
     /*
      * Resolve interface(s).
@@ -977 +995 @@
     pThis->fHcVersions = pThis->pIRhPort->pfnGetUSBVersions(pThis->pIRhPort);
     Log(("vusbRhConstruct: fHcVersions=%u\n", pThis->fHcVersions));
+
+    if (pszCaptureFilename)
+    {
+        rc = VUSBSnifferCreate(&pThis->hSniffer, 0, pszCaptureFilename, NULL);
+        if (RT_FAILURE(rc))
+            return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                       N_("Failed to create USB sniffer instance"));
+
+        MMR3HeapFree(pszCaptureFilename);
+    }
 
     /*

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -383 +383 @@
     /** Chain of free URBs. (Singly linked) */
     PVUSBURB                pFreeUrbs;
+    /** Sniffer instance for the root hub. */
+    VUSBSNIFFER             hSniffer;
     /** The number of URBs in the pool. */
     uint32_t                cUrbsInPool;
@@ -388 +390 @@
     uint32_t                fHcVersions;
 #ifdef VBOX_WITH_STATISTICS
-#if HC_ARCH_BITS == 32
-    uint32_t                Alignment2; /**< Counters must be 64-bit aligned. */
-#endif
     VUSBROOTHUBTYPESTATS    Total;
     VUSBROOTHUBTYPESTATS    aTypes[VUSBXFERTYPE_MSG];

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

@@ -1028 +1028 @@
     PVUSBROOTHUB pRh = vusbDevGetRh(pUrb->VUsb.pDev);
     AssertPtrReturnVoid(pRh);
+
+    /* If there is a sniffer on the roothub record the completed URB there too. */
+    if (pRh->hSniffer != VUSBSNIFFER_NIL)
+    {
+        int rc = VUSBSnifferRecordEvent(pRh->hSniffer, pUrb,
+                                          pUrb->enmStatus == VUSBSTATUS_OK
+                                        ? VUSBSNIFFEREVENT_COMPLETE
+                                        : VUSBSNIFFEREVENT_ERROR_COMPLETE);
+        if (RT_FAILURE(rc))
+            LogRel(("VUSB: Capturing URB completion event on the root hub failed with %Rrc\n", rc));
+    }
+
     if (pUrb->enmType != VUSBXFERTYPE_MSG)
     {