Changeset 13024 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 6, 2008 10:35:32 PM (17 years ago)

Author:

vboxsync

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

37463

Message:

installation fixes, NetFlt initialization fixes for filter approach

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Network/DrvIntNet.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -751 +751 @@
         Serial/DrvHostSerial.cpp
 
+if defined(VBOX_WITH_NETFLT) && "$(KBUILD_TARGET)" == "win"
+ if defined(VBOX_NETFLT_ONDEMAND_BIND)
+  Drivers_DEFS.win += VBOX_NETFLT_ONDEMAND_BIND
+ else
+  Drivers_SOURCES.win += Network/win/DrvIntNet-win.cpp
+ endif
+endif
 
 # -- features --

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -41 +41 @@
 #include "../Builtins.h"
 
+#if defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT) && !defined(VBOX_NETFLT_ONDEMAND_BIND)
+# include "win/DrvIntNet-win.h"
+#endif
 
 /*******************************************************************************
@@ -913 +916 @@
 
 #elif defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+# ifndef VBOX_NETFLT_ONDEMAND_BIND
+    /* we have a ndis filter driver started on system boot before the VBoxDrv,
+     * tell the filter driver to init VBoxNetFlt functionality */
+    rc = drvIntNetWinConstruct(pDrvIns, pCfgHandle);
+    if (RT_FAILURE(rc))
+    {
+        return rc;
+    }
+# endif
     /* Temporary hack: attach to a network with the name 'if=en0' and you're hitting the wire. */
     if (    !OpenReq.szTrunk[0]