Changeset 67634 in vbox for trunk/src

Timestamp:

Jun 27, 2017 10:46:55 AM (8 years ago)

Author:

vboxsync

Message:

Main/HostNetworkInterfaceImpl: Restore all-zeroes (any) IPv6 address
checks lost in r116320. GUI expressly checks for it and forbids it,
so we end up with providing GUI with the default it considers invalid.

File:

• trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp (modified) (2 diffs)

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 = Bstr(Utf8StrFmt("%RTnaipv6", &info.IPv6Address));
+        if (info.IPv6Address.s.Lo || info.IPv6Address.s.Hi)
+            m.realIPV6Address = m.IPV6Address = Bstr(Utf8StrFmt("%RTnaipv6", &info.IPv6Address));
+        else
+            m.realIPV6Address = m.IPV6Address = Bstr("");
         RTNetMaskToPrefixIPv6(&info.IPv6NetMask, &iPrefixIPv6);
         m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = iPrefixIPv6;
@@ -227 +230 @@
     m.realIPAddress = m.IPAddress = pIf->IPAddress.u;
     m.realNetworkMask = m.networkMask = pIf->IPNetMask.u;
-    m.realIPV6Address = m.IPV6Address = Bstr(Utf8StrFmt("%RTnaipv6", &pIf->IPv6Address));
+    if (pIf->IPv6Address.s.Lo || pIf->IPv6Address.s.Hi)
+        m.realIPV6Address = m.IPV6Address = Bstr(Utf8StrFmt("%RTnaipv6", &pIf->IPv6Address));
+    else
+        m.realIPV6Address = m.IPV6Address = Bstr("");
     RTNetMaskToPrefixIPv6(&pIf->IPv6NetMask, &iPrefixIPv6);
     m.realIPV6PrefixLength = m.IPV6NetworkMaskPrefixLength = iPrefixIPv6;