Changeset 48548 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 19, 2013 4:31:07 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Global properties / Network page / NAT network tab: IPv6 port forwarding UI.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/settings/global/UIGlobalSettingsNetwork.cpp (modified) (2 diffs)
• src/settings/global/UIGlobalSettingsNetwork.h (modified) (3 diffs)
• src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp (modified) (2 diffs)
• src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp ) (7 diffs)
• src/settings/global/UIGlobalSettingsPortForwardingDlg.h (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h ) (4 diffs)
• src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp (modified) (1 diff)
• src/settings/machine/UIMachineSettingsPortForwardingDlg.h (modified) (1 diff)
• src/widgets/UIPortForwardingTable.cpp (modified) (7 diffs)
• src/widgets/UIPortForwardingTable.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -357 +357 @@
         src/settings/global/UIGlobalSettingsNetworkDetailsNAT.h \
         src/settings/global/UIGlobalSettingsNetworkDetailsHost.h \
+        src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
         src/settings/global/UIGlobalSettingsProxy.h \
         src/settings/global/UIGlobalSettingsUpdate.h \
@@ -612 +613 @@
         src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp \
         src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp \
+        src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
         src/settings/global/UIGlobalSettingsProxy.cpp \
         src/settings/global/UIGlobalSettingsUpdate.cpp \

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

@@ -923 +923 @@
     data.m_fAdvertiseDefaultIPv6Route = network.GetAdvertiseDefaultIPv6RouteEnabled();
 
-    /* Load redirect options: */
-    QVector<QString> redirects = network.GetPortForwardRules4();
-    foreach (const QString &strRedirect, redirects)
-    {
-        QStringList redirectData = strRedirect.split(':');
-        Assert(redirectData.size() == 6);
-        if (redirectData.size() != 6)
+    /* Load IPv4 rules: */
+    QVector<QString> ipv4rules = network.GetPortForwardRules4();
+    foreach (QString strIPv4Rule, ipv4rules)
+    {
+        /* Replace all ':' with ',' first: */
+        strIPv4Rule.replace(':', ',');
+        /* Parse rules: */
+        QStringList rules = strIPv4Rule.split(',');
+        Assert(rules.size() == 6);
+        if (rules.size() != 6)
             continue;
-        data.m_redirects << UIPortForwardingData(redirectData[0],
-                                                 gpConverter->fromInternalString<KNATProtocol>(redirectData[1]),
-                                                 QString(redirectData[2]).remove('[').remove(']'),
-                                                 redirectData[3].toUInt(),
-                                                 QString(redirectData[4]).remove('[').remove(']'),
-                                                 redirectData[5].toUInt());
+        data.m_ipv4rules << UIPortForwardingData(rules[0],
+                                                 gpConverter->fromInternalString<KNATProtocol>(rules[1]),
+                                                 QString(rules[2]).remove('[').remove(']'),
+                                                 rules[3].toUInt(),
+                                                 QString(rules[4]).remove('[').remove(']'),
+                                                 rules[5].toUInt());
+    }
+
+    /* Load IPv6 rules: */
+    QVector<QString> ipv6rules = network.GetPortForwardRules6();
+    foreach (QString strIPv6Rule, ipv6rules)
+    {
+        /* Replace all ':' with ',' first: */
+        strIPv6Rule.replace(':', ',');
+        /* But replace ',' back with ':' for addresses: */
+        QRegExp re("\\[[^:]+\\]");
+        re.setMinimal(true);
+        while (re.indexIn(strIPv6Rule) != -1)
+        {
+            QString strCapOld = re.cap(0);
+            QString strCapNew = strCapOld;
+            strCapNew.replace(',', ':');
+            strIPv6Rule.replace(strCapOld, strCapNew);
+        }
+        /* Parse rules: */
+        QStringList rules = strIPv6Rule.split(',');
+        Assert(rules.size() == 6);
+        if (rules.size() != 6)
+        {
+            printf("strIPv6Rule = {%s}\n", strIPv6Rule.toAscii().constData());
+            continue;
+        }
+        data.m_ipv6rules << UIPortForwardingData(rules[0],
+                                                 gpConverter->fromInternalString<KNATProtocol>(rules[1]),
+                                                 QString(rules[2]).remove('[').remove(']'),
+                                                 rules[3].toUInt(),
+                                                 QString(rules[4]).remove('[').remove(']'),
+                                                 rules[5].toUInt());
     }
 
@@ -958 +993 @@
     network.SetAdvertiseDefaultIPv6RouteEnabled(data.m_fAdvertiseDefaultIPv6Route);
 
-    /* Rewrite redirect options: */
-    QVector<QString> oldRedirects = network.GetPortForwardRules4();
-    foreach (const QString &strRedirect, oldRedirects)
-        network.RemovePortForwardRule(false, strRedirect.section(':', 0, 0));
-    foreach (const UIPortForwardingData &newRedirect, data.m_redirects)
+    /* Rewrite IPv4 rules: */
+    QVector<QString> oldIPv4Rules = network.GetPortForwardRules4();
+    foreach (const QString &strRule, oldIPv4Rules)
+        network.RemovePortForwardRule(false, strRule.section(':', 0, 0));
+    foreach (const UIPortForwardingData &newRule, data.m_ipv4rules)
         network.AddPortForwardRule(false,
-                                   newRedirect.name, newRedirect.protocol,
-                                   newRedirect.hostIp, newRedirect.hostPort.value(),
-                                   newRedirect.guestIp, newRedirect.guestPort.value());
+                                   newRule.name, newRule.protocol,
+                                   newRule.hostIp, newRule.hostPort.value(),
+                                   newRule.guestIp, newRule.guestPort.value());
+
+    /* Rewrite IPv6 rules: */
+    QVector<QString> oldIPv6Rules = network.GetPortForwardRules6();
+    foreach (const QString &strRule, oldIPv6Rules)
+        network.RemovePortForwardRule(true, strRule.section(':', 0, 0));
+    foreach (const UIPortForwardingData &newRule, data.m_ipv6rules)
+        network.AddPortForwardRule(true,
+                                   newRule.name, newRule.protocol,
+                                   newRule.hostIp, newRule.hostPort.value(),
+                                   newRule.guestIp, newRule.guestPort.value());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h

@@ -23 +23 @@
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsNetwork.gen.h"
-#include "UIMachineSettingsPortForwardingDlg.h"
+#include "UIPortForwardingTable.h"
 
 /* Forward declarations: */
@@ -41 +41 @@
     bool m_fSupportsIPv6;
     bool m_fAdvertiseDefaultIPv6Route;
-    UIPortForwardingDataList m_redirects;
+    UIPortForwardingDataList m_ipv4rules;
+    UIPortForwardingDataList m_ipv6rules;
     bool operator==(const UIDataNetworkNAT &other) const
     {
@@ -51 +52 @@
                m_fSupportsIPv6 == other.m_fSupportsIPv6 &&
                m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route &&
-               m_redirects == other.m_redirects;
+               m_ipv4rules == other.m_ipv4rules &&
+               m_ipv6rules == other.m_ipv6rules;
     }
 };

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

@@ -24 +24 @@
 #include "UIGlobalSettingsNetwork.h"
 #include "UIGlobalSettingsNetworkDetailsNAT.h"
+#include "UIGlobalSettingsPortForwardingDlg.h"
 
 UIGlobalSettingsNetworkDetailsNAT::UIGlobalSettingsNetworkDetailsNAT(QWidget *pParent, UIDataNetworkNAT &data)
@@ -72 +73 @@
 {
     /* Open dialog to edit port-forwarding rules: */
-    UIMachineSettingsPortForwardingDlg dlg(this, m_data.m_redirects);
+    UIGlobalSettingsPortForwardingDlg dlg(this, m_data.m_ipv4rules, m_data.m_ipv6rules);
     if (dlg.exec() == QDialog::Accepted)
-        m_data.m_redirects = dlg.rules();
+    {
+        m_data.m_ipv4rules = dlg.ipv4rules();
+        m_data.m_ipv6rules = dlg.ipv6rules();
+    }
 }
 

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

@@ -3 +3 @@
  *
  * VBox frontends: Qt4 GUI ("VirtualBox"):
- * UIMachineSettingsPortForwardingDlg class implementation
+ * UIGlobalSettingsPortForwardingDlg class implementation
  */
 
@@ -21 +21 @@
 #include <QVBoxLayout>
 #include <QPushButton>
+#include <QTabWidget>
 
 /* GUI includes: */
-#include "UIMachineSettingsPortForwardingDlg.h"
+#include "UIGlobalSettingsPortForwardingDlg.h"
 #include "UIIconPool.h"
 #include "QIDialogButtonBox.h"
 
-UIMachineSettingsPortForwardingDlg::UIMachineSettingsPortForwardingDlg(QWidget *pParent,
-                                                                       const UIPortForwardingDataList &rules)
+UIGlobalSettingsPortForwardingDlg::UIGlobalSettingsPortForwardingDlg(QWidget *pParent,
+                                                                     const UIPortForwardingDataList &ipv4rules,
+                                                                     const UIPortForwardingDataList &ipv6rules)
     : QIWithRetranslateUI<QIDialog>(pParent)
-    , m_pTable(0)
+    , m_pIPv4Table(0)
+    , m_pIPv6Table(0)
     , m_pButtonBox(0)
 {
@@ -39 +42 @@
     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
     {
-        /* Create table: */
-        m_pTable = new UIPortForwardingTable(rules);
+        /* Create tab-widget: */
+        m_pTabWidget = new QTabWidget;
+        {
+            /* Create table tabs: */
+            m_pIPv4Table = new UIPortForwardingTable(ipv4rules, false);
+            m_pIPv6Table = new UIPortForwardingTable(ipv6rules, true);
+            /* Add widgets into tab-widget: */
+            m_pTabWidget->addTab(m_pIPv4Table, QString());
+            m_pTabWidget->addTab(m_pIPv6Table, QString());
+        }
         /* Create button-box: */
         m_pButtonBox = new QIDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal);
@@ -49 +60 @@
         }
         /* Add widgets into layout: */
-        pMainLayout->addWidget(m_pTable);
+        pMainLayout->addWidget(m_pTabWidget);
         pMainLayout->addWidget(m_pButtonBox);
     }
@@ -57 +68 @@
 }
 
-const UIPortForwardingDataList& UIMachineSettingsPortForwardingDlg::rules() const
+const UIPortForwardingDataList& UIGlobalSettingsPortForwardingDlg::ipv4rules() const
 {
-    return m_pTable->rules();
+    return m_pIPv4Table->rules();
 }
 
-void UIMachineSettingsPortForwardingDlg::accept()
+const UIPortForwardingDataList& UIGlobalSettingsPortForwardingDlg::ipv6rules() const
+{
+    return m_pIPv6Table->rules();
+}
+
+void UIGlobalSettingsPortForwardingDlg::accept()
 {
     /* Validate table: */
-    bool fPassed = m_pTable->validate();
+    bool fPassed = m_pIPv4Table->validate() && m_pIPv6Table->validate();
     if (!fPassed)
         return;
@@ -72 +88 @@
 }
 
-void UIMachineSettingsPortForwardingDlg::reject()
+void UIGlobalSettingsPortForwardingDlg::reject()
 {
     /* Discard table: */
-    bool fPassed = m_pTable->discard();
+    bool fPassed = m_pIPv4Table->discard() && m_pIPv6Table->discard();
     if (!fPassed)
         return;
@@ -82 +98 @@
 }
 
-void UIMachineSettingsPortForwardingDlg::retranslateUi()
+void UIGlobalSettingsPortForwardingDlg::retranslateUi()
 {
     /* Set window title: */
     setWindowTitle(tr("Port Forwarding Rules"));
+    /* Set tab-widget tab names: */
+    m_pTabWidget->setTabText(0, tr("IPv4"));
+    m_pTabWidget->setTabText(1, tr("IPv6"));
 }
 

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

@@ -17 +17 @@
  */
 
-#ifndef __UIMachineSettingsPortForwardingDlg_h__
-#define __UIMachineSettingsPortForwardingDlg_h__
+#ifndef __UIGlobalSettingsPortForwardingDlg_h__
+#define __UIGlobalSettingsPortForwardingDlg_h__
 
 /* GUI includes: */
@@ -26 +26 @@
 
 /* Forward declarations: */
+class QTabWidget;
 class QIDialogButtonBox;
 
-/* Machine settings / Network page / NAT attachment / Port forwarding dialog: */
-class UIMachineSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
+/* Global settings / Network page / NAT network tab / Port forwarding dialog: */
+class UIGlobalSettingsPortForwardingDlg : public QIWithRetranslateUI<QIDialog>
 {
     Q_OBJECT;
@@ -36 +37 @@
 
     /* Constructor/destructor: */
-    UIMachineSettingsPortForwardingDlg(QWidget *pParent,
-                                       const UIPortForwardingDataList &rules = UIPortForwardingDataList());
+    UIGlobalSettingsPortForwardingDlg(QWidget *pParent,
+                                      const UIPortForwardingDataList &ipv4rules,
+                                      const UIPortForwardingDataList &ipv6rules);
 
     /* API: Rules stuff: */
-    const UIPortForwardingDataList& rules() const;
+    const UIPortForwardingDataList& ipv4rules() const;
+    const UIPortForwardingDataList& ipv6rules() const;
 
 private slots:
@@ -54 +57 @@
 
     /* Widgets: */
-    UIPortForwardingTable *m_pTable;
+    QTabWidget *m_pTabWidget;
+    UIPortForwardingTable *m_pIPv4Table;
+    UIPortForwardingTable *m_pIPv6Table;
     QIDialogButtonBox *m_pButtonBox;
 };
 
-#endif // __UIMachineSettingsPortForwardingDlg_h__
+#endif // __UIGlobalSettingsPortForwardingDlg_h__

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

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

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

@@ -36 +36 @@
 
     /* Constructor/destructor: */
-    UIMachineSettingsPortForwardingDlg(QWidget *pParent,
-                                       const UIPortForwardingDataList &rules = UIPortForwardingDataList());
+    UIMachineSettingsPortForwardingDlg(QWidget *pParent, const UIPortForwardingDataList &rules);
 
     /* API: Rules stuff: */

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

@@ -43 +43 @@
 #include <math.h>
 
-/* IP validator: */
-class IPValidator : public QValidator
+/* IPv4 validator: */
+class IPv4Validator : public QValidator
 {
     Q_OBJECT;
@@ -51 +51 @@
 
     /* Constructor/destructor: */
-    IPValidator(QObject *pParent) : QValidator(pParent) {}
-    ~IPValidator() {}
+    IPv4Validator(QObject *pParent) : QValidator(pParent) {}
+    ~IPv4Validator() {}
 
     /* Handler: Validation stuff: */
@@ -72 +72 @@
 };
 
+/* IPv6 validator: */
+class IPv6Validator : public QValidator
+{
+    Q_OBJECT;
+
+public:
+
+    /* Constructor/destructor: */
+    IPv6Validator(QObject *pParent) : QValidator(pParent) {}
+    ~IPv6Validator() {}
+
+    /* Handler: Validation stuff: */
+    QValidator::State validate(QString &strInput, int& /*iPos*/) const
+    {
+        QString strStringToValidate(strInput);
+        strStringToValidate.remove(' ');
+        QString strDigits("([0-9a-fA-F]{0,4})");
+        QRegExp intRegExp(QString("^%1(:%1(:%1(:%1(:%1(:%1(:%1(:%1)?)?)?)?)?)?)?$").arg(strDigits));
+        if (intRegExp.indexIn(strStringToValidate) != -1)
+            return QValidator::Acceptable;
+        else
+            return QValidator::Invalid;
+    }
+};
+
 /* Name editor: */
 class NameEditor : public QLineEdit
@@ -140 +165 @@
 };
 
-/* IP editor: */
-class IPEditor : public QLineEdit
+/* IPv4 editor: */
+class IPv4Editor : public QLineEdit
 {
     Q_OBJECT;
@@ -149 +174 @@
 
     /* Constructor: */
-    IPEditor(QWidget *pParent = 0) : QLineEdit(pParent)
+    IPv4Editor(QWidget *pParent = 0) : QLineEdit(pParent)
     {
         setFrame(false);
         setAlignment(Qt::AlignCenter);
-        setValidator(new IPValidator(this));
+        setValidator(new IPv4Validator(this));
         setInputMask("000.000.000.000");
+    }
+
+private:
+
+    /* API: IP stuff: */
+    void setIp(IpData ip)
+    {
+        setText(ip);
+    }
+
+    /* API: IP stuff: */
+    IpData ip() const
+    {
+        return text() == "..." ? QString() : text();
+    }
+};
+
+/* IPv6 editor: */
+class IPv6Editor : public QLineEdit
+{
+    Q_OBJECT;
+    Q_PROPERTY(IpData ip READ ip WRITE setIp USER true);
+
+public:
+
+    /* Constructor: */
+    IPv6Editor(QWidget *pParent = 0) : QLineEdit(pParent)
+    {
+        setFrame(false);
+        setAlignment(Qt::AlignCenter);
+        setValidator(new IPv6Validator(this));
+        // setInputMask("000.000.000.000"); // No mask for now...
     }
 
@@ -435 +492 @@
 
 
-UIPortForwardingTable::UIPortForwardingTable(const UIPortForwardingDataList &rules)
+UIPortForwardingTable::UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6)
     : m_fIsTableDataChanged(false)
     , m_pTableView(0)
@@ -534 +591 @@
             int iIpId = qRegisterMetaType<IpData>();
             /* Register ip editor: */
-            QStandardItemEditorCreator<IPEditor> *pIpEditorItemCreator = new QStandardItemEditorCreator<IPEditor>();
-            /* Link ip type & editor: */
-            pNewItemEditorFactory->registerEditor((QVariant::Type)iIpId, pIpEditorItemCreator);
+            if (!fIPv6)
+            {
+                QStandardItemEditorCreator<IPv4Editor> *pIPv4EditorItemCreator = new QStandardItemEditorCreator<IPv4Editor>();
+                /* Link ip type & editor: */
+                pNewItemEditorFactory->registerEditor((QVariant::Type)iIpId, pIPv4EditorItemCreator);
+            }
+            else
+            {
+                QStandardItemEditorCreator<IPv6Editor> *pIPv6EditorItemCreator = new QStandardItemEditorCreator<IPv6Editor>();
+                /* Link ip type & editor: */
+                pNewItemEditorFactory->registerEditor((QVariant::Type)iIpId, pIPv6EditorItemCreator);
+            }
 
             /* Register port type: */

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

@@ -109 +109 @@
 
     /* Constructor: */
-    UIPortForwardingTable(const UIPortForwardingDataList &rules = UIPortForwardingDataList());
+    UIPortForwardingTable(const UIPortForwardingDataList &rules, bool fIPv6);
 
     /* API: Rules stuff: */