Changeset 31533 in vbox for trunk

Timestamp:

Aug 10, 2010 1:08:56 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: 1900: Create GUI support for NAT forwarding: Initial commit.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (5 diffs)
• src/extensions/QITableView.cpp (added)
• src/extensions/QITableView.h (added)
• src/globals/VBoxGlobal.cpp (modified) (1 diff)
• src/globals/VBoxGlobal.h (modified) (2 diffs)
• src/settings/vm/VBoxVMSettingsNetwork.cpp (modified) (7 diffs)
• src/settings/vm/VBoxVMSettingsNetwork.h (modified) (3 diffs)
• src/settings/vm/VBoxVMSettingsNetwork.ui (modified) (1 diff)
• src/settings/vm/VBoxVMSettingsPortForwardingDlg.cpp (added)
• src/settings/vm/VBoxVMSettingsPortForwardingDlg.h (added)

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

@@ -276 +276 @@
         src/extensions/QITabWidget.h \
         src/extensions/QIToolButton.h \
+        src/extensions/QITableView.h \
         src/extensions/QITreeView.h \
         src/extensions/QITreeWidget.h \
@@ -296 +297 @@
         src/settings/vm/VBoxVMSettingsAudio.h \
         src/settings/vm/VBoxVMSettingsNetwork.h \
+        src/settings/vm/VBoxVMSettingsPortForwardingDlg.h \
         src/settings/vm/VBoxVMSettingsSerial.h \
         src/settings/vm/VBoxVMSettingsParallel.h \
@@ -370 +372 @@
         src/extensions/QISplitter.cpp \
         src/selector/UIVMDesktop.cpp \
+        src/settings/vm/VBoxVMSettingsPortForwardingDlg.cpp \
         src/runtime/UIActionsPool.cpp \
         src/runtime/UIIndicatorsPool.cpp \
@@ -429 +432 @@
         src/extensions/QIStateIndicator.cpp \
         src/extensions/QIStatusBar.cpp \
+        src/extensions/QITableView.cpp \
         src/extensions/QITreeView.cpp \
         src/extensions/QITreeWidget.cpp \
@@ -448 +452 @@
         src/settings/vm/VBoxVMSettingsAudio.cpp \
         src/settings/vm/VBoxVMSettingsNetwork.cpp \
+        src/settings/vm/VBoxVMSettingsPortForwardingDlg.cpp \
         src/settings/vm/VBoxVMSettingsSerial.cpp \
         src/settings/vm/VBoxVMSettingsParallel.cpp \

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

@@ -2783 +2783 @@
         tr ("VDE Adapter", "NetworkAttachmentType");
 #endif
+
+    mNATProtocolTypes [KNATProtocol_UDP] =
+        tr ("UDP", "NATProtocolType");
+    mNATProtocolTypes [KNATProtocol_TCP] =
+        tr ("TCP", "NATProtocolType");
 
     mClipboardTypes [KClipboardMode_Disabled] =

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

@@ -469 +469 @@
     }
 
+    QString toString (KNATProtocol t) const
+    {
+        AssertMsg (!mNATProtocolTypes.value (t).isNull(), ("No text for %d", t));
+        return mNATProtocolTypes.value (t);
+    }
+
+    KNATProtocol toNATProtocolType (const QString &s) const
+    {
+        QULongStringHash::const_iterator it =
+            qFind (mNATProtocolTypes.begin(), mNATProtocolTypes.end(), s);
+        AssertMsg (it != mNATProtocolTypes.end(), ("No value for {%s}",
+                                                   s.toLatin1().constData()));
+        return KNATProtocol (it.key());
+    }
+
     QString toString (KUSBDeviceState aState) const
     {
@@ -784 +799 @@
     QULongStringHash mNetworkAdapterTypes;
     QULongStringHash mNetworkAttachmentTypes;
+    QULongStringHash mNATProtocolTypes;
     QULongStringHash mClipboardTypes;
     QULongStringHash mStorageControllerTypes;

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.cpp

@@ -57 +57 @@
     connect (mAbsAdvanced, SIGNAL (clicked()), this, SLOT (toggleAdvanced()));
     connect (mTbMAC, SIGNAL (clicked()), this, SLOT (generateMac()));
+    connect (mPbPortForwarding, SIGNAL (clicked()), this, SLOT (sltOpenPortsForwadringDlg()));
 
 #ifdef Q_WS_MAC
@@ -120 +121 @@
     mLeMAC->setText (mAdapter.GetMACAddress());
     mCbCableConnected->setChecked (mAdapter.GetCableConnected());
+
+    /* Load port forwarding rules: */
+    QVector<QString> redirects = mAdapter.GetNatDriver().GetRedirects();
+    for (int i = 0; i < redirects.size(); ++i)
+    {
+        QStringList redirectData = redirects[i].split(',');
+        AssertMsg(redirectData.size() == 6, ("Redirect rule should be composed of 6 parts!\n"));
+        mPortForwardingRules << UIPortForwardingData(redirectData[0],
+                                                     (KNATProtocol)redirectData[1].toUInt(),
+                                                     redirectData[2],
+                                                     redirectData[3].toUInt(),
+                                                     redirectData[4],
+                                                     redirectData[5].toUInt());
+    }
 }
 
@@ -165 +180 @@
     mAdapter.SetMACAddress (mLeMAC->text().isEmpty() ? QString::null : mLeMAC->text());
     mAdapter.SetCableConnected (mCbCableConnected->isChecked());
+
+    /* Save port forwarding rules: */
+    QVector<QString> redirects = mAdapter.GetNatDriver().GetRedirects();
+    for (int i = 0; i < redirects.size(); ++i)
+        mAdapter.GetNatDriver().RemoveRedirect(redirects[i].section(',', 0, 0));
+    for (int i = 0; i < mPortForwardingRules.size(); ++i)
+    {
+        UIPortForwardingData redirectData = mPortForwardingRules[i];
+        mAdapter.GetNatDriver().AddRedirect(redirectData.name, redirectData.protocol,
+                                            redirectData.hostIp, redirectData.hostPort,
+                                            redirectData.guestIp, redirectData.guestPort);
+    }
 }
 
@@ -236 +263 @@
     setTabOrder (mLeMAC, mTbMAC);
     setTabOrder (mTbMAC, mCbCableConnected);
-    return mCbCableConnected;
+    setTabOrder (mCbCableConnected, mPbPortForwarding);
+    return mPbPortForwarding;
 }
 
@@ -414 +442 @@
     updateAlternativeName();
 
+    /* Update Forwarding rules button availability: */
+    mPbPortForwarding->setEnabled(attachmentType() == KNetworkAttachmentType_NAT);
+
     /* Unblocking signals as content is changed already */
     mCbAdapterName->blockSignals (false);
@@ -488 +519 @@
     mTbMAC->setVisible (mAbsAdvanced->isExpanded());
     mCbCableConnected->setVisible (mAbsAdvanced->isExpanded());
+    mPbPortForwarding->setVisible (mAbsAdvanced->isExpanded());
 }
 
@@ -494 +526 @@
     mAdapter.SetMACAddress (QString::null);
     mLeMAC->setText (mAdapter.GetMACAddress());
+}
+
+void VBoxVMSettingsNetwork::sltOpenPortsForwadringDlg()
+{
+    VBoxVMSettingsPortForwardingDlg dlg(this, mPortForwardingRules);
+    if (dlg.exec() == QDialog::Accepted)
+        mPortForwardingRules = dlg.rules();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.h

@@ -24 +24 @@
 #include "VBoxSettingsPage.h"
 #include "VBoxVMSettingsNetwork.gen.h"
+#include "VBoxVMSettingsPortForwardingDlg.h"
 
 /* VBox Forwardes */
@@ -62 +63 @@
     void toggleAdvanced();
     void generateMac();
+    void sltOpenPortsForwadringDlg();
 
 private:
@@ -80 +82 @@
     bool mPolished;
     bool mDisableStaticControls;
+    UIPortForwardingDataList mPortForwardingRules;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsNetwork.ui

@@ -217 +217 @@
        </widget>
       </item>
-      <item row="6" column="0" colspan="4">
+      <item row="6" column="1">
+       <widget class="QPushButton" name="mPbPortForwarding">
+        <property name="whatsThis">
+         <string>Opens dialog to manage port forwarding rules.</string>
+        </property>
+        <property name="text">
+         <string>&amp;Port Forwarding</string>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="0" colspan="4">
        <spacer name="verticalSpacer">
         <property name="orientation">