Changeset 53318 in vbox for trunk

Timestamp:

Nov 13, 2014 10:06:29 AM (10 years ago)

Author:

vboxsync

Message:

NDIS6/NetLwf: Use new component id (oracle_VBoxNetLwf) instead of old sun_VBoxNetFlt

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (1 diff)
• HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf.inf (modified) (2 diffs)
• Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (2 diffs)
• Main/src-server/HostImpl.cpp (modified) (2 diffs)
• Main/src-server/win/NetIf-win.cpp (modified) (2 diffs)

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

@@ -2088 +2088 @@
 }
 
-/*
- * 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"
+#define VBOXNETCFGWIN_NETLWF_ID    L"oracle_VBoxNetLwf"
 
 static HRESULT vboxNetCfgWinNetLwfUninstall(IN INetCfg *pNc, DWORD InfRmFlags)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/ndis6/VBoxNetLwf.inf

@@ -2 +2 @@
 ; @file
 ; VBoxNetLwf.inf - VirtualBox Bridged Networking Driver inf file
-;
-; Note: We use the same component id as the old NetFlt implementation 
 ;
 ;
@@ -32 +30 @@
 
 [VBox]
-%VBoxNetLwf_Desc% = VBoxNetLwf.ndi, sun_VBoxNetFlt
+%VBoxNetLwf_Desc% = VBoxNetLwf.ndi, oracle_VBoxNetLwf
 
 [VBox.NTx86]
-%VBoxNetLwf_Desc% = VBoxNetLwf.ndi, sun_VBoxNetFlt
+%VBoxNetLwf_Desc% = VBoxNetLwf.ndi, oracle_VBoxNetLwf
 
 [VBox.NTamd64]
-%VBoxNetLwf_Desc% = VBoxNetLwf.ndi, sun_VBoxNetFlt
+%VBoxNetLwf_Desc% = VBoxNetLwf.ndi, oracle_VBoxNetLwf
 
 [VBoxNetLwf.ndi]

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -498 +498 @@
 
 #define NETLWF_INF_NAME L"VBoxNetLwf.inf"
-#define NETLWF_ID       L"sun_VBoxNetLwf" /** @todo Needs to be changed (?). */
-#define NETADP6_ID      L"sun_VBoxNetAdp6" /** @todo Needs to be changed (?). */
 
 static MSIHANDLE g_hCurrentModule = NULL;
@@ -860 +858 @@
         if (uErr == ERROR_SUCCESS)
         {
-            WCHAR wszInfName[] = L"VBoxNetLwf.inf";
+            WCHAR wszInfName[] = NETLWF_INF_NAME;
             WCHAR wszInf[MAX_PATH];
             DWORD cchInf = RT_ELEMENTS(wszInf) - sizeof(NETLWF_INF_NAME) - 1;

trunk/src/VBox/Main/src-server/HostImpl.cpp

@@ -671 +671 @@
         hr = pNc->FindComponent(L"MS_TCPIP", &pTcpIpNcc);
 #    else
-        /* for the filter-based approach we get all miniports our filter (sun_VBoxNetFlt)is bound to */
-        hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
+        /* for the filter-based approach we get all miniports our filter (oracle_VBoxNetLwf)is bound to */
+        hr = pNc->FindComponent(L"oracle_VBoxNetLwf", &pTcpIpNcc);
+        if (hr != S_OK)
+        {
+            /* fall back to NDIS5 miniport lookup (sun_VBoxNetFlt) */
+            hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
+        }
 #     ifndef VBOX_WITH_HARDENING
         if (hr != S_OK)
@@ -736 +741 @@
         else
         {
-            LogRel(("failed to get the sun_VBoxNetFlt component, error (0x%x)\n", hr));
+            LogRel(("failed to get the oracle_VBoxNetLwf(sun_VBoxNetFlt) component, error (0x%x)\n", hr));
         }
 

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -1481 +1481 @@
         hr = pNc->FindComponent(L"MS_TCPIP", &pTcpIpNcc);
 # else
-        /* for the filter-based approach we get all miniports our filter (sun_VBoxNetFlt)is bound to */
-        hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
+        /* for the filter-based approach we get all miniports our filter (oracle_VBoxNetLwf)is bound to */
+        hr = pNc->FindComponent(L"oracle_VBoxNetLwf", &pTcpIpNcc);
+        if (hr != S_OK)
+        {
+            /* fall back to NDIS5 miniport lookup (sun_VBoxNetFlt) */
+            hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
+        }
 #  ifndef VBOX_WITH_HARDENING
         if (hr != S_OK)
@@ -1571 +1576 @@
         else
         {
-            LogRel(("failed to get the sun_VBoxNetFlt component, error (0x%x)\n", hr));
+            LogRel(("failed to get the oracle_VBoxNetLwf(sun_VBoxNetFlt) component, error (0x%x)\n", hr));
         }