Changeset 55941 in vbox for trunk/src/VBox/Main

Timestamp:

May 19, 2015 7:33:17 PM (10 years ago)

Author:

vboxsync

Message:

Network/HostOnly: Use driver enumeration instead of registry access for trunk type detection (#7849)

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (1 diff)
• src-client/ConsoleImpl2.cpp (modified) (6 diffs)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -834 +834 @@
     /** @} */
 
+    void i_reportDriverVersions(void);
+
     bool mSavedStateDataLoaded : 1;
 
@@ -990 +992 @@
     ComPtr<IEventListener> mVmListener;
 
+#ifdef RT_OS_WINDOWS
+    /** Use NDIS6 network drivers. */
+    bool mfNDIS6;
+#endif /* RT_OS_WINDOWS */
+
     friend struct VMTask;
 };

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -389 +389 @@
     , mfUseHostClipboard(true)
     , mMachineState(MachineState_PoweredOff)
+#ifdef RT_OS_WINDOWS
+    , mfNDIS6(true)
+#endif /* RT_OS_WINDOWS */
+
 {
 }

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -749 +749 @@
 /**
  * Report versions of installed drivers to release log.
+ *
+ * WARNING! This method has a side effect -- it modifies mfNDIS6.
  */
-static void reportDriverVersions(void)
+void Console::i_reportDriverVersions()
 {
     DWORD   err;
@@ -762 +764 @@
     DWORD   cbVerInfo     = 0;
 
+    /* Assume NDIS6 */
+    mfNDIS6 = true;
+
     do
     {
@@ -816 +821 @@
                 if (_tcsnicmp(TEXT("vbox"), szDriver, 4))
                     continue;
+                if (_tcsnicmp(TEXT("vboxnetflt"), szDriver, 10) == 0)
+                    mfNDIS6 = false;
             }
             else
@@ -883 +890 @@
 }
 #else /* !RT_OS_WINDOWS */
-static void reportDriverVersions(void)
+void Console::i_reportDriverVersions(void)
 {
 }
@@ -981 +988 @@
     hrc = systemProperties->GetMaxNetworkAdapters(chipsetType, &maxNetworkAdapters);        H();
 
-    reportDriverVersions();
+    i_reportDriverVersions();
     /*
      * Get root node first.
@@ -5322 +5329 @@
                 CoTaskMemFree(pswzBindName);
 
-                /* Assume we should use the old NDIS5.1 version of driver which uses TRUNKTYPE_NETADP */
-                trunkType = TRUNKTYPE_NETADP;
-
-                HKEY hkParams;
-                hrc = pAdaptorComponent->OpenParamKey(&hkParams);
-                Assert(hrc == S_OK);
-                if (hrc == S_OK)
-                {
-                    WCHAR swzInfSection[16];
-                    DWORD dwSize = sizeof(swzInfSection);
-                    hrc = RegQueryValueExW(hkParams, L"InfSection", NULL, NULL, (LPBYTE)swzInfSection, &dwSize);
-                    if (hrc == S_OK)
-                    {
-                        if (!_wcsnicmp(swzInfSection, L"VBoxNetAdp6.ndi", sizeof(L"VBoxNetAdp6.ndi")/2))
-                        {
-                            /*
-                             * This is NDIS 6.x miniport, it relies on NetLwf filter to
-                             * run actual traffic. We use netflt attachment instead of
-                             * netadp, which is used in case of NDIS 5.x.
-                             */
-                            trunkType = TRUNKTYPE_NETFLT;
-                        }
-                    }
-                    RegCloseKey(hkParams);
-                }
-                else
-                {
-                    LogRel(("Console::i_configNetwork: INetCfgComponent::GetId(%s) failed, err (0x%x), "
-                            "falling back to NDIS5 attachment\n", pszTrunkName, hrc));
-                    /* Nothing to do here as the trunk type defaults to NETADP */
-                }
+                /* The old NDIS5.1 version of driver uses TRUNKTYPE_NETADP */
+                trunkType = mfNDIS6 ? TRUNKTYPE_NETFLT : TRUNKTYPE_NETADP;
                 InsertConfigInteger(pCfg, "TrunkType", trunkType == TRUNKTYPE_NETFLT ? kIntNetTrunkType_NetFlt : kIntNetTrunkType_NetAdp);