Changeset 14271 in vbox for trunk/src/VBox

Timestamp:

Nov 17, 2008 10:49:54 PM (16 years ago)

Author:

vboxsync

Message:

NetFlt/win: fixes for the case NetFlt is not installed

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvIntNet.cpp (modified) (1 diff)
• Main/HostImpl.cpp (modified) (2 diffs)

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

@@ -1014 +1014 @@
 
 #elif defined(RT_OS_WINDOWS) && defined(VBOX_WITH_NETFLT)
+
+    if(OpenReq.enmTrunkType == kIntNetTrunkType_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;
-    }
+        /* 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
-    if(OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt)
-    {
+
         char szBindName[INTNET_MAX_TRUNK_NAME];
         int cBindName = INTNET_MAX_TRUNK_NAME;

trunk/src/VBox/Main/HostImpl.cpp

@@ -960 +960 @@
         /* for the filter-based approach we get all miniports our filter (sun_VBoxNetFlt)is bound to */
         hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
+# ifndef VBOX_WITH_HARDENING
+        if(hr != S_OK)
+        {
+            /* TODO: try to install the netflt from here */
+        }
+# endif
+
 #endif
 
-        Assert(hr == S_OK);
         if(hr == S_OK)
         {
@@ -1002 +1008 @@
             VBoxNetCfgWinReleaseRef(pTcpIpNcc);
         }
+        else
+        {
+            LogRel(("failed to get the sun_VBoxNetFlt component, error (0x%x)", hr));
+        }
+
         VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
     }