Changeset 57366 in vbox for trunk/src/VBox

Timestamp:

Aug 14, 2015 6:00:53 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Port-forwarding dialog: Do not allow empty guest address values for NAT network case.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/global/UIGlobalSettingsPortForwardingDlg.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsPortForwardingDlg.cpp (modified) (1 diff)
• widgets/UIPortForwardingTable.cpp (modified) (2 diffs)
• widgets/UIPortForwardingTable.h (modified) (2 diffs)

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

@@ -1154 +1154 @@
           tr("The current port forwarding rules are not valid. "
              "All of the host or guest address values should be correct or empty."));
+    return false;
+}
+
+bool UIMessageCenter::warnAboutEmptyGuestAddress(QWidget *pParent /* = 0 */) const
+{
+    alert(pParent, MessageType_Error,
+          tr("The current port forwarding rules are not valid. "
+             "None of the guest address values may be empty."));
     return false;
 }

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

@@ -239 +239 @@
     bool warnAboutIncorrectPort(QWidget *pParent = 0) const;
     bool warnAboutIncorrectAddress(QWidget *pParent = 0) const;
+    bool warnAboutEmptyGuestAddress(QWidget *pParent = 0) const;
     bool warnAboutNameShouldBeUnique(QWidget *pParent = 0) const;
     bool warnAboutRulesConflict(QWidget *pParent = 0) const;

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp

@@ -51 +51 @@
         {
             /* Create table tabs: */
-            m_pIPv4Table = new UIPortForwardingTable(ipv4rules, false);
-            m_pIPv6Table = new UIPortForwardingTable(ipv6rules, true);
+            m_pIPv4Table = new UIPortForwardingTable(ipv4rules, false, false);
+            m_pIPv6Table = new UIPortForwardingTable(ipv6rules, true, false);
             /* Add widgets into tab-widget: */
             m_pTabWidget->addTab(m_pIPv4Table, QString());

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp

@@ -45 +45 @@
     {
         /* Create table: */
-        m_pTable = new UIPortForwardingTable(rules, false);
+        m_pTable = new UIPortForwardingTable(rules, false, true);
         /* Create button-box: */
         m_pButtonBox = new QIDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal);

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

@@ -567 +567 @@
 
 
-UIPortForwardingTable::UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6)
-    : m_fIsTableDataChanged(false)
+UIPortForwardingTable::UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6, bool fAllowEmptyGuestIPs)
+    : m_fAllowEmptyGuestIPs(fAllowEmptyGuestIPs)
+    , m_fIsTableDataChanged(false)
     , m_pTableView(0)
     , m_pToolBar(0)
@@ -731 +732 @@
             return msgCenter().warnAboutIncorrectAddress(window());
 
+        /* If empty guest address is not allowed: */
+        if (   !m_fAllowEmptyGuestIPs
+            && guestIp.isEmpty())
+            return msgCenter().warnAboutEmptyGuestAddress(window());
+
         /* Make sure non of the names were previosly used: */
         if (!names.contains(name))

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

@@ -130 +130 @@
 
     /* Constructor: */
-    UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6);
+    UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6, bool fAllowEmptyGuestIPs);
 
     /* API: Rules stuff: */
@@ -159 +159 @@
 
     /* Flags: */
+    bool m_fAllowEmptyGuestIPs;
     bool m_fIsTableDataChanged;