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

Timestamp:

Oct 17, 2014 6:49:23 AM (10 years ago)

Author:

vboxsync

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

96599

Message:

NetFlt/win: NDIS6: no halt on host suspend, hardware id changed to match the old NDIS5 id

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-server/win/NetIf-win.cpp (modified) (2 diffs)

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

@@ -5178 +5178 @@
                 CoTaskMemFree(pswzBindName);
 
-                wchar_t * pswzHwId;
-                hrc = pAdaptorComponent->GetId(&pswzHwId);
+                /* 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)
                 {
-                    if (!_wcsnicmp(pswzHwId, L"sun_VBoxNetAdp6", sizeof(L"sun_VBoxNetAdp6")/2))
+                    WCHAR swzInfSection[16];
+                    DWORD dwSize = sizeof(swzInfSection);
+                    hrc = RegQueryValueExW(hkParams, L"InfSection", NULL, NULL, (LPBYTE)swzInfSection, &dwSize);
+                    if (hrc == S_OK)
                     {
-                        /*
-                         * 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.
-                         */
-                        InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt);
-                        trunkType = TRUNKTYPE_NETFLT;
+                        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;
+                        }
                     }
-                    else
-                    {
-                        InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp);
-                        trunkType = TRUNKTYPE_NETADP;
-                    }
+                    RegCloseKey(hkParams);
                 }
                 else
@@ -5203 +5207 @@
                     LogRel(("Console::i_configNetwork: INetCfgComponent::GetId(%s) failed, err (0x%x), "
                             "falling back to NDIS5 attachment\n", pszTrunkName, hrc));
-                    InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp);
-                    trunkType = TRUNKTYPE_NETADP;
-                }
-                CoTaskMemFree(pswzHwId);
+                    /* Nothing to do here as the trunk type defaults to NETADP */
+                }
+                InsertConfigInteger(pCfg, "TrunkType", trunkType == TRUNKTYPE_NETFLT ? kIntNetTrunkType_NetFlt : kIntNetTrunkType_NetAdp);
 
                 pAdaptorComponent.setNull();

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

@@ -1537 +1537 @@
                                                         if (hr == S_OK)
                                                         {
-                                                            if (!_wcsnicmp(pId, L"sun_VBoxNetAdp6", sizeof(L"sun_VBoxNetAdp6")/2))
-                                                            {
-                                                                vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_HostOnly, -1);
-                                                            }
-                                                            else
+                                                            /*
+                                                             * Host-only interfaces are ignored here and included into the list
+                                                             * later in netIfListHostAdapters()
+                                                             */
+                                                            if (_wcsnicmp(pId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
                                                             {
                                                                 vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_Bridged,
@@ -1577 +1577 @@
     }
 
-    /*
-     * There are two places where host-only adapters get added to the list.
-     * The following call adds NDIS5 miniports while NDIS6 miniports are
-     * added in the loop above. This is because NDIS6 miniports are in fact
-     * used as bridged adapters, they have netlwf filter installed in their
-     * stack and as a result they show up during bridged adapter enumeration.
-     */
+    /* Add host-only adapters to the list */
     netIfListHostAdapters(list);