Changeset 55207 in vbox

Timestamp:

Apr 13, 2015 12:45:00 PM (10 years ago)

Author:

vboxsync

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

99513

Message:

NDIS6/NetLwf: "No bypass" option enabled by default (#7231)

File:

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

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

@@ -17 +17 @@
 
 //#define VBOXNETLWF_SYNC_SEND
+#define VBOXNETLWF_NO_BYPASS
 
 #include <VBox/version.h>
@@ -1418 +1419 @@
     LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
+#ifdef VBOXNETLWF_NO_BYPASS
+    if (!ASMAtomicReadBool(&pModule->fActive))
+    {
+        /*
+         * The trunk is inactive, jusp pass along all packets to the next
+         * underlying driver.
+         */
+        NdisFSendNetBufferLists(pModule->hFilter, pBufLists, nPort, fFlags);
+        return;
+    }
+#endif
     if (vboxNetLwfWinIsRunning(pModule))
     {
@@ -1542 +1554 @@
     LogFlow(("==>"__FUNCTION__": module=%p\n", hModuleCtx));
     PVBOXNETLWF_MODULE pModule = (PVBOXNETLWF_MODULE)hModuleCtx;
+#ifdef VBOXNETLWF_NO_BYPASS
+    if (!ASMAtomicReadBool(&pModule->fActive))
+    {
+        /*
+         * The trunk is inactive, jusp pass along all packets to the next
+         * overlying driver.
+         */
+        NdisFIndicateReceiveNetBufferLists(pModule->hFilter, pBufLists, nPort, nBufLists, fFlags);
+        return;
+    }
+#endif
     if (vboxNetLwfWinIsRunning(pModule))
     {
@@ -1699 +1722 @@
     PChars.Header.Revision = NDIS_FILTER_PARTIAL_CHARACTERISTICS_REVISION_1;
 
+#ifndef VBOXNETLWF_NO_BYPASS
     if (ASMAtomicReadBool(&pModuleCtx->fActive))
+#endif
     {
         Log((__FUNCTION__": active mode\n"));
@@ -1707 +1732 @@
         PChars.ReturnNetBufferListsHandler = vboxNetLwfWinReturnNetBufferLists;
     }
+#ifndef VBOXNETLWF_NO_BYPASS
     else
     {
         Log((__FUNCTION__": bypass mode\n"));
     }
+#endif
     NDIS_STATUS Status = NdisSetOptionalHandlers(pModuleCtx->hFilter,
                                                  (PNDIS_DRIVER_OPTIONAL_HANDLERS)&PChars);