Changeset 53062 in vbox

Timestamp:

Oct 15, 2014 12:34:18 PM (11 years ago)

Author:

vboxsync

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

96564

Message:

USB: Integrate USB sniffer. Make it possible to specify a file to dump the traffic to when attaching a USB device with VBoxManage

Location:

trunk

Files:

• include/VBox/vmm/pdmdrv.h (modified) (2 diffs)
• include/VBox/vmm/pdmusb.h (modified) (1 diff)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/USB/DrvVUSBRootHub.cpp (modified) (2 diffs)
• src/VBox/Devices/USB/VUSBDevice.cpp (modified) (5 diffs)
• src/VBox/Devices/USB/VUSBInternal.h (modified) (4 diffs)
• src/VBox/Devices/USB/VUSBUrb.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (2 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (6 diffs)
• src/VBox/Main/include/ConsoleImpl.h (modified) (3 diffs)
• src/VBox/Main/include/HostUSBDeviceImpl.h (modified) (3 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (3 diffs)
• src/VBox/Main/include/SessionImpl.h (modified) (1 diff)
• src/VBox/Main/include/USBProxyService.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (9 diffs)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src/VBox/Main/src-client/EmulatedUSBImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-client/SessionImpl.cpp (modified) (1 diff)
• src/VBox/Main/src-server/HostUSBDeviceImpl.cpp (modified) (8 diffs)
• src/VBox/Main/src-server/MachineImpl.cpp (modified) (5 diffs)
• src/VBox/Main/src-server/USBProxyService.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/PDMUsb.cpp (modified) (7 diffs)

trunk/include/VBox/vmm/pdmdrv.h

@@ -508 +508 @@
      *
      * @returns VBox status code.
-     * @param   pDrvIns     The hub instance.
-     * @param   pUsbIns     The device to attach.
-     * @param   piPort      Where to store the port number the device was attached to.
+     * @param   pDrvIns            The hub instance.
+     * @param   pUsbIns            The device to attach.
+     * @param   pszCaptureFilename Path to the file for USB traffic capturing, optional.
+     * @param   piPort             Where to store the port number the device was attached to.
      * @thread EMT.
      */
-    DECLR3CALLBACKMEMBER(int, pfnAttachDevice,(PPDMDRVINS pDrvIns, PPDMUSBINS pUsbIns, uint32_t *piPort));
+    DECLR3CALLBACKMEMBER(int, pfnAttachDevice,(PPDMDRVINS pDrvIns, PPDMUSBINS pUsbIns, const char *pszCaptureFilename, uint32_t *piPort));
 
     /**
@@ -537 +538 @@
 
 /** Current PDMUSBHUBREG version number. */
-#define PDM_USBHUBREG_VERSION                   PDM_VERSION_MAKE(0xf0fd, 1, 0)
+#define PDM_USBHUBREG_VERSION                   PDM_VERSION_MAKE(0xf0fd, 2, 0)
 
 

trunk/include/VBox/vmm/pdmusb.h

@@ -1058 +1058 @@
 typedef DECLCALLBACK(int) FNPDMVBOXUSBREGISTER(PCPDMUSBREGCB pCallbacks, uint32_t u32Version);
 
-VMMR3DECL(int)  PDMR3UsbCreateEmulatedDevice(PUVM pUVM, const char *pszDeviceName, PCFGMNODE pDeviceNode, PCRTUUID pUuid);
+VMMR3DECL(int)  PDMR3UsbCreateEmulatedDevice(PUVM pUVM, const char *pszDeviceName, PCFGMNODE pDeviceNode, PCRTUUID pUuid,
+                                             const char *pszCaptureFilename);
 VMMR3DECL(int)  PDMR3UsbCreateProxyDevice(PUVM pUVM, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend,
-                                          uint32_t iUsbVersion, uint32_t fMaskedIfs);
+                                          uint32_t iUsbVersion, uint32_t fMaskedIfs, const char *pszCaptureFilename);
 VMMR3DECL(int)  PDMR3UsbDetachDevice(PUVM pUVM, PCRTUUID pUuid);
 VMMR3DECL(bool) PDMR3UsbHasHub(PUVM pUVM);

trunk/src/VBox/Devices/Makefile.kmk

@@ -354 +354 @@
         USB/VUSBDevice.cpp \
         USB/VUSBReadAhead.cpp \
-        USB/VUSBUrb.cpp
+        USB/VUSBUrb.cpp \
+        USB/VUSBSniffer.cpp
  endif
 

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

@@ -255 +255 @@
 
 /** @copydoc PDMUSBHUBREG::pfnAttachDevice */
-static DECLCALLBACK(int) vusbPDMHubAttachDevice(PPDMDRVINS pDrvIns, PPDMUSBINS pUsbIns, uint32_t *piPort)
+static DECLCALLBACK(int) vusbPDMHubAttachDevice(PPDMDRVINS pDrvIns, PPDMUSBINS pUsbIns, const char *pszCaptureFilename, uint32_t *piPort)
 {
     PVUSBROOTHUB pThis = PDMINS_2_DATA(pDrvIns, PVUSBROOTHUB);
@@ -264 +264 @@
     PVUSBDEV pDev = (PVUSBDEV)RTMemAllocZ(sizeof(*pDev));
     AssertReturn(pDev, VERR_NO_MEMORY);
-    int rc = vusbDevInit(pDev, pUsbIns);
+    int rc = vusbDevInit(pDev, pUsbIns, pszCaptureFilename);
     if (RT_SUCCESS(rc))
     {

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

@@ -34 +34 @@
 #include "VUSBInternal.h"
 
+#include "VUSBSniffer.h"
 
 /*******************************************************************************
@@ -1283 +1284 @@
     AssertRC(rc);
 
+    if (pDev->hSniffer != VUSBSNIFFER_NIL)
+        VUSBSnifferDestroy(pDev->hSniffer);
+
     RTCritSectDelete(&pDev->CritSectAsyncUrbs);
     /* Not using vusbDevSetState() deliberately here because it would assert on the state. */
@@ -1697 +1701 @@
  * @param   pUsbIns Pointer to the PDM USB Device instance.
  */
-int vusbDevInit(PVUSBDEV pDev, PPDMUSBINS pUsbIns)
+int vusbDevInit(PVUSBDEV pDev, PPDMUSBINS pUsbIns, const char *pszCaptureFilename)
 {
     /*
@@ -1733 +1737 @@
     }
     pDev->pResetTimer = NULL;
+    pDev->hSniffer = VUSBSNIFFER_NIL;
 
     int rc = RTCritSectInit(&pDev->CritSectAsyncUrbs);
@@ -1751 +1756 @@
                                 "USB Device Reset Timer",  &pDev->pResetTimer);
     AssertRCReturn(rc, rc);
+
+    if (pszCaptureFilename)
+    {
+        rc = VUSBSnifferCreate(&pDev->hSniffer, 0, pszCaptureFilename, NULL);
+        AssertRCReturn(rc, rc);
+    }
 
     /*

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

@@ -31 +31 @@
 #include <iprt/queueatomic.h>
 #include <iprt/req.h>
+
+#include "VUSBSniffer.h"
 
 RT_C_DECLS_BEGIN
@@ -216 +218 @@
      * synchronous and without any other thread accessing the USB device. */
     RTREQQUEUE          hReqQueueSync;
+    /** Sniffer instance for this device if configured. */
+    VUSBSNIFFER         hSniffer;
     /** Flag whether the URB I/O thread should terminate. */
     bool volatile       fTerminate;
@@ -222 +226 @@
 #if HC_ARCH_BITS == 32
     /** Align the size to a 8 byte boundary. */
-    bool                afAlignment0[2];
+    bool                afAlignment0[6];
 #endif
 } VUSBDEV;
@@ -248 +252 @@
 
 
-int vusbDevInit(PVUSBDEV pDev, PPDMUSBINS pUsbIns);
+int vusbDevInit(PVUSBDEV pDev, PPDMUSBINS pUsbIns, const char *pszCaptureFilename);
 int vusbDevCreateOld(const char *pszDeviceName, void *pvDriverInit, PCRTUUID pUuid, PVUSBDEV *ppDev);
 void vusbDevDestroy(PVUSBDEV pDev);

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

@@ -1012 +1012 @@
               || pUrb->enmState == VUSBURBSTATE_CANCELLED, ("%d\n", pUrb->enmState));
 
+    if (pUrb->VUsb.pDev->hSniffer)
+    {
+        int rc = VUSBSnifferRecordEvent(pUrb->VUsb.pDev->hSniffer, pUrb,
+                                          pUrb->enmStatus == VUSBSTATUS_OK
+                                        ? VUSBSNIFFEREVENT_COMPLETE
+                                        : VUSBSNIFFEREVENT_ERROR_COMPLETE);
+        if (RT_FAILURE(rc))
+            LogRel(("VUSB: Capturing URB completion event failed with %Rrc\n", rc));
+    }
 
 #ifdef VBOX_WITH_STATISTICS
@@ -1896 +1905 @@
     int rc;
 
+    if (pDev->hSniffer)
+    {
+        rc = VUSBSnifferRecordEvent(pDev->hSniffer, pUrb, VUSBSNIFFEREVENT_SUBMIT);
+        if (RT_FAILURE(rc))
+            LogRel(("VUSB: Capturing URB submit event failed with %Rrc\n", rc));
+    }
+
 #ifdef VBOX_WITH_USB
     if (pPipe && pPipe->hReadAhead)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -933 +933 @@
                 break;
             }
+            else if (a->argc == 4 || a->argc > 5)
+            {
+                errorSyntax(USAGE_CONTROLVM, "Wrong number of arguments");
+                rc = E_FAIL;
+                break;
+            }
 
             bool attach = !strcmp(a->argv[1], "usbattach");
 
             Bstr usbId = a->argv[2];
+            Bstr captureFilename;
+
+            if (a->argc == 5)
+            {
+                if (!strcmp(a->argv[3], "--capturefile"))
+                    captureFilename = a->argv[4];
+                else
+                {
+                    errorArgument("Invalid parameter '%s'", a->argv[3]);
+                    rc = E_FAIL;
+                    break;
+                }
+            }
 
             Guid guid(usbId);
@@ -971 +990 @@
 
             if (attach)
-                CHECK_ERROR_BREAK(console, AttachUSBDevice(usbId.raw()));
+                CHECK_ERROR_BREAK(console, AttachUSBDevice(usbId.raw(), captureFilename.raw()));
             else
             {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -372 +372 @@
                      "                            [--autostart-enabled on|off]\n"
                      "                            [--autostart-delay <seconds>]\n"
-#if 0 /* Disabled until the feature is implemented. */
+#if 0
                      "                            [--autostop-type disabled|savestate|poweroff|\n"
                      "                                             acpishutdown]\n"
@@ -468 +468 @@
                      "                            natpf<1-N> delete <rulename> |\n"
                      "                            guestmemoryballoon <balloonsize in MB> |\n"
-                     "                            usbattach <uuid>|<address> |\n"
+                     "                            usbattach <uuid>|<address>\n"
+                     "                                      [--capturefile <filename>] |\n"
                      "                            usbdetach <uuid>|<address> |\n"
                      "                            clipboard disabled|hosttoguest|guesttohost|\n"

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1640 +1640 @@
     {
         /* Try to attach corresponding device: */
-        console().AttachUSBDevice(target.id);
+        console().AttachUSBDevice(target.id, QString(""));
         /* Check if console is OK: */
         if (!console().isOk())

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3495 +3495 @@
   <interface
     name="IInternalMachineControl" extends="$unknown"
-    uuid="2d9ce4b7-0ab2-4931-ac4a-e45aa66465ef"
+    uuid="1470ff16-d7fa-448e-9c38-0352a36053bf"
     internal="yes"
     wsmap="suppress"
@@ -3605 +3605 @@
       </desc>
       <param name="id" type="uuid" mod="string" dir="in"/>
+      <param name="captureFilename" type="wstring" dir="in"/>
     </method>
 
@@ -7492 +7493 @@
   <interface
     name="IConsole" extends="$unknown"
-    uuid="d129b03e-037a-40b1-b288-a08ae73de535"
+    uuid="e51702d7-4f8f-4ebe-ac47-4b77defffd18"
     wsmap="managed"
     >
@@ -7940 +7941 @@
       <param name="id" type="uuid" mod="string" dir="in">
         <desc>UUID of the host USB device to attach.</desc>
+      </param>
+      <param name="captureFilename" type="wstring" dir="in">
+        <desc>Filename to capture the USB traffic to.</desc>
       </param>
     </method>
@@ -17880 +17884 @@
   <interface
     name="IInternalSessionControl" extends="$unknown"
-    uuid="b7c71040-2761-42c4-a44a-4e2c2d7e2820"
+    uuid="fdb5fa71-eddb-4e06-9844-277d22270fe0"
     internal="yes"
     wsmap="suppress"
@@ -18221 +18225 @@
       <param name="error" type="IVirtualBoxErrorInfo" dir="in"/>
       <param name="maskedInterfaces" type="unsigned long" dir="in"/>
+      <param name="captureFilename" type="wstring" dir="in"/>
     </method>
 

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -168 +168 @@
     HRESULT i_onUSBControllerChange();
     HRESULT i_onSharedFolderChange(BOOL aGlobal);
-    HRESULT i_onUSBDeviceAttach(IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs);
+    HRESULT i_onUSBDeviceAttach(IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs,
+                                const Utf8Str &aCaptureFilename);
     HRESULT i_onUSBDeviceDetach(IN_BSTR aId, IVirtualBoxErrorInfo *aError);
     HRESULT i_onBandwidthGroupChange(IBandwidthGroup *aBandwidthGroup);
@@ -318 +319 @@
     HRESULT getDeviceActivity(const std::vector<DeviceType_T> &aType,
                               std::vector<DeviceActivity_T> &aActivity);
-    HRESULT attachUSBDevice(const com::Guid &aId);
+    HRESULT attachUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename);
     HRESULT detachUSBDevice(const com::Guid &aId,
                             ComPtr<IUSBDevice> &aDevice);
@@ -743 +744 @@
 
 #ifdef VBOX_WITH_USB
-    HRESULT i_attachUSBDevice(IUSBDevice *aHostDevice, ULONG aMaskedIfs);
+    HRESULT i_attachUSBDevice(IUSBDevice *aHostDevice, ULONG aMaskedIfs, const Utf8Str &aCaptureFilename);
     HRESULT i_detachUSBDevice(const ComObjPtr<OUSBDevice> &aHostDevice);
 
     static DECLCALLBACK(int) i_usbAttachCallback(Console *that, PUVM pUVM, IUSBDevice *aHostDevice, PCRTUUID aUuid,
                                                  bool aRemote, const char *aAddress, void *pvRemoteBackend,
-                                                 USHORT aPortVersion, ULONG aMaskedIfs);
+                                                 USHORT aPortVersion, ULONG aMaskedIfs, const char *pszCaptureFilename);
     static DECLCALLBACK(int) i_usbDetachCallback(Console *that, PUVM pUVM, PCRTUUID aUuid);
 #endif

trunk/src/VBox/Main/include/HostUSBDeviceImpl.h

@@ -209 +209 @@
     com::Utf8Str i_getName();
 
-    HRESULT i_requestCaptureForVM(SessionMachine *aMachine, bool aSetError, ULONG aMaskedIfs = 0);
+    HRESULT i_requestCaptureForVM(SessionMachine *aMachine, bool aSetError,
+                                  const com::Utf8Str &aCaptureFilename, ULONG aMaskedIfs = 0);
     HRESULT i_onDetachFromVM(SessionMachine *aMachine, bool aDone, bool *aRunFilters, bool aAbnormal = false);
     HRESULT i_requestReleaseToHost();
@@ -229 +230 @@
 protected:
 
-    HRESULT i_attachToVM(SessionMachine *aMachine, ULONG aMaskedIfs = 0);
+    HRESULT i_attachToVM(SessionMachine *aMachine, const com::Utf8Str &aCaptureFilename, ULONG aMaskedIfs = 0);
     void i_detachFromVM(HostUSBDeviceState aFinalState);
     void i_onPhysicalDetachedInternal();
@@ -300 +301 @@
      * This points to the string in mNameObj. */
     const char *mName;
+    /** The filename to capture the USB traffic to. */
+    com::Utf8Str mCaptureFilename;
 
     friend class USBProxyService;

trunk/src/VBox/Main/include/MachineImpl.h

@@ -1144 +1144 @@
                                 BOOL *aMatched,
                                 ULONG *aMaskedInterfaces);
-    HRESULT captureUSBDevice(const com::Guid &aId);
+    HRESULT captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename);
     HRESULT detachUSBDevice(const com::Guid &aId,
                             BOOL aDone);
@@ -1285 +1285 @@
     HRESULT i_onUSBDeviceAttach(IUSBDevice *aDevice,
                                 IVirtualBoxErrorInfo *aError,
-                                ULONG aMaskedIfs);
+                                ULONG aMaskedIfs,
+                                const com::Utf8Str &aCaptureFilename);
     HRESULT i_onUSBDeviceDetach(IN_BSTR aId,
                                 IVirtualBoxErrorInfo *aError);
@@ -1315 +1316 @@
                                 BOOL *aMatched,
                                 ULONG *aMaskedInterfaces);
-    HRESULT captureUSBDevice(const com::Guid &aId);
+    HRESULT captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename);
     HRESULT detachUSBDevice(const com::Guid &aId,
                             BOOL aDone);

trunk/src/VBox/Main/include/SessionImpl.h

@@ -97 +97 @@
     HRESULT onUSBDeviceAttach(const ComPtr<IUSBDevice> &aDevice,
                               const ComPtr<IVirtualBoxErrorInfo> &aError,
-                              ULONG aMaskedInterfaces);
+                              ULONG aMaskedInterfaces,
+                              const com::Utf8Str &aCaptureFilename);
     HRESULT onUSBDeviceDetach(const com::Guid &aId,
                               const ComPtr<IVirtualBoxErrorInfo> &aError);

trunk/src/VBox/Main/include/USBProxyService.h

@@ -63 +63 @@
     /** @name SessionMachine Interfaces
      * @{ */
-    HRESULT captureDeviceForVM(SessionMachine *aMachine, IN_GUID aId);
+    HRESULT captureDeviceForVM(SessionMachine *aMachine, IN_GUID aId, const com::Utf8Str &aCaptureFilename);
     HRESULT detachDeviceFromVM(SessionMachine *aMachine, IN_GUID aId, bool aDone);
     HRESULT autoCaptureDevicesForVM(SessionMachine *aMachine);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -2827 +2827 @@
 }
 
-HRESULT Console::attachUSBDevice(const com::Guid &aId)
+HRESULT Console::attachUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename)
 {
 #ifdef VBOX_WITH_USB
@@ -2853 +2853 @@
 
     /* Request the device capture */
-    return mControl->CaptureUSBDevice(Bstr(aId.toString()).raw());
+    return mControl->CaptureUSBDevice(Bstr(aId.toString()).raw(), Bstr(aCaptureFilename).raw());
 
 #else   /* !VBOX_WITH_USB */
@@ -5271 +5271 @@
  * @note Locks this object for writing.
  */
-HRESULT Console::i_onUSBDeviceAttach(IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs)
+HRESULT Console::i_onUSBDeviceAttach(IUSBDevice *aDevice, IVirtualBoxErrorInfo *aError, ULONG aMaskedIfs,
+                                     const Utf8Str &aCaptureFilename)
 {
 #ifdef VBOX_WITH_USB
@@ -5309 +5310 @@
 
     alock.release();
-    HRESULT rc = i_attachUSBDevice(aDevice, aMaskedIfs);
+    HRESULT rc = i_attachUSBDevice(aDevice, aMaskedIfs, aCaptureFilename);
     if (FAILED(rc))
     {
@@ -8316 +8317 @@
  * @note Synchronously calls EMT.
  */
-HRESULT Console::i_attachUSBDevice(IUSBDevice *aHostDevice, ULONG aMaskedIfs)
+HRESULT Console::i_attachUSBDevice(IUSBDevice *aHostDevice, ULONG aMaskedIfs,
+                                   const Utf8Str &aCaptureFilename)
 {
     AssertReturn(aHostDevice, E_FAIL);
@@ -8365 +8367 @@
 
     int vrc = VMR3ReqCallWaitU(ptrVM.rawUVM(), 0 /* idDstCpu (saved state, see #6232) */,
-                               (PFNRT)i_usbAttachCallback, 9,
+                               (PFNRT)i_usbAttachCallback, 10,
                                this, ptrVM.rawUVM(), aHostDevice, uuid.raw(), fRemote,
-                               Address.c_str(), pvRemoteBackend, portVersion, aMaskedIfs);
+                               Address.c_str(), pvRemoteBackend, portVersion, aMaskedIfs,
+                               aCaptureFilename.isEmpty() ? NULL : aCaptureFilename.c_str());
     if (RT_SUCCESS(vrc))
     {
@@ -8418 +8421 @@
 DECLCALLBACK(int)
 Console::i_usbAttachCallback(Console *that, PUVM pUVM, IUSBDevice *aHostDevice, PCRTUUID aUuid, bool aRemote,
-                             const char *aAddress, void *pvRemoteBackend, USHORT aPortVersion, ULONG aMaskedIfs)
+                             const char *aAddress, void *pvRemoteBackend, USHORT aPortVersion, ULONG aMaskedIfs,
+                             const char *pszCaptureFilename)
 {
     LogFlowFuncEnter();
@@ -8429 +8433 @@
                                         aPortVersion == 3 ? VUSB_STDVER_30 :
                                         aPortVersion == 2 ? VUSB_STDVER_11 : VUSB_STDVER_20,
-                                        aMaskedIfs);
+                                        aMaskedIfs, pszCaptureFilename);
     LogFlowFunc(("vrc=%Rrc\n", vrc));
     LogFlowFuncLeave();
@@ -9053 +9057 @@
             {
                 alock.release();
-                hrc = i_onUSBDeviceAttach(pUSBDevice, NULL, fMaskedIfs);
+                hrc = i_onUSBDeviceAttach(pUSBDevice, NULL, fMaskedIfs, Utf8Str());
                 alock.acquire();
 

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -3955 +3955 @@
                     RTUuidCreate(&UsbMsd.mUuid);
                     UsbMsd.iPort = uInstance;
-                    rc = PDMR3UsbCreateEmulatedDevice(pUVM, pcszDevice, pCtlInst, &UsbMsd.mUuid);
+                    rc = PDMR3UsbCreateEmulatedDevice(pUVM, pcszDevice, pCtlInst, &UsbMsd.mUuid, NULL);
                     if (RT_SUCCESS(rc))
                         mUSBStorageDevices.push_back(UsbMsd);

trunk/src/VBox/Main/src-client/EmulatedUSBImpl.cpp

@@ -171 +171 @@
 
     /* pInstance will be used by PDM and deallocated on error. */
-    rc = PDMR3UsbCreateEmulatedDevice(pUVM, "Webcam", pInstance, &pThis->mUuid);
+    rc = PDMR3UsbCreateEmulatedDevice(pUVM, "Webcam", pInstance, &pThis->mUuid, NULL);
     LogRelFlowFunc(("PDMR3UsbCreateEmulatedDevice %Rrc\n", rc));
     return rc;

trunk/src/VBox/Main/src-client/SessionImpl.cpp

@@ -730 +730 @@
 HRESULT Session::onUSBDeviceAttach(const ComPtr<IUSBDevice> &aDevice,
                                    const ComPtr<IVirtualBoxErrorInfo> &aError,
-                                   ULONG aMaskedInterfaces)
-{
-    LogFlowThisFunc(("\n"));
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
-    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
-#ifndef VBOX_COM_INPROC_API_CLIENT
-    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
-
-    return mConsole->i_onUSBDeviceAttach(aDevice, aError, aMaskedInterfaces);
+                                   ULONG aMaskedInterfaces,
+                                   const com::Utf8Str &aCaptureFilename)
+{
+    LogFlowThisFunc(("\n"));
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
+    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
+#ifndef VBOX_COM_INPROC_API_CLIENT
+    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
+
+    return mConsole->i_onUSBDeviceAttach(aDevice, aError, aMaskedInterfaces, aCaptureFilename);
 #else
     return S_OK;

trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp

@@ -312 +312 @@
  * process, which means it will temporarily release all locks. (Is this a good idea?)
  *
- * @param   aMachine    Machine this device should be attach to.
- * @param   aSetError   Whether to set full error message or not to bother.
- * @param   aMaskedIfs  The interfaces to hide from the guest.
+ * @param   aMachine         Machine this device should be attach to.
+ * @param   aSetError        Whether to set full error message or not to bother.
+ * @param   aCaptureFilename The filename to capture the USB traffic to.
+ * @param   aMaskedIfs       The interfaces to hide from the guest.
  *
  * @returns Status indicating whether it was successfully captured and/or attached.
@@ -321 +322 @@
  * @retval  E_* as appropriate.
  */
-HRESULT HostUSBDevice::i_requestCaptureForVM(SessionMachine *aMachine, bool aSetError, ULONG aMaskedIfs /* = 0*/)
+HRESULT HostUSBDevice::i_requestCaptureForVM(SessionMachine *aMachine, bool aSetError,
+                                             const com::Utf8Str &aCaptureFilename, ULONG aMaskedIfs /* = 0*/)
 {
     /*
@@ -377 +379 @@
     {
         alock.release();
-        HRESULT hrc = i_attachToVM(aMachine, aMaskedIfs);
+        HRESULT hrc = i_attachToVM(aMachine, aCaptureFilename, aMaskedIfs);
         return SUCCEEDED(hrc);
     }
@@ -396 +398 @@
     mMachine = aMachine;
     mMaskedIfs = aMaskedIfs;
+    mCaptureFilename = aCaptureFilename;
     alock.release();
     int rc = mUSBProxyService->captureDevice(this);
@@ -430 +433 @@
  * @param   aMaskedIfs      The interfaces to hide from the guest.
  */
-HRESULT HostUSBDevice::i_attachToVM(SessionMachine *aMachine, ULONG aMaskedIfs /* = 0*/)
+HRESULT HostUSBDevice::i_attachToVM(SessionMachine *aMachine, const com::Utf8Str &aCaptureFilename,
+                                    ULONG aMaskedIfs /* = 0*/)
 {
     AssertReturn(!isWriteLockOnCurrentThread(), E_FAIL);
@@ -457 +461 @@
     LogFlowThisFunc(("{%s} Calling machine->onUSBDeviceAttach()...\n", mName));
     alock.release();
-    HRESULT hrc = aMachine->i_onUSBDeviceAttach(d, NULL, aMaskedIfs);
+    HRESULT hrc = aMachine->i_onUSBDeviceAttach(d, NULL, aMaskedIfs, aCaptureFilename);
     LogFlowThisFunc(("{%s} Done machine->onUSBDeviceAttach()=%08X\n", mName, hrc));
 
@@ -1337 +1341 @@
                         {
                             alock.release();
-                            i_attachToVM(mMachine, mMaskedIfs);
+                            i_attachToVM(mMachine, mCaptureFilename, mMaskedIfs);
                             alock.acquire();
                         }
@@ -1475 +1479 @@
             {
                 alock.release();
-                i_attachToVM(mMachine, mMaskedIfs);
+                i_attachToVM(mMachine, mCaptureFilename, mMaskedIfs);
             }
             return true;

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -12784 +12784 @@
  *  @note Locks the same as Host::captureUSBDevice() does.
  */
-HRESULT SessionMachine::captureUSBDevice(const com::Guid &aId)
+HRESULT SessionMachine::captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename)
 {
     LogFlowThisFunc(("\n"));
@@ -12796 +12796 @@
     USBProxyService *service = mParent->i_host()->i_usbProxyService();
     AssertReturn(service, E_FAIL);
-    return service->captureDeviceForVM(this, aId.ref());
+    return service->captureDeviceForVM(this, aId.ref(), aCaptureFilename);
 #else
     NOREF(aId);
@@ -13814 +13814 @@
 HRESULT SessionMachine::i_onUSBDeviceAttach(IUSBDevice *aDevice,
                                             IVirtualBoxErrorInfo *aError,
-                                            ULONG aMaskedIfs)
+                                            ULONG aMaskedIfs,
+                                            const com::Utf8Str &aCaptureFilename)
 {
     LogFlowThisFunc(("\n"));
@@ -13839 +13840 @@
     AssertMsg(RTLockValidatorReadLockGetCount(RTThreadSelf()) == 0, ("%d\n", RTLockValidatorReadLockGetCount(RTThreadSelf())));
 
-    return directControl->OnUSBDeviceAttach(aDevice, aError, aMaskedIfs);
+    return directControl->OnUSBDeviceAttach(aDevice, aError, aMaskedIfs, Bstr(aCaptureFilename).raw());
 }
 
@@ -14393 +14394 @@
 }
 
-HRESULT Machine::captureUSBDevice(const com::Guid &aId)
+HRESULT Machine::captureUSBDevice(const com::Guid &aId, const com::Utf8Str &aCaptureFilename)
 {
     NOREF(aId);

trunk/src/VBox/Main/src-server/USBProxyService.cpp

@@ -166 +166 @@
  *          former case it will temporarily abandon locks because of IPC.
  */
-HRESULT USBProxyService::captureDeviceForVM(SessionMachine *aMachine, IN_GUID aId)
+HRESULT USBProxyService::captureDeviceForVM(SessionMachine *aMachine, IN_GUID aId, const com::Utf8Str &aCaptureFilename)
 {
     ComAssertRet(aMachine, E_INVALIDARG);
@@ -183 +183 @@
      */
     alock.release();
-    return pHostDevice->i_requestCaptureForVM(aMachine, true /* aSetError */);
+    return pHostDevice->i_requestCaptureForVM(aMachine, true /* aSetError */, aCaptureFilename);
 }
 
@@ -528 +528 @@
     {
         /* try to capture the device */
-        HRESULT hrc = aDevice->i_requestCaptureForVM(aMachine, false /* aSetError */, ulMaskedIfs);
+        HRESULT hrc = aDevice->i_requestCaptureForVM(aMachine, false /* aSetError */, Utf8Str(), ulMaskedIfs);
         return SUCCEEDED(hrc)
             || hrc == E_UNEXPECTED /* bad device state, give up */;

trunk/src/VBox/VMM/VMMR3/PDMUsb.cpp

@@ -458 +458 @@
  *
  * @returns VBox status code.
- * @param   pVM             Pointer to the VM.
- * @param   pUsbDev         The USB device emulation.
- * @param   iInstance       -1 if not called by pdmR3UsbInstantiateDevices().
- * @param   pUuid           The UUID for this device.
- * @param   ppInstanceNode  Pointer to the device instance pointer. This is set to NULL if inserted
- *                          into the tree or cleaned up.
- *
- *                          In the pdmR3UsbInstantiateDevices() case (iInstance != -1) this is
- *                          the actual instance node and will not be cleaned up.
- *
- * @parma   iUsbVersion     The USB version preferred by the device.
+ * @param   pVM                 Pointer to the VM.
+ * @param   pUsbDev             The USB device emulation.
+ * @param   iInstance           -1 if not called by pdmR3UsbInstantiateDevices().
+ * @param   pUuid               The UUID for this device.
+ * @param   ppInstanceNode      Pointer to the device instance pointer. This is set to NULL if inserted
+ *                              into the tree or cleaned up.
+ *
+ *                              In the pdmR3UsbInstantiateDevices() case (iInstance != -1) this is
+ *                              the actual instance node and will not be cleaned up.
+ *
+ * @param   iUsbVersion         The USB version preferred by the device.
+ * @param   pszCaptureFilename  Path to the file for USB traffic capturing, optional.
  */
 static int pdmR3UsbCreateDevice(PVM pVM, PPDMUSBHUB pHub, PPDMUSB pUsbDev, int iInstance, PCRTUUID pUuid,
-                                PCFGMNODE *ppInstanceNode, uint32_t iUsbVersion)
+                                PCFGMNODE *ppInstanceNode, uint32_t iUsbVersion, const char *pszCaptureFilename)
 {
     const bool fAtRuntime = iInstance == -1;
@@ -629 +630 @@
          */
         Log(("PDM: Attaching it...\n"));
-        rc = pHub->Reg.pfnAttachDevice(pHub->pDrvIns, pUsbIns, &pUsbIns->Internal.s.iPort);
+        rc = pHub->Reg.pfnAttachDevice(pHub->pDrvIns, pUsbIns, pszCaptureFilename, &pUsbIns->Internal.s.iPort);
         if (RT_SUCCESS(rc))
         {
@@ -856 +857 @@
          */
         rc = pdmR3UsbCreateDevice(pVM, pHub, paUsbDevs[i].pUsbDev, paUsbDevs[i].iInstance, &paUsbDevs[i].Uuid,
-                                  &paUsbDevs[i].pNode, iUsbVersion);
+                                  &paUsbDevs[i].pNode, iUsbVersion, NULL);
         if (RT_FAILURE(rc))
             return rc;
@@ -872 +873 @@
  *
  * @returns VBox status code.
- * @param   pUVM            The user mode VM handle.
- * @param   pszDeviceName   The name of the PDM device to instantiate.
- * @param   pInstanceNode   The instance CFGM node.
- * @param   pUuid           The UUID to be associated with the device.
+ * @param   pUVM                The user mode VM handle.
+ * @param   pszDeviceName       The name of the PDM device to instantiate.
+ * @param   pInstanceNode       The instance CFGM node.
+ * @param   pUuid               The UUID to be associated with the device.
+ * @param   pszCaptureFilename  Path to the file for USB traffic capturing, optional.
  *
  * @thread EMT
  */
-VMMR3DECL(int) PDMR3UsbCreateEmulatedDevice(PUVM pUVM, const char *pszDeviceName, PCFGMNODE pInstanceNode, PCRTUUID pUuid)
+VMMR3DECL(int) PDMR3UsbCreateEmulatedDevice(PUVM pUVM, const char *pszDeviceName, PCFGMNODE pInstanceNode, PCRTUUID pUuid,
+                                            const char *pszCaptureFilename)
 {
     /*
@@ -929 +932 @@
      * Create and attach the device.
      */
-    rc = pdmR3UsbCreateDevice(pVM, pHub, pUsbDev, -1, pUuid, &pInstanceNode, iUsbVersion);
+    rc = pdmR3UsbCreateDevice(pVM, pHub, pUsbDev, -1, pUuid, &pInstanceNode, iUsbVersion, pszCaptureFilename);
     AssertRCReturn(rc, rc);
 
@@ -943 +946 @@
  *
  * @returns VBox status code.
- * @param   pUVM            The user mode VM handle.
- * @param   pUuid           The UUID to be associated with the device.
- * @param   fRemote         Whether it's a remove or local device.
- * @param   pszAddress      The address string.
- * @param   pvBackend       Pointer to the backend.
- * @param   iUsbVersion     The preferred USB version.
- * @param   fMaskedIfs      The interfaces to hide from the guest.
+ * @param   pUVM                The user mode VM handle.
+ * @param   pUuid               The UUID to be associated with the device.
+ * @param   fRemote             Whether it's a remove or local device.
+ * @param   pszAddress          The address string.
+ * @param   pvBackend           Pointer to the backend.
+ * @param   iUsbVersion         The preferred USB version.
+ * @param   fMaskedIfs          The interfaces to hide from the guest.
+ * @param   pszCaptureFilename  Path to the file for USB traffic capturing, optional.
  */
 VMMR3DECL(int) PDMR3UsbCreateProxyDevice(PUVM pUVM, PCRTUUID pUuid, bool fRemote, const char *pszAddress, void *pvBackend,
-                                         uint32_t iUsbVersion, uint32_t fMaskedIfs)
+                                         uint32_t iUsbVersion, uint32_t fMaskedIfs, const char *pszCaptureFilename)
 {
     /*
@@ -1017 +1021 @@
      * Finally, try to create it.
      */
-    rc = pdmR3UsbCreateDevice(pVM, pHub, pUsbDev, -1, pUuid, &pInstance, iUsbVersion);
+    rc = pdmR3UsbCreateDevice(pVM, pHub, pUsbDev, -1, pUuid, &pInstance, iUsbVersion, pszCaptureFilename);
     if (RT_FAILURE(rc) && pInstance)
         CFGMR3RemoveNode(pInstance);