Changeset 58956 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg

Timestamp:

Dec 2, 2015 4:57:40 PM (9 years ago)

Author:

vboxsync

Message:

NetCfg/win: Retry creation of host-only adapter device if network connection not created properly (#7973)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (6 diffs)

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

@@ -2764 +2764 @@
     PVOID pQueueCallbackContext = NULL;
     DWORD ret = 0;
-    BOOL found = FALSE;
     BOOL registered = FALSE;
     BOOL destroyList = FALSE;
@@ -2774 +2773 @@
     LPWSTR lpszApp = NULL;
 
-    do
-    {
+    for (int attempt = 0; attempt < 2; ++attempt)
+    {
+        BOOL found = FALSE;
         GUID netGuid;
         SP_DRVINFO_DATA DriverInfoData;
@@ -3056 +3056 @@
             SetErrBreak(("SetupDiOpenDevRegKey failed (0x%08X)", GetLastError()));
 
-        SC_HANDLE hSCM = NULL;
-        SC_HANDLE hService = NULL;
-
-        hSCM = OpenSCManager(NULL, NULL, GENERIC_READ);
-        if (hSCM)
-            hService = OpenService(hSCM, _T("NetSetupSvc"), GENERIC_READ);
-        else
-            NonStandardLogFlow(("OpenSCManager failed (0x%x)", GetLastError()));
-
         /* Query the instance ID; on Windows 10, the registry key may take a short
          * while to appear. Microsoft recommends waiting for up to 5 seconds, but
-         * we want to be on the safe side, so let's wait for a minute.
+         * we want to be on the safe side, so let's wait for 20 seconds. Waiting
+         * longer is harmful as network setup service will shut down after a period
+         * of inactivity.
          */
-        for (int retries = 0; retries < 2 * 60; ++retries)
+        for (int retries = 0; retries < 2 * 20; ++retries)
         {
             cbSize = sizeof(pWCfgGuidString);
@@ -3079 +3072 @@
             else
                 break;
-            /* Bail out as soon as NetSetupSvc has stopped. */
-            if (hService && retries > 10 && vboxNetCfgWinIsNetSetupStopped(hService))
-                break;
-        }
-
-        if (ret == ERROR_FILE_NOT_FOUND && hService)
-        {
-            NonStandardLogFlow(("Timed out while waiting for NetCfgInstanceId, trying to obtain INetCfg...\n"));
+        }
+
+        if (ret == ERROR_FILE_NOT_FOUND && attempt == 0)
+        {
             /*
-             * NetCfgInstanceId still is not there, let's try to nudge network
-             * configuration engine by obtaining INetCfg. The idea is to trigger
-             * NetSetupSvc start, which will re-enumerate devices, and we need to
-             * obtain INetCfg anyway later on. Note that we need to make sure
-             * NetSetupSvc has stopped before we attempt to obtain INetCfg.
+             * This is the first time we fail to obtain NetCfgInstanceId, let us
+             * retry it once. It is needed to handle the situation when network
+             * setup fails to recognize the arrival of our device node while it
+             * is busy removing another host-only interface, and it gets stuck
+             * with no matching network interface created for our device node.
+             * See @bugref{7973} for details.
              */
-            for (int retries = 0; retries < 60 && !vboxNetCfgWinIsNetSetupStopped(hService); ++retries)
-                Sleep(1000);
-            HRESULT 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.  */
-                                                   &lpszApp);
-            if (hr != S_OK)
-                NonStandardLogFlow(("VBoxNetCfgWinCreateHostOnlyNetworkInterface: failed to obtain INetCfg (0x%x)\n", hr));
-            for (int retries = 0; retries < 30; ++retries)
-            {
-                /*
-                 * Once again, there is no point in checking for NetCfgInstanceId
-                 * while NetSetupSvc is down. Also if it is not enough to check once,
-                 * because it may take a while for NetSetupSvc to complete network
-                 * configuration changes.
-                 */
-                if (vboxNetCfgWinIsNetSetupRunning(hService))
-                {
-                    /* Retry querying NetCfgInstanceId */
-                    cbSize = sizeof(pWCfgGuidString);
-                    ret = RegQueryValueExW (hkey, L"NetCfgInstanceId", NULL,
-                                            &dwValueType, (LPBYTE) pWCfgGuidString, &cbSize);
-                    if (ret != ERROR_FILE_NOT_FOUND)
-                        break;
-                }
-                Sleep(1000);
-            }
-        }
-        if (hService)
-            CloseServiceHandle(hService);
-        else
-            NonStandardLogFlow(("OpenService failed (0x%x)\n", GetLastError()));
-        if (hSCM)
-            CloseServiceHandle(hSCM);
+            NonStandardLogFlow(("Timed out while waiting for NetCfgInstanceId, remove the device and try again...\n"));
+            if (hkey != INVALID_HANDLE_VALUE)
+            {
+                RegCloseKey (hkey);
+                hkey = (HKEY)INVALID_HANDLE_VALUE;
+            }
+            if (pQueueCallbackContext)
+            {
+                SetupTermDefaultQueueCallback(pQueueCallbackContext);
+                pQueueCallbackContext = NULL;
+            }
+            SetupDiCallClassInstaller(DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
+            SetupDiDeleteDeviceInfo(hDeviceInfo, &DeviceInfoData);
+            SetupDiDestroyDriverInfoList(hDeviceInfo, &DeviceInfoData,
+                                         SPDIT_CLASSDRIVER);
+            SetupDiDestroyDeviceInfoList(hDeviceInfo);
+            destroyList = FALSE;
+            registered = FALSE;
+            continue;
+        }
 
         if (ret != ERROR_SUCCESS)
@@ -3169 +3146 @@
                           GetLastError()));
 #endif /* !VBOXNETCFG_DELAYEDRENAME */
-    }
-    while (0);
+
+        /* Success, don't need another attempt */
+        break;
+    }
 
     /*
@@ -3187 +3166 @@
             SetupDiCallClassInstaller(DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
 
-        found = SetupDiDeleteDeviceInfo(hDeviceInfo, &DeviceInfoData);
+        SetupDiDeleteDeviceInfo(hDeviceInfo, &DeviceInfoData);
 
         /* destroy the driver info list */