Changeset 53062 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 15, 2014 12:34:18 PM (10 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/src/VBox/Main/src-client

Files:

• ConsoleImpl.cpp (modified) (9 diffs)
• ConsoleImpl2.cpp (modified) (1 diff)
• EmulatedUSBImpl.cpp (modified) (1 diff)
• SessionImpl.cpp (modified) (1 diff)

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;