Changeset 53328 in vbox

Timestamp:

Nov 14, 2014 2:02:43 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7456: Global properties: Network page: Port-forwarding sub-dialog: Make sure validation takes into account conflicting rules.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• widgets/UIPortForwardingTable.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1117 +1117 @@
           tr("The current port forwarding rules are not valid. "
              "Rule names should be unique."));
+    return false;
+}
+
+bool UIMessageCenter::warnAboutRulesConflict(QWidget *pParent /* = 0 */) const
+{
+    alert(pParent, MessageType_Error,
+          tr("The current port forwarding rules are not valid. "
+             "Few rules have same host ports and conflicting IP addresses."));
     return false;
 }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -232 +232 @@
     bool warnAboutIncorrectPort(QWidget *pParent = 0) const;
     bool warnAboutNameShouldBeUnique(QWidget *pParent = 0) const;
+    bool warnAboutRulesConflict(QWidget *pParent = 0) const;
     bool confirmCancelingPortForwardingDialog(QWidget *pParent = 0) const;
     void cannotCreateSharedFolder(const CMachine &machine, const QString &strName, const QString &strPath, QWidget *pParent = 0);

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

@@ -30 +30 @@
 # include <QLineEdit>
 # include <QSpinBox>
+# include <QHostAddress>
 
 /* GUI includes: */
@@ -692 +693 @@
     /* Validate table: */
     QSet<QString> usedNames;
+    QMap<int, QString> rules;
     for (int i = 0; i < m_pModel->rowCount(); ++i)
     {
@@ -705 +707 @@
         else
             return msgCenter().warnAboutNameShouldBeUnique(window());
+
+        /* Make sure rules are not in conflict: */
+        const ushort iHostPort = m_pModel->data(m_pModel->index(i, UIPortForwardingModel::UIPortForwardingDataType_HostPort), Qt::EditRole).value<PortData>().value();
+        const QString strHostAddressNew = m_pModel->data(m_pModel->index(i, UIPortForwardingModel::UIPortForwardingDataType_HostIp), Qt::EditRole).value<IpData>();
+        if (rules.contains(iHostPort))
+        {
+            const QString strHostAddressOld = rules.value(iHostPort);
+            if (   strHostAddressNew == strHostAddressOld
+                || strHostAddressNew.isEmpty() || QHostAddress(strHostAddressNew).isNull()
+                || strHostAddressOld.isEmpty() || QHostAddress(strHostAddressOld).isNull())
+                return msgCenter().warnAboutRulesConflict(window());
+        }
+        else
+            rules[iHostPort] = strHostAddressNew;
     }
     /* True by default: */