Changeset 57461 in vbox

Timestamp:

Aug 19, 2015 5:34:19 PM (9 years ago)

Author:

vboxsync

Message:

Main/Network: extensive release logging during interface enumeration

File:

• trunk/src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (13 diffs)

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

@@ -961 +961 @@
             if (RT_FAILURE(rc))
             {
-                Log(("vboxNetWinAddComponent: collectNetIfInfo() -> %Rrc\n", rc));
-            }
+                LogRel(("vboxNetWinAddComponent: collectNetIfInfo() -> %Rrc\n", rc));
+            }
+            LogRel(("vboxNetWinAddComponent: adding %ls\n", lpszName));
             /* create a new object and add it to the list */
             ComObjPtr<HostNetworkInterface> iface;
             iface.createObject();
             /* remove the curly bracket at the end */
-            if (SUCCEEDED(iface->init(name, enmType, &Info)))
+            rc = iface->init(name, enmType, &Info);
+            if (SUCCEEDED(rc))
             {
                 if (Info.bIsDefault)
@@ -973 +975 @@
                 else
                     pPist->push_back(iface);
-                rc = VINF_SUCCESS;
             }
             else
             {
+                LogRel(("vboxNetWinAddComponent: HostNetworkInterface::init() -> %Rrc\n", rc));
                 Assert(0);
             }
         }
+        else
+            LogRel(("vboxNetWinAddComponent: failed to get device instance GUID (0x%x)\n", hr));
         CoTaskMemFree(lpszName);
     }
+    else
+        LogRel(("vboxNetWinAddComponent: failed to get device display name (0x%x)\n", hr));
 
     return rc;
@@ -1014 +1020 @@
             while ((hr = pEnumComponent->Next(1, &pMpNcc, NULL)) == S_OK)
             {
+                LPWSTR pwszName;
                 ULONG uComponentStatus;
+                hr = pMpNcc->GetDisplayName(&pwszName);
+                if (hr == S_OK)
+                    LogRel(("netIfListHostAdapters: %ls\n", pwszName));
+                else
+                    LogRel(("netIfListHostAdapters: failed to get device display name (0x%x)\n", hr));
                 hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
                 if (hr == S_OK)
@@ -1025 +1037 @@
                         if (hr == S_OK)
                         {
+                            LogRel(("netIfListHostAdapters: id = %ls\n", pId));
                             if (!_wcsnicmp(pId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
                             {
@@ -1031 +1044 @@
                             CoTaskMemFree(pId);
                         }
+                        else
+                            LogRel(("netIfListHostAdapters: failed to get device id (0x%x)\n", hr));
                     }
                 }
+                else
+                    LogRel(("netIfListHostAdapters: failed to get device status (0x%x)\n", hr));
                 pMpNcc->Release();
             }
@@ -1041 +1058 @@
         else
         {
-            LogRel((__FUNCTION__": EnumComponents error (0x%x)", hr));
+            LogRel(("netIfListHostAdapters: EnumComponents error (0x%x)\n", hr));
         }
 
         VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
     }
-    else if (lpszApp)
-    {
-        CoTaskMemFree(lpszApp);
+    else
+    {
+        LogRel(("netIfListHostAdapters: failed to acquire INetCfg interface (0x%x)\n", hr));
+
+        if (lpszApp)
+        {
+            CoTaskMemFree(lpszApp);
+        }
     }
 #endif /* #  if defined VBOX_WITH_NETFLT */
@@ -1469 +1491 @@
     int                  iDefault = getDefaultInterfaceIndex();
 
+    LogRel(("NetIfList: building the list of interfaces\n"));
     /* we are using the INetCfg API for getting the list of miniports */
     hr = VBoxNetCfgWinQueryINetCfg(&pNc, FALSE,
@@ -1485 +1508 @@
         if (hr != S_OK)
         {
+            LogRel(("NetIfList: could not find VBoxNetLwf component (error 0x%x), trying VBoxNetFlt instead\n", hr));
             /* fall back to NDIS5 miniport lookup (sun_VBoxNetFlt) */
             hr = pNc->FindComponent(L"sun_VBoxNetFlt", &pTcpIpNcc);
@@ -1514 +1538 @@
                         while ((hr = pEnumBp->Next(1, &pBp, NULL)) == S_OK)
                         {
+                            LogRel(("NetIfList: fetched INetCfgBindingPath interface\n"));
                             /* S_OK == enabled, S_FALSE == disabled */
                             if (pBp->IsEnabled() == S_OK)
@@ -1527 +1552 @@
                                         while ((hr = pEnumBi->Next(1, &pBi, NULL)) == S_OK)
                                         {
+                                            LogRel(("NetIfList: fetched INetCfgBindingInterface interface\n"));
                                             hr = pBi->GetLowerComponent(&pMpNcc);
                                             Assert(hr == S_OK);
                                             if (hr == S_OK)
                                             {
+                                                LPWSTR pwszName;
                                                 ULONG uComponentStatus;
+                                                hr = pMpNcc->GetDisplayName(&pwszName);
+                                                if (hr == S_OK)
+                                                    LogRel(("NetIfList: got %ls\n", pwszName));
+                                                else
+                                                    LogRel(("NetIfList: failed to get device display name (0x%x)\n", hr));
                                                 hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
                                                 if (hr == S_OK)
@@ -1542 +1574 @@
                                                         if (hr == S_OK)
                                                         {
+                                                            LogRel(("NetIfList: fetched network adapter id: %.80ls\n", pId));
                                                             /*
                                                              * Host-only interfaces are ignored here and included into the list
@@ -1553 +1586 @@
                                                             CoTaskMemFree(pId);
                                                         }
+                                                        else
+                                                            LogRel(("NetIfList: failed to get device id (0x%x)\n", hr));
                                                     }
+                                                    else
+                                                        LogRel(("NetIfList: wrong device status (0x%x)\n", uComponentStatus));
                                                 }
+                                                else
+                                                    LogRel(("NetIfList: failed to get device status (0x%x)\n", hr));
                                                 pMpNcc->Release();
                                             }
+                                            else
+                                                LogRel(("NetIfList: failed to get lower component (0x%x)\n", hr));
                                             pBi->Release();
                                         }
                                         Assert(hr == S_OK || hr == S_FALSE);
                                     }
+                                    else
+                                        LogRel(("NetIfList: IEnumNetCfgBindingInterface::Reset failed (0x%x)\n", hr));
                                     pEnumBi->Release();
                                 }
+                                else
+                                    LogRel(("NetIfList: failed to enumerate binding interfaces (0x%x)\n", hr));
                             }
+                            else
+                                LogRel(("NetIfList: INetCfgBindingPath is disabled\n"));
                             pBp->Release();
                         }
                         Assert(hr == S_OK || hr == S_FALSE);
                     }
+                    else
+                        LogRel(("NetIfList: IEnumNetCfgBindingPath::Reset failed (0x%x)\n", hr));
                     pEnumBp->Release();
                 }
+                else
+                    LogRel(("NetIfList: EnumBindingPaths failed (0x%x)\n", hr));
                 pBindings->Release();
             }
+            else
+                LogRel(("NetIfList: failed to acquire INetCfgComponentBindings interface\n"));
             pTcpIpNcc->Release();
         }
@@ -1581 +1634 @@
         VBoxNetCfgWinReleaseINetCfg(pNc, FALSE);
     }
+    else
+        LogRel(("NetIfList: failed to acquire INetCfg interface (0x%x)\n", hr));
 
     /* Add host-only adapters to the list */