Changeset 52592 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Sep 3, 2014 8:23:24 PM (11 years ago)

Author:

vboxsync

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

95866

Message:

NetFlt/win: NDIS6: fixes, enable disconnect interface, PM support for NetAdp6, installer helper functions

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

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

@@ -5173 +5173 @@
                 CoTaskMemFree(pswzBindName);
 
+                wchar_t * pswzHwId;
+                hrc = pAdaptorComponent->GetId(&pswzHwId);
+                Assert(hrc == S_OK);
+                if (hrc == S_OK)
+                {
+                    if (!_wcsnicmp(pswzHwId, L"sun_VBoxNetAdp6", sizeof(L"sun_VBoxNetAdp6")/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.
+                         */
+                        InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetFlt);
+                        trunkType = TRUNKTYPE_NETFLT;
+                    }
+                    else
+                    {
+                        InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp);
+                        trunkType = TRUNKTYPE_NETADP;
+                    }
+                }
+                else
+                {
+                    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);
+
                 pAdaptorComponent.setNull();
                 /* release the pNc finally */
@@ -5179 +5209 @@
                 const char *pszTrunk = szTrunkName;
 
-                InsertConfigInteger(pCfg, "TrunkType", kIntNetTrunkType_NetAdp);
                 InsertConfigString(pCfg, "Trunk", pszTrunk);
                 InsertConfigString(pCfg, "Network", szNetwork);
@@ -5186 +5215 @@
                 networkName = Bstr(szNetwork);
                 trunkName   = Bstr(pszTrunk);
-                trunkType   = TRUNKTYPE_NETADP;
 # endif /* defined VBOX_WITH_NETFLT*/
 #elif defined(RT_OS_DARWIN)