Changeset 52592 in vbox for trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

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-server/win/NetIf-win.cpp (modified) (2 diffs)

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

@@ -1532 +1532 @@
                                                     if (uComponentStatus == 0)
                                                     {
-                                                        vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_Bridged,
-                                                                               iDefault);
+                                                        LPWSTR pId;
+                                                        hr = pMpNcc->GetId(&pId);
+                                                        Assert(hr == S_OK);
+                                                        if (hr == S_OK)
+                                                        {
+                                                            if (!_wcsnicmp(pId, L"sun_VBoxNetAdp6", sizeof(L"sun_VBoxNetAdp6")/2))
+                                                            {
+                                                                vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_HostOnly, -1);
+                                                            }
+                                                            else
+                                                            {
+                                                                vboxNetWinAddComponent(&list, pMpNcc, HostNetworkInterfaceType_Bridged,
+                                                                                       iDefault);
+                                                            }
+                                                            CoTaskMemFree(pId);
+                                                        }
                                                     }
                                                 }
@@ -1563 +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.
+     */
     netIfListHostAdapters(list);