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

Timestamp:

Jun 27, 2017 10:34:35 AM (8 years ago)

Author:

vboxsync

Message:

Main/HostNetworkInterfaceImpl: enableStaticIPConfigV6 - Validate new
IPv6 address. When address or prefix validatation fails, provide an
error message. Compare new and old IPv6 addresses numerically, not
textually.

File:

• trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp (modified) (1 diff)

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

@@ -515 +515 @@
 #else
     if (aIPV6NetworkMaskPrefixLength > 128)
-        return E_INVALIDARG;
-
-    int rc = S_OK;
-    if (   m.realIPV6Address      != aIPV6Address
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, VERR_INVALID_PARAMETER,
+                   "Invalid IPv6 prefix length");
+
+    int rc;
+
+    RTNETADDRIPV6 AddrOld, AddrNew;
+    char *pszZoneIgnored;
+    bool fAddrChanged;
+
+    rc = RTNetStrToIPv6Addr(aIPV6Address.c_str(), &AddrNew, &pszZoneIgnored);
+    if (RT_FAILURE(rc))
+    {
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc, "Invalid IPv6 address");
+    }
+
+    rc = RTNetStrToIPv6Addr(com::Utf8Str(m.realIPV6Address).c_str(), &AddrOld, &pszZoneIgnored);
+    if (RT_SUCCESS(rc))
+    {
+        fAddrChanged = (memcmp(&AddrNew, &AddrOld, sizeof(RTNETADDRIPV6)) == 0);
+    }
+    else
+    {
+        fAddrChanged = true;
+    }
+   
+    if (   fAddrChanged
         || m.realIPV6PrefixLength != aIPV6NetworkMaskPrefixLength)
     {