Changeset 60171 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Mar 23, 2016 3:11:45 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106194

Message:

FE/Qt: Port-forwarding dialog: fix botched logic when verifying the
host and the guest IP address. E.g. "::" (IPv6 "any" address) was
rejected as host IP.

Ok dsen.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp

@@ -727 +727 @@
             return msgCenter().warnAboutIncorrectPort(window());
         /* If at least one address is incorrect: */
-        if (!hostIp.trimmed().isEmpty() &&
-            (   (   !RTNetIsIPv4AddrStr(hostIp.toUtf8().constData())
-                 && !RTNetIsIPv6AddrStr(hostIp.toUtf8().constData()))
-             || RTNetStrIsIPv4AddrAny(hostIp.toUtf8().constData())
-             || RTNetStrIsIPv6AddrAny(hostIp.toUtf8().constData())))
+        if (!(   hostIp.trimmed().isEmpty()
+              || RTNetIsIPv4AddrStr(hostIp.toUtf8().constData())
+              || RTNetIsIPv6AddrStr(hostIp.toUtf8().constData())
+              || RTNetStrIsIPv4AddrAny(hostIp.toUtf8().constData())
+              || RTNetStrIsIPv6AddrAny(hostIp.toUtf8().constData())))
             return msgCenter().warnAboutIncorrectAddress(window());
-        if (!guestIp.trimmed().isEmpty() &&
-            (   (   !RTNetIsIPv4AddrStr(guestIp.toUtf8().constData())
-                 && !RTNetIsIPv6AddrStr(guestIp.toUtf8().constData()))
-             || RTNetStrIsIPv4AddrAny(guestIp.toUtf8().constData())
-             || RTNetStrIsIPv6AddrAny(guestIp.toUtf8().constData())))
+        if (!(   guestIp.trimmed().isEmpty()
+              || RTNetIsIPv4AddrStr(guestIp.toUtf8().constData())
+              || RTNetIsIPv6AddrStr(guestIp.toUtf8().constData())
+              || RTNetStrIsIPv4AddrAny(guestIp.toUtf8().constData())
+              || RTNetStrIsIPv6AddrAny(guestIp.toUtf8().constData())))
             return msgCenter().warnAboutIncorrectAddress(window());
         /* If empty guest address is not allowed: */