Changeset 57576 in vbox for trunk

Timestamp:

Aug 28, 2015 10:53:56 AM (9 years ago)

Author:

vboxsync

Message:

NetFlt/Win: do not restart netlwf filter when VM changes state (#8009)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp (modified) (9 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetLwf-win.cpp

@@ -17 +17 @@
 
 //#define VBOXNETLWF_SYNC_SEND
-#define VBOXNETLWF_NO_BYPASS
 
 #include <VBox/version.h>
@@ -100 +99 @@
 //FILTER_CANCEL_OID_REQUEST vboxNetLwfWinCancelOidRequest;
 FILTER_STATUS vboxNetLwfWinStatus;
-FILTER_SET_MODULE_OPTIONS vboxNetLwfWinSetModuleOptions;
 //FILTER_NET_PNP_EVENT vboxNetLwfWinPnPEvent;
 FILTER_SEND_NET_BUFFER_LISTS vboxNetLwfWinSendNetBufferLists;
@@ -1427 +1425 @@
     LogFlow(("==>vboxNetLwfWinSendNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
-#ifdef VBOXNETLWF_NO_BYPASS
+
     if (!ASMAtomicReadBool(&pModule->fActive))
     {
@@ -1437 +1435 @@
         return;
     }
-#endif
+
     if (vboxNetLwfWinIsRunning(pModule))
     {
@@ -1562 +1560 @@
     LogFlow(("==>vboxNetLwfWinReceiveNetBufferLists: module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
-#ifdef VBOXNETLWF_NO_BYPASS
+
     if (!ASMAtomicReadBool(&pModule->fActive))
     {
@@ -1573 +1571 @@
         return;
     }
-#endif
+
     if (vboxNetLwfWinIsRunning(pModule))
     {
@@ -1719 +1717 @@
 }
 
-NDIS_STATUS vboxNetLwfWinSetModuleOptions(IN NDIS_HANDLE hModuleCtx)
-{
-    LogFlow(("==>vboxNetLwfWinSetModuleOptions: module=%p\n", hModuleCtx));
-    PVBOXNETLWF_MODULE pModuleCtx = (PVBOXNETLWF_MODULE)hModuleCtx;
-    NDIS_FILTER_PARTIAL_CHARACTERISTICS PChars;
-
-    NdisZeroMemory(&PChars, sizeof(PChars));
-
-    PChars.Header.Type = NDIS_OBJECT_TYPE_FILTER_PARTIAL_CHARACTERISTICS;
-    PChars.Header.Size = NDIS_SIZEOF_FILTER_PARTIAL_CHARACTERISTICS_REVISION_1;
-    PChars.Header.Revision = NDIS_FILTER_PARTIAL_CHARACTERISTICS_REVISION_1;
-
-#ifndef VBOXNETLWF_NO_BYPASS
-    if (ASMAtomicReadBool(&pModuleCtx->fActive))
-#endif
-    {
-        Log(("vboxNetLwfWinSetModuleOptions: active mode\n"));
-        PChars.SendNetBufferListsHandler = vboxNetLwfWinSendNetBufferLists;
-        PChars.SendNetBufferListsCompleteHandler = vboxNetLwfWinSendNetBufferListsComplete;
-        PChars.ReceiveNetBufferListsHandler = vboxNetLwfWinReceiveNetBufferLists;
-        PChars.ReturnNetBufferListsHandler = vboxNetLwfWinReturnNetBufferLists;
-    }
-#ifndef VBOXNETLWF_NO_BYPASS
-    else
-    {
-        Log(("vboxNetLwfWinSetModuleOptions: bypass mode\n"));
-    }
-#endif
-    NDIS_STATUS Status = NdisSetOptionalHandlers(pModuleCtx->hFilter,
-                                                 (PNDIS_DRIVER_OPTIONAL_HANDLERS)&PChars);
-    LogFlow(("<==vboxNetLwfWinSetModuleOptions: status=0x%x\n", Status));
-    return Status;
-}
-
 /**
  * register the filter driver
@@ -1792 +1756 @@
     FChars.StatusHandler = vboxNetLwfWinStatus;
     //FChars.NetPnPEventHandler = vboxNetLwfWinPnPEvent;
-    FChars.SetFilterModuleOptionsHandler = vboxNetLwfWinSetModuleOptions;
-
-    /* Optional functions */
+
+    /* Datapath functions */
     FChars.SendNetBufferListsHandler = vboxNetLwfWinSendNetBufferLists;
     FChars.SendNetBufferListsCompleteHandler = vboxNetLwfWinSendNetBufferListsComplete;
@@ -2163 +2126 @@
     if (fOldActive != fActive)
     {
-        /// @todo Shouldn't we wait for traffic to cease here? Probably not.
-        /* Schedule restart to enable/disable bypass mode */
-        NdisFRestartFilter(pModuleCtx->hFilter);
         Status = vboxNetLwfWinSetPacketFilter(pModuleCtx, fActive);
         LogFlow(("<==vboxNetFltPortOsSetActive: vboxNetLwfWinSetPacketFilter() returned 0x%x\n", Status));