Changeset 38512 in vbox

Timestamp:

Aug 24, 2011 9:35:09 AM (13 years ago)

Author:

vboxsync

Message:

usb/win: avoid replugging/filtering netsed hubs (typically could occur for empty filters)

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbFlt.cpp

@@ -350 +350 @@
 }
 
+static bool vboxUsbFltDevCanBeCaptured(PVBOXUSBFLT_DEVICE pDevice)
+{
+    if (pDevice->bClass == USB_DEVICE_CLASS_HUB)
+    {
+        LOG(("device (0x%p), pdo (0x%p) is a hub, can not be captured", pDevice, pDevoce->Pdo));
+        return false;
+    }
+    return true;
+}
+
 static PVBOXUSBFLTCTX vboxUsbFltDevMatchLocked(PVBOXUSBFLT_DEVICE pDevice, uintptr_t *puId, bool fRemoveFltIfOneShot, bool *pfFilter, bool *pfIsOneShot)
 {
+    *puId = 0;
+    *pfFilter = false;
+    *pfIsOneShot = false;
+    if (!vboxUsbFltDevCanBeCaptured(pDevice))
+    {
+        LOG(("vboxUsbFltDevCanBeCaptured returned false"));
+        return NULL;
+    }
+
     USBFILTER DevFlt;
     USBFilterInit(&DevFlt, USBFILTERTYPE_CAPTURE);
@@ -365 +384 @@
 
     /* Run filters on the thing. */
-    *puId = 0;
-    *pfFilter = false;
-    *pfIsOneShot = false;
     PVBOXUSBFLTCTX pOwner = VBoxUSBFilterMatchEx(&DevFlt, puId, fRemoveFltIfOneShot, pfFilter, pfIsOneShot);
     USBFilterDelete(&DevFlt);
@@ -767 +783 @@
     KIRQL Irql = KeGetCurrentIrql();
     ASSERT_WARN(Irql == PASSIVE_LEVEL, ("unexpected IRQL (%d)", Irql));
-
-
 
     PDEVICE_RELATIONS pDevRelations = NULL;