Changeset 51480 in vbox for trunk/src/VBox

Timestamp:

May 30, 2014 9:10:39 PM (11 years ago)

Author:

vboxsync

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

94072

Message:

NetFlt/LwfWin: NDIS6 filter driver (#7231)

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (2 diffs)
• HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (1 diff)
• Runtime/VBox/log-vbox.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -140 +140 @@
  endif # signing
 
+
+ #
+ # VBoxNetLwf.sys - The light-weight filter driver for NDIS6.
+ #
+ SYSMODS += VBoxNetLwf
+ VBoxNetLwf_TEMPLATE = VBOXR0DRV
+ VBoxNetLwf_INST = $(INST_VBOXNETFLT)
+ if defined(VBOX_SIGNING_MODE)
+  VBoxNetLwf_INSTTYPE = none
+  VBoxNetLwf_DEBUG_INSTTYPE = both
+ endif
+ VBoxNetLwf_DEFS = IN_RT_R0 IN_SUP_STATIC 
+ VBoxNetLwf_INCS = .
+ VBoxNetLwf_SOURCES = VBoxNetFlt.c
+ VBoxNetLwf_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK_WLH) $(VBOX_WINPSDK)INCS
+ VBoxNetLwf_SOURCES.win = \
+        win/ndis6/VBoxNetLwf-win.cpp
+#       win/drv/VBoxNetLwfRt-win.cpp \
+#       win/drv/VBoxNetLwf-win.rc
+ # with WINDDKWLH the WIN9X_COMPAT_SPINLOCK is needed to avoid inline declaration of KeInitializeSpinLock
+ # otherwise the linker would complain about dumplicate _KeInitializeSpinLock@4 definition
+ # in ntoskrnl.lib and our object files
+ VBoxNetLwf_DEFS.win += WIN9X_COMPAT_SPINLOCK=1 NDISLWF=1 DBG=1
+# VBoxNetLwf_DEFS.win += VBOXNETFLT_STATIC_CONFIG
+# VBoxNetLwf_DEFS.win += VBOXNETFLT_NO_PACKET_QUEUE
+# VBoxNetLwf_DEFS.win += NDIS_MINIPORT_DRIVER NDIS_WDM=1 BINARY_COMPATIBLE=0
+ VBoxNetLwf_DEFS.win += NDIS60=1
+# ifdef VBOX_LOOPBACK_USEFLAGS
+#  VBoxNetLwf_DEFS.win += VBOX_LOOPBACK_USEFLAGS
+# endif
+# VBoxNetLwf_SOURCES = VBoxNetLwf.c
+ VBoxNetLwf_LDFLAGS.win.x86 = -Entry:DriverEntry@8
+ VBoxNetLwf_LDFLAGS.win.amd64 = -Entry:DriverEntry
+ VBoxNetLwf_LIBS.win = \
+        $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/hal.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_WLH)_LIB)/ndis.lib \
+        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
+ VBoxNetLwf_LIBS = \
+        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
+ #
+ # VBoxNetLwf installation.
+ #
+ INSTALLS.win += VBoxNetLwf-inf
+ VBoxNetLwf-inf_INST = $(INST_BIN)
+ VBoxNetLwf-inf_SOURCES = \
+        $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.inf
+ VBoxNetLwf-inf_CLEAN = $(VBoxNetLwf-inf_SOURCES)
+ VBoxNetLwf-inf_BLDDIRS = $(PATH_TARGET)/VBoxNetLwfCat.dir
+
+$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.inf: $(PATH_SUB_CURRENT)/win/ndis6/VBoxNetLwf.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,VBoxNetLwf-inf,$@,$<)
+        $(call VBOX_EDIT_INF_FN,$<,$@)
+
+ ifdef VBOX_SIGNING_MODE
+VBoxNetLwf-inf_SOURCES += \
+        $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.sys \
+        $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.cat
+
+#       $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwfNobj.dll \
+
+$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.sys: $$(VBoxNetLwf_1_TARGET) | $$(dir $$@)
+        $(INSTALL) -m 644 $< $(@D)
+
+#$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwfNobj.dll: $$(VBoxNetLwfNobj_1_TARGET) | $$(dir $$@)
+#       $(INSTALL) -m 644 $< $(@D)
+
+$(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.cat: \
+                $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.sys \
+                $(PATH_TARGET)/VBoxNetLwfCat.dir/VBoxNetLwf.inf
+        $(call MSG_TOOL,Inf2Cat,VBoxNetLwf-inf,$@,$<)
+        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
+
+ endif # signing
+
+
+
+
  #
  # WinNetConfig - static library with host network interface config API
@@ -203 +281 @@
  NetAdpUninstall_SOURCES  = win/tools/VBoxNetAdpUninstall.cpp
  NetAdpUninstall_LIBS     = \
+        $(WinNetConfig_1_TARGET) \
+        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
+
+ #
+ # NetLwfInstall
+ #
+ PROGRAMS.win  += NetLwfInstall
+ NetLwfInstall_TEMPLATE = VBOXR3STATIC
+ NetLwfInstall_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
+ NetLwfInstall_SOURCES  = win/tools/VBoxNetLwfInstall.cpp
+ NetLwfInstall_LIBS     = \
+        $(WinNetConfig_1_TARGET) \
+        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
+        $(PATH_SDK_$(VBOX_WINDDK)_LIB)/Newdev.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
+
+
+ #
+ # NetLwfUninstall
+ #
+ PROGRAMS.win  += NetLwfUninstall
+ NetLwfUninstall_TEMPLATE = VBOXR3STATIC
+ NetLwfUninstall_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
+ NetLwfUninstall_SOURCES  = win/tools/VBoxNetLwfUninstall.cpp
+ NetLwfUninstall_LIBS     = \
         $(WinNetConfig_1_TARGET) \
         $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -2042 +2042 @@
                                                  apInfFullPaths,
                                                  cInfFullPaths,
+                                                 NULL);
+    }
+    return hr;
+}
+
+/*
+ * Use the same id as does the old implementation for NDIS 5
+ * #define VBOXNETCFGWIN_NETLWF_ID    L"oracle_VBoxNetLwf"
+ */
+#define VBOXNETCFGWIN_NETLWF_ID    L"sun_VBoxNetFlt"
+
+static HRESULT vboxNetCfgWinNetLwfUninstall(IN INetCfg *pNc, DWORD InfRmFlags)
+{
+    INetCfgComponent * pNcc = NULL;
+    HRESULT hr = pNc->FindComponent(VBOXNETCFGWIN_NETLWF_ID, &pNcc);
+    if (hr == S_OK)
+    {
+        NonStandardLog("NetLwf is installed currently, uninstalling ...\n");
+
+        hr = VBoxNetCfgWinUninstallComponent(pNc, pNcc);
+
+        pNcc->Release();
+    }
+    else if (hr == S_FALSE)
+    {
+        NonStandardLog("NetLwf is not installed currently\n");
+        hr = S_OK;
+    }
+    else
+    {
+        NonStandardLogFlow(("FindComponent failed, hr (0x%x)\n", hr));
+        hr = S_OK;
+    }
+
+    VBoxDrvCfgInfUninstallAllF(L"NetService", VBOXNETCFGWIN_NETLWF_ID, InfRmFlags);
+
+    return hr;
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetLwfUninstall(IN INetCfg *pNc)
+{
+    return vboxNetCfgWinNetLwfUninstall(pNc, 0);
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetLwfInstall(IN INetCfg *pNc,
+                                                       IN LPCWSTR const pInfFullPath)
+{
+    HRESULT hr = vboxNetCfgWinNetLwfUninstall(pNc, SUOI_FORCEDELETE);
+    if (SUCCEEDED(hr))
+    {
+        NonStandardLog("NetLwf will be installed ...\n");
+        hr = vboxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETLWF_ID,
+                                                 &GUID_DEVCLASS_NETSERVICE,
+                                                 &pInfFullPath,
+                                                 1,
                                                  NULL);
     }

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -470 +470 @@
 # endif
 # if defined(DEBUG_aleksey)  /* Guest ring-0 as well */
-        RTLogGroupSettings(pLogger, "+net_adp_drv.e.l.f+net_flt_drv.e.l.l2.l3.l4.l5.f");
+        RTLogGroupSettings(pLogger, "net_flt_drv.e.l.f.l3.l4.l5");
         RTLogFlags(pLogger, "enabled unbuffered");
         pLogger->fDestFlags |= RTLOGDEST_DEBUGGER | RTLOGDEST_STDOUT;