vbox的更動 59046 路徑 trunk/src/VBox/HostDrivers

時間撮記:

2015-12-8 上午07:52:35 (9 年 以前)

作者:

vboxsync

訊息:

NetCfg/win: Bind bridging LWF to host-only adapters (bugref:8140)

檔案:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (修改) (4 筆差異)

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

@@ -2304 +2304 @@
                                                 NonStandardLogFlow(("Unable to move interface, hr (0x%x)\n", hr));
                                             bFoundIface = true;
+                                            /*
+                                             * Enable binding paths for host-only adapters bound to bridged filter
+                                             * (see @bugref{8140}).
+                                             */
+                                            HRESULT hr2;
+                                            LPWSTR pwszHwId = NULL;
+                                            if ((hr2 = pNcc->GetId(&pwszHwId)) != S_OK)
+                                                NonStandardLogFlow(("Failed to get HW ID, hr (0x%x)\n", hr2));
+                                            else if (_wcsnicmp(pwszHwId, VBOXNETCFGWIN_NETLWF_ID,
+                                                               sizeof(VBOXNETCFGWIN_NETLWF_ID)/2))
+                                                NonStandardLogFlow(("Ignoring component %ls\n", pwszHwId));
+                                            else if ((hr2 = pNetCfgBindPath->IsEnabled()) != S_FALSE)
+                                                NonStandardLogFlow(("Already enabled binding path, hr (0x%x)\n", hr2));
+                                            else if ((hr2 = pNetCfgBindPath->Enable(TRUE)) != S_OK)
+                                                NonStandardLogFlow(("Failed to enable binding path, hr (0x%x)\n", hr2));
+                                            else
+                                                NonStandardLogFlow(("Enabled binding path\n"));
+                                            if (pwszHwId)
+                                                CoTaskMemFree(pwszHwId);
                                         }
                                     }
@@ -2770 +2789 @@
     HKEY hkey = (HKEY)INVALID_HANDLE_VALUE;
     bstr_t bstrError;
-    INetCfg *pNetCfg = NULL;
-    LPWSTR lpszApp = NULL;
 
     do
@@ -3153 +3170 @@
     {
         HRESULT hr;
+        INetCfg *pNetCfg = NULL;
+        LPWSTR lpszApp = NULL;
 #ifndef VBOXNETCFG_DELAYEDRENAME
         WCHAR ConnectionName[128];
@@ -3178 +3197 @@
         }
 
-        /* Check if INetCfg has been queried already, query if it hasn't been. */
-        if (pNetCfg == NULL)
-            hr = VBoxNetCfgWinQueryINetCfg(&pNetCfg, TRUE, L"VirtualBox Host-Only Creation",
-                                           30 * 1000, /* on Vista we often get 6to4svc.dll holding the lock, wait for 30 sec.  */
-                                           /* TODO: special handling for 6to4svc.dll ???, i.e. several retrieves */
-                                           &lpszApp);
-        else
-            hr = S_OK;
+        hr = VBoxNetCfgWinQueryINetCfg(&pNetCfg, TRUE, L"VirtualBox Host-Only Creation",
+                                       30 * 1000, /* on Vista we often get 6to4svc.dll holding the lock, wait for 30 sec.  */
+                                       /* TODO: special handling for 6to4svc.dll ???, i.e. several retrieves */
+                                       &lpszApp);
         if (hr == S_OK)
         {