Changeset 67566 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 22, 2017 3:42:31 PM (8 years ago)

Author:

vboxsync

Message:

dropped composeIPv6Address() and composeHardwareAddress()

Location:

trunk/src/VBox/Main

Files:

• include/netif.h (modified) (1 diff)
• src-server/HostNetworkInterfaceImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/netif.h

@@ -98 +98 @@
 int NetIfAdpCtlOut(const char *pszName, const char *pszCmd, char *pszBuffer, size_t cBufSize);
 
-DECLINLINE(Bstr) composeIPv6Address(PRTNETADDRIPV6 aAddrPtr)
-{
-    /* We can't use %RTnaipv6 because that function is too clever, i.e. it
-     * shows abbreviations which the GUI isn't able to parse. */
-    return aAddrPtr->s.Lo || aAddrPtr->s.Hi
-        ? Bstr(Utf8StrFmt("%02x%02x:%02x%02x:%02x%02x:%02x%02x:"
-                          "%02x%02x:%02x%02x:%02x%02x:%02x%02x",
-                          aAddrPtr->au8[0], aAddrPtr->au8[1],
-                          aAddrPtr->au8[2], aAddrPtr->au8[3],
-                          aAddrPtr->au8[4], aAddrPtr->au8[5],
-                          aAddrPtr->au8[6], aAddrPtr->au8[7],
-                          aAddrPtr->au8[8], aAddrPtr->au8[9],
-                          aAddrPtr->au8[10], aAddrPtr->au8[11],
-                          aAddrPtr->au8[12], aAddrPtr->au8[13],
-                          aAddrPtr->au8[14], aAddrPtr->au8[15]))
-        : Bstr("");
-}
-
-DECLINLINE(Bstr) composeHardwareAddress(PRTMAC aMacPtr)
-{
-    return Bstr(Utf8StrFmt("%RTmac", aMacPtr));
-}
-
 DECLINLINE(Bstr) getDefaultIPv4Address(Bstr bstrIfName)
 {

trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp

@@ -168 +168 @@
         m.realNetworkMask = m.networkMask = info.IPNetMask.u;
         m.dhcpEnabled = info.bDhcpEnabled;
-        m.realIPV6Address = m.IPV6Address = composeIPv6Address(&info.IPv6Address);
+        m.realIPV6Address = m.IPV6Address = Bstr(Utf8StrFmt("%RTnaipv6", &info.IPv6Address));
         RTNetMaskToPrefixIPv6(&info.IPv6NetMask, &iPrefixIPv6);
         m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = iPrefixIPv6;
-        m.hardwareAddress = composeHardwareAddress(&info.MACAddress);
+        m.hardwareAddress = Bstr(Utf8StrFmt("%RTmac", &info.MACAddress));
 #ifdef RT_OS_WINDOWS
         m.mediumType = (HostNetworkInterfaceMediumType)info.enmMediumType;
@@ -227 +227 @@
     m.realIPAddress = m.IPAddress = pIf->IPAddress.u;
     m.realNetworkMask = m.networkMask = pIf->IPNetMask.u;
-    m.realIPV6Address = m.IPV6Address = composeIPv6Address(&pIf->IPv6Address);
+    m.realIPV6Address = m.IPV6Address = Bstr(Utf8StrFmt("%RTnaipv6", &pIf->IPv6Address));
     RTNetMaskToPrefixIPv6(&pIf->IPv6NetMask, &iPrefixIPv6);
     m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = iPrefixIPv6;
     m.dhcpEnabled = pIf->bDhcpEnabled;
-    m.hardwareAddress = composeHardwareAddress(&pIf->MACAddress);
+    m.hardwareAddress = Bstr(Utf8StrFmt("%RTmac", &pIf->MACAddress));
 #ifdef RT_OS_WINDOWS
     m.mediumType = (HostNetworkInterfaceMediumType)pIf->enmMediumType;