vbox的更動 53062 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

時間撮記:

2014-10-15 下午12:34:18 (10 年 以前)

作者:

vboxsync

訊息:

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

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (修改) (9 筆差異)

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();