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

Timestamp:

Jun 30, 2017 11:35:32 AM (7 years ago)

Author:

vboxsync

Message:

Main/NetIf-win: bugref:8346: the distinction between XP and Vista doesn't work according to the length of IP_ADAPTER_UNICAST_ADDRESS_XP versus IP_ADAPTER_UNICAST_ADDRESS_LH -- both have the same length despite the fact that the former lacks the OnLinkPrefixLength field. So just use GetVersionEx(). Also logging fixes.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (37 diffs)

trunk

@@ -7 +7 @@
 /branches/VBox-4.3/trunk:91223
 /branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
-/branches/VBox-5.1:112367,115992
+/branches/VBox-5.1:112367,115992,116543,116550,116568,116573
 /branches/andy/draganddrop:90781-91268
 /branches/andy/guestctrl20:78916,78930

@@ -7 +7 @@
 /branches/VBox-4.3/trunk:91223
 /branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
-/branches/VBox-5.1:112367,115992
+/branches/VBox-5.1:112367,115992,116543,116550,116568,116573
 /branches/andy/draganddrop:90781-91268
 /branches/andy/guestctrl20:78916,78930

trunk/src/VBox

@@ -7 +7 @@
 /branches/VBox-4.3/trunk/src/VBox:91223
 /branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
-/branches/VBox-5.1/src/VBox:112367
+/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
 /branches/andy/draganddrop/src/VBox:90781-91268
 /branches/andy/guestctrl20/src/VBox:78916,78930

@@ -7 +7 @@
 /branches/VBox-4.3/trunk/src/VBox:91223
 /branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
-/branches/VBox-5.1/src/VBox:112367
+/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
 /branches/andy/draganddrop/src/VBox:90781-91268
 /branches/andy/guestctrl20/src/VBox:78916,78930

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

@@ -170 +170 @@
                                     }
                                     else
-                                        Log(("collectNetIfInfo: Unexpected IPv4 prefix length of %d\n",
-                                             pPrefix->PrefixLength));
+                                        LogFunc(("Unexpected IPv4 prefix length of %d\n",
+                                                 pPrefix->PrefixLength));
                                 }
                                 break;
@@ -183 +183 @@
                                     }
                                     else
-                                        Log(("collectNetIfInfo: Unexpected IPv6 prefix length of %d\n",
-                                             pPrefix->PrefixLength));
+                                        LogFunc(("Unexpected IPv6 prefix length of %d\n",
+                                                pPrefix->PrefixLength));
                                 }
                                 break;
@@ -190 +190 @@
                     }
                     if (sizeof(pInfo->MACAddress) != pAdapter->PhysicalAddressLength)
-                        Log(("collectNetIfInfo: Unexpected physical address length: %u\n", pAdapter->PhysicalAddressLength));
+                        LogFunc(("Unexpected physical address length: %u\n", pAdapter->PhysicalAddressLength));
                     else
                         memcpy(pInfo->MACAddress.au8, pAdapter->PhysicalAddress, sizeof(pInfo->MACAddress));
@@ -986 +986 @@
             rc = collectNetIfInfo(name, guidIfCopy, &Info, iDefaultInterface);
             if (RT_FAILURE(rc))
-                LogRel(("vboxNetWinAddComponent: collectNetIfInfo() -> %Rrc\n", rc));
-            Log(("vboxNetWinAddComponent: adding %ls\n", lpszName));
+                LogRelFunc(("collectNetIfInfo() -> %Rrc\n", rc));
+            LogFunc(("adding %ls\n", lpszName));
             /* create a new object and add it to the list */
             ComObjPtr<HostNetworkInterface> iface;
@@ -1002 +1002 @@
             else
             {
-                LogRel(("vboxNetWinAddComponent: HostNetworkInterface::init() -> %Rrc\n", rc));
-                Assert(0);
+                LogRelFunc(("HostNetworkInterface::init() -> %Rrc\n", rc));
+                AssertComRC(rc);
             }
         }
         else
-            LogRel(("vboxNetWinAddComponent: failed to get device instance GUID (0x%x)\n", hr));
+            LogRelFunc(("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));
+        LogRelFunc(("failed to get device display name (0x%x)\n", hr));
 
     return rc;
@@ -1038 +1038 @@
             hr = pMpNcc->GetDisplayName(&pwszName);
             if (hr == S_OK)
-                Log(("netIfListHostAdapters: %ls\n", pwszName));
+                LogFunc(("%ls\n", pwszName));
             else
-                LogRel(("netIfListHostAdapters: failed to get device display name (0x%x)\n", hr));
+                LogRelFunc(("failed to get device display name (0x%x)\n", hr));
             hr = pMpNcc->GetDeviceStatus(&uComponentStatus);
             if (hr == S_OK)
@@ -1051 +1051 @@
                     if (hr == S_OK)
                     {
-                        Log(("netIfListHostAdapters: id = %ls\n", pId));
+                        LogFunc(("id = %ls\n", pId));
                         if (!_wcsnicmp(pId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
                         {
@@ -1059 +1059 @@
                     }
                     else
-                        LogRel(("netIfListHostAdapters: failed to get device id (0x%x)\n", hr));
+                        LogRelFunc(("failed to get device id (0x%x)\n", hr));
                 }
             }
             else
-                LogRel(("netIfListHostAdapters: failed to get device status (0x%x)\n", hr));
+                LogRelFunc(("failed to get device status (0x%x)\n", hr));
             pMpNcc->Release();
         }
@@ -1071 +1071 @@
     }
     else
-        LogRel(("netIfListHostAdapters: EnumComponents error (0x%x)\n", hr));
+        LogRelFunc(("EnumComponents error (0x%x)\n", hr));
 #endif /* #  if defined VBOX_WITH_NETFLT */
     return VINF_SUCCESS;
@@ -1452 +1452 @@
 
 
-#define netIfLog Log
+#define netIfLog LogFunc
 
 struct BoundAdapter
@@ -1469 +1469 @@
 
     if ((hr = pNetCfg->EnumComponents(&GUID_DEVCLASS_NET, &pEnumComponent)) != S_OK)
-        LogRel(("netIfGetUnboundHostOnlyAdapters: failed to enumerate network adapter components (0x%x)\n", hr));
+        LogRelFunc(("failed to enumerate network adapter components (0x%x)\n", hr));
     else
     {
@@ -1479 +1479 @@
             memset(&adapter, 0, sizeof(adapter));
             if ((hr = pMiniport->GetDisplayName(&adapter.pName)) != S_OK)
-                LogRel(("netIfGetUnboundHostOnlyAdapters: failed to get device display name (0x%x)\n", hr));
+                LogRelFunc(("failed to get device display name (0x%x)\n", hr));
             else if ((hr = pMiniport->GetDeviceStatus(&uComponentStatus)) != S_OK)
-                netIfLog(("netIfGetUnboundHostOnlyAdapters: failed to get device status (0x%x)\n", hr));
+                netIfLog(("failed to get device status (0x%x)\n", hr));
             else if (uComponentStatus != 0)
-                netIfLog(("netIfGetUnboundHostOnlyAdapters: wrong device status (0x%x)\n", uComponentStatus));
+                netIfLog(("wrong device status (0x%x)\n", uComponentStatus));
             else if ((hr = pMiniport->GetId(&adapter.pHwId)) != S_OK)
-                LogRel(("netIfGetUnboundHostOnlyAdapters: failed to get device id (0x%x)\n", hr));
+                LogRelFunc(("failed to get device id (0x%x)\n", hr));
             else if (_wcsnicmp(adapter.pHwId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
-                netIfLog(("netIfGetUnboundHostOnlyAdapters: not host-only id = %ls, ignored\n", adapter.pHwId));
+                netIfLog(("not host-only id = %ls, ignored\n", adapter.pHwId));
             else if ((hr = pMiniport->GetInstanceGuid(&guid)) != S_OK)
-                LogRel(("netIfGetUnboundHostOnlyAdapters: failed to get instance id (0x%x)\n", hr));
+                LogRelFunc(("failed to get instance id (0x%x)\n", hr));
             else
             {
                 adapter.guid = *(Guid(guid).raw());
-                netIfLog(("netIfGetUnboundHostOnlyAdapters: guid=%RTuuid, name=%ls id = %ls\n", &adapter.guid, adapter.pName, adapter.pHwId));
+                netIfLog(("guid=%RTuuid, name=%ls id = %ls\n", &adapter.guid, adapter.pName, adapter.pHwId));
                 adapters.push_back(adapter);
                 adapter.pName = adapter.pHwId = NULL; /* do not free, will be done later */
@@ -1507 +1507 @@
         pEnumComponent->Release();
     }
-    netIfLog(("netIfGetUnboundHostOnlyAdapters: return\n"));
+    netIfLog(("return\n"));
     return VINF_SUCCESS;
 }
@@ -1518 +1518 @@
     HRESULT              hr;
 
-    netIfLog(("netIfGetBoundAdapters: building the list of interfaces\n"));
+    netIfLog(("building the list of interfaces\n"));
     /* we are using the INetCfg API for getting the list of miniports */
     hr = VBoxNetCfgWinQueryINetCfg(&pNetCfg, FALSE,
@@ -1527 +1527 @@
     if (hr != S_OK)
     {
-        LogRel(("netIfGetBoundAdapters: failed to query INetCfg (0x%x)\n", hr));
+        LogRelFunc(("failed to query INetCfg (0x%x)\n", hr));
         return hr;
     }
@@ -1534 +1534 @@
         /* fall back to NDIS5 miniport lookup */
         && (hr = pNetCfg->FindComponent(L"sun_VBoxNetFlt", &pFilter)))
-        LogRel(("netIfGetBoundAdapters: could not find either 'oracle_VBoxNetLwf' or 'sun_VBoxNetFlt' components (0x%x)\n", hr));
+        LogRelFunc(("could not find either 'oracle_VBoxNetLwf' or 'sun_VBoxNetFlt' components (0x%x)\n", hr));
     else
     {
         INetCfgComponentBindings *pFilterBindings;
         if ((pFilter->QueryInterface(IID_INetCfgComponentBindings, (PVOID*)&pFilterBindings)) != S_OK)
-            LogRel(("netIfGetBoundAdapters: failed to query INetCfgComponentBindings (0x%x)\n", hr));
+            LogRelFunc(("failed to query INetCfgComponentBindings (0x%x)\n", hr));
         else
         {
@@ -1545 +1545 @@
             INetCfgBindingPath     *pBp;
             if ((pFilterBindings->EnumBindingPaths(EBP_BELOW, &pEnumBp)) != S_OK)
-                LogRel(("netIfGetBoundAdapters: failed to enumerate binding paths (0x%x)\n", hr));
+                LogRelFunc(("failed to enumerate binding paths (0x%x)\n", hr));
             else
             {
@@ -1556 +1556 @@
                     {
                         /** @todo some id of disabled path could be useful. */
-                        netIfLog(("netIfGetBoundAdapters: INetCfgBindingPath is disabled (0x%x)\n", hr));
+                        netIfLog(("INetCfgBindingPath is disabled (0x%x)\n", hr));
                         pBp->Release();
                         continue;
                     }
                     if ((pBp->EnumBindingInterfaces(&pEnumBi)) != S_OK)
-                        LogRel(("netIfGetBoundAdapters: failed to enumerate binding interfaces (0x%x)\n", hr));
+                        LogRelFunc(("failed to enumerate binding interfaces (0x%x)\n", hr));
                     else
                     {
@@ -1569 +1569 @@
                             INetCfgComponent *pAdapter;
                             if ((hr = pBi->GetLowerComponent(&pAdapter)) != S_OK)
-                                LogRel(("netIfGetBoundAdapters: failed to get lower component (0x%x)\n", hr));
+                                LogRelFunc(("failed to get lower component (0x%x)\n", hr));
                             else
                             {
                                 LPWSTR pwszName = NULL;
                                 if ((hr = pAdapter->GetDisplayName(&pwszName)) != S_OK)
-                                    LogRel(("netIfGetBoundAdapters: failed to get display name (0x%x)\n", hr));
+                                    LogRelFunc(("failed to get display name (0x%x)\n", hr));
                                 else
                                 {
@@ -1580 +1580 @@
                                     DWORD dwChars;
                                     if ((hr = pAdapter->GetDeviceStatus(&uStatus)) != S_OK)
-                                        netIfLog(("netIfGetBoundAdapters: %ls: failed to get device status (0x%x)\n",
+                                        netIfLog(("%ls: failed to get device status (0x%x)\n",
                                                   pwszName, hr));
                                     else if ((hr = pAdapter->GetCharacteristics(&dwChars)) != S_OK)
-                                        netIfLog(("netIfGetBoundAdapters: %ls: failed to get device characteristics (0x%x)\n",
+                                        netIfLog(("%ls: failed to get device characteristics (0x%x)\n",
                                                   pwszName, hr));
                                     else if (uStatus != 0)
-                                        netIfLog(("netIfGetBoundAdapters: %ls: wrong status 0x%x\n",
+                                        netIfLog(("%ls: wrong status 0x%x\n",
                                                   pwszName, uStatus));
                                     else if (dwChars & NCF_HIDDEN)
-                                        netIfLog(("netIfGetBoundAdapters: %ls: wrong characteristics 0x%x\n",
+                                        netIfLog(("%ls: wrong characteristics 0x%x\n",
                                                   pwszName, dwChars));
                                     else
@@ -1596 +1596 @@
                                         LPWSTR pwszHwId = NULL;
                                         if ((hr = pAdapter->GetId(&pwszHwId)) != S_OK)
-                                            LogRel(("netIfGetBoundAdapters: %ls: failed to get hardware id (0x%x)\n",
+                                            LogRelFunc(("%ls: failed to get hardware id (0x%x)\n",
                                                       pwszName, hr));
                                         else if (!_wcsnicmp(pwszHwId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
-                                            netIfLog(("netIfGetBoundAdapters: host-only adapter %ls, ignored\n", pwszName));
+                                            netIfLog(("host-only adapter %ls, ignored\n", pwszName));
                                         else if ((hr = pAdapter->GetInstanceGuid(&guid)) != S_OK)
-                                            LogRel(("netIfGetBoundAdapters: %ls: failed to get instance GUID (0x%x)\n",
+                                            LogRelFunc(("%ls: failed to get instance GUID (0x%x)\n",
                                                       pwszName, hr));
                                         else
@@ -1610 +1610 @@
                                             adapter.guid     = *(Guid(guid).raw());
                                             adapter.pAdapter = NULL;
-                                            netIfLog(("netIfGetBoundAdapters: guid=%RTuuid, name=%ls, hwid=%ls, status=%x, chars=%x\n",
+                                            netIfLog(("guid=%RTuuid, name=%ls, hwid=%ls, status=%x, chars=%x\n",
                                                       &adapter.guid, pwszName, pwszHwId, uStatus, dwChars));
                                             boundAdapters.push_back(adapter);
@@ -1650 +1650 @@
 #endif
 
+/**
+ * Walk through the list of adpater addresses and extract the required
+ * information. XP and older don't not have the OnLinkPrefixLength field.
+ */
 static void netIfFillInfoWithAddressesXp(PNETIFINFO pInfo, PIP_ADAPTER_ADDRESSES pAdapter)
 {
@@ -1690 +1694 @@
                 {
                     ULONG ip = ((PSOCKADDR_IN)(pPrefix->Address.lpSockaddr))->sin_addr.s_addr;
-                    netIfLog(("netIfFillInfoWithAddressesXp: prefix=%RTnaipv4 len=%u\n", ip, pPrefix->PrefixLength));
+                    netIfLog(("prefix=%RTnaipv4 len=%u\n", ip, pPrefix->PrefixLength));
                     if (   pPrefix->PrefixLength < sizeof(pInfo->IPNetMask) * 8
                         && pPrefix->PrefixLength > 0
@@ -1699 +1703 @@
                     }
                     else
-                        netIfLog(("netIfFillInfoWithAddressesXp: Unexpected IPv4 prefix length of %d\n",
+                        netIfLog(("Unexpected IPv4 prefix length of %d\n",
                              pPrefix->PrefixLength));
                 }
@@ -1707 +1711 @@
                 {
                     PBYTE ipv6 = ((PSOCKADDR_IN6)(pPrefix->Address.lpSockaddr))->sin6_addr.s6_addr;
-                    netIfLog(("netIfFillInfoWithAddressesXp: prefix=%RTnaipv6 len=%u\n",
-                              ipv6, pPrefix->PrefixLength));
+                    netIfLog(("prefix=%RTnaipv6 len=%u\n", ipv6, pPrefix->PrefixLength));
                     if (   pPrefix->PrefixLength < sizeof(pInfo->IPv6NetMask) * 8
                         && pPrefix->PrefixLength > 0
@@ -1717 +1720 @@
                     }
                     else
-                        netIfLog(("netIfFillInfoWithAddressesXp: Unexpected IPv6 prefix length of %d\n",
-                             pPrefix->PrefixLength));
+                        netIfLog(("Unexpected IPv6 prefix length of %d\n", pPrefix->PrefixLength));
                 }
                 break;
         }
     }
-    netIfLog(("netIfFillInfoWithAddressesXp: %RTnaipv4/%u\n",
-              pInfo->IPAddress, uPrefixLenV4));
-    netIfLog(("netIfFillInfoWithAddressesXp: %RTnaipv6/%u\n",
-              &pInfo->IPv6Address, uPrefixLenV6));
-}
-
-static void netIfFillInfoWithAddresses(PNETIFINFO pInfo, PIP_ADAPTER_ADDRESSES pAdapter)
+    netIfLog(("%RTnaipv4/%u\n", pInfo->IPAddress, uPrefixLenV4));
+    netIfLog(("%RTnaipv6/%u\n", &pInfo->IPv6Address, uPrefixLenV6));
+}
+
+/**
+ * Walk through the list of adpater addresses and extract the required
+ * information. XP and older don't not have the OnLinkPrefixLength field.
+ */
+static void netIfFillInfoWithAddressesVista(PNETIFINFO pInfo, PIP_ADAPTER_ADDRESSES pAdapter)
 {
     PIP_ADAPTER_UNICAST_ADDRESS pAddr;
 
     if (sizeof(pInfo->MACAddress) != pAdapter->PhysicalAddressLength)
-        netIfLog(("netIfFillInfoWithAddresses: Unexpected physical address length: %u\n", pAdapter->PhysicalAddressLength));
+        netIfLog(("Unexpected physical address length: %u\n", pAdapter->PhysicalAddressLength));
     else
         memcpy(pInfo->MACAddress.au8, pAdapter->PhysicalAddress, sizeof(pInfo->MACAddress));
@@ -1742 +1746 @@
     for (pAddr = pAdapter->FirstUnicastAddress; pAddr; pAddr = pAddr->Next)
     {
-        if (pAddr->Length < sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH))
-        {
-            netIfLog(("netIfFillInfoWithAddresses: unicast address is too small (%u < %u), fall back to XP implementation\n",
-                      pAddr->Length, sizeof(IP_ADAPTER_UNICAST_ADDRESS_LH)));
-            return netIfFillInfoWithAddressesXp(pInfo, pAdapter);
-        }
         PIP_ADAPTER_UNICAST_ADDRESS_LH pAddrLh = (PIP_ADAPTER_UNICAST_ADDRESS_LH)pAddr;
         switch (pAddrLh->Address.lpSockaddr->sa_family)
@@ -1759 +1757 @@
                            sizeof(pInfo->IPAddress));
                     if (pAddrLh->OnLinkPrefixLength > 32)
-                        netIfLog(("netIfFillInfoWithAddresses: Invalid IPv4 prefix length of %d\n", pAddrLh->OnLinkPrefixLength));
+                        netIfLog(("Invalid IPv4 prefix length of %d\n", pAddrLh->OnLinkPrefixLength));
                     else
                         RTNetPrefixToMaskIPv4(pAddrLh->OnLinkPrefixLength, &pInfo->IPNetMask);
@@ -1772 +1770 @@
                            sizeof(pInfo->IPv6Address));
                     if (pAddrLh->OnLinkPrefixLength > 128)
-                        netIfLog(("netIfFillInfoWithAddresses: Invalid IPv6 prefix length of %d\n", pAddrLh->OnLinkPrefixLength));
+                        netIfLog(("Invalid IPv6 prefix length of %d\n", pAddrLh->OnLinkPrefixLength));
                     else
                         RTNetPrefixToMaskIPv6(pAddrLh->OnLinkPrefixLength, &pInfo->IPv6NetMask);
@@ -1784 +1782 @@
         int iPrefixIPv4 = -1;
         RTNetMaskToPrefixIPv4(&pInfo->IPNetMask, &iPrefixIPv4);
-        netIfLog(("netIfFillInfoWithAddresses: %RTnaipv4/%u\n", pInfo->IPAddress, iPrefixIPv4));
+        netIfLog(("%RTnaipv4/%u\n", pInfo->IPAddress, iPrefixIPv4));
     }
     if (fIPv6Found)
@@ -1790 +1788 @@
         int iPrefixIPv6 = -1;
         RTNetMaskToPrefixIPv6(&pInfo->IPv6NetMask, &iPrefixIPv6);
-        netIfLog(("netIfFillInfoWithAddresses: %RTnaipv6/%u\n", &pInfo->IPv6Address, iPrefixIPv6));
+        netIfLog(("%RTnaipv6/%u\n", &pInfo->IPv6Address, iPrefixIPv6));
     }
 }
@@ -1821 +1819 @@
     if (dwRc != NO_ERROR)
     {
-        LogRel(("NetIfList: GetAdaptersAddresses failed (0x%x)\n", dwRc));
+        LogRelFunc(("GetAdaptersAddresses failed (0x%x)\n", dwRc));
         hr = HRESULT_FROM_WIN32(dwRc);
     }
@@ -1833 +1831 @@
 #endif
         if (hr != S_OK)
-            LogRel(("NetIfList: netIfGetBoundAdapters failed (0x%x)\n", hr));
+            LogRelFunc(("netIfGetBoundAdapters failed (0x%x)\n", hr));
         else
         {
@@ -1843 +1841 @@
                 if (!pszUuid)
                 {
-                    LogRel(("NetIfList: out of memory\n"));
+                    LogRelFunc(("out of memory\n"));
                     break;
                 }
                 size_t len = strlen(pszUuid) - 1;
                 if (pszUuid[0] != '{' || pszUuid[len] != '}')
-                    LogRel(("NetIfList: ignoring invalid GUID %s\n", pAdapter->AdapterName));
+                    LogRelFunc(("ignoring invalid GUID %s\n", pAdapter->AdapterName));
                 else
                 {
@@ -1877 +1875 @@
                     info.bIsDefault = (pAdapter->IfIndex == (DWORD)iDefault);
                     info.bDhcpEnabled = pAdapter->Flags & IP_ADAPTER_DHCP_ENABLED;
-                    netIfFillInfoWithAddresses(&info, pAdapter);
+                    OSVERSIONINFOEX OSInfoEx;
+                    RT_ZERO(OSInfoEx);
+                    OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+                    if (   GetVersionEx((LPOSVERSIONINFO)&OSInfoEx)
+                        && OSInfoEx.dwMajorVersion < 6)
+                        netIfFillInfoWithAddressesXp(&info, pAdapter);
+                    else
+                        netIfFillInfoWithAddressesVista(&info, pAdapter);
                 }
                 else
@@ -1892 +1897 @@
                 int rc = iface->init((*it).pName, enmType, &info);
                 if (FAILED(rc))
-                    LogRel(("NetIfList: HostNetworkInterface::init() -> %Rrc\n", rc));
+                    LogRelFunc(("HostNetworkInterface::init() -> %Rrc\n", rc));
                 else
                 {

@@ -7 +7 @@
 /branches/VBox-4.3/trunk:91223
 /branches/VBox-5.0:104445,104938,104943,104950,104952-104953,104987-104988,104990,106453
-/branches/VBox-5.1:112367,115992
+/branches/VBox-5.1:112367,115992,116543,116550,116568,116573
 /branches/andy/draganddrop:90781-91268
 /branches/andy/guestctrl20:78916,78930

@@ -7 +7 @@
 /branches/VBox-4.3/trunk/src/VBox:91223
 /branches/VBox-5.0/src/VBox:104938,104943,104950,104987-104988,104990,106453
-/branches/VBox-5.1/src/VBox:112367
+/branches/VBox-5.1/src/VBox:112367,116543,116550,116568,116573
 /branches/andy/draganddrop/src/VBox:90781-91268
 /branches/andy/guestctrl20/src/VBox:78916,78930