Changeset 48524 in vbox for trunk

Timestamp:

Sep 18, 2013 4:02:52 PM (12 years ago)

Author:

vboxsync

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

89052

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/global

Files:

• UIGlobalSettingsNetwork.cpp (modified) (7 diffs)
• UIGlobalSettingsNetwork.h (modified) (3 diffs)
• UIGlobalSettingsNetworkDetailsNAT.cpp (modified) (1 diff)
• UIGlobalSettingsNetworkDetailsNAT.h (modified) (1 diff)
• UIGlobalSettingsNetworkDetailsNAT.ui (modified) (4 diffs)

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

@@ -25 +25 @@
 #include "VBoxGlobal.h"
 #include "UIIconPool.h"
+#include "UIConverter.h"
 #include "UIMessageCenter.h"
 #include "UIGlobalSettingsNetwork.h"
@@ -127 +128 @@
     {
         /* Emptiness validation: */
-        message.second << UIGlobalSettingsNetwork::tr("The new name for NAT network previously called <b>%1</b> is empty.").arg(m_data.m_strName);
+        message.second << UIGlobalSettingsNetwork::tr("No new name specified for the NAT network previously called <b>%1</b>.").arg(m_data.m_strName);
         fNameValid = false;
         fPass = false;
@@ -137 +138 @@
         /* Emptiness validation: */
         if (fNameValid)
-            message.second << UIGlobalSettingsNetwork::tr("The CIDR for NAT network <b>%1</b> is empty.").arg(m_data.m_strNewName);
+            message.second << UIGlobalSettingsNetwork::tr("No CIDR specified for the NAT network <b>%1</b>.").arg(m_data.m_strNewName);
         else
-            message.second << UIGlobalSettingsNetwork::tr("The CIDR for NAT network previously called <b>%1</b> is empty.").arg(m_data.m_strName);
+            message.second << UIGlobalSettingsNetwork::tr("No CIDR specified for the NAT network previously called <b>%1</b>.").arg(m_data.m_strName);
         fPass = false;
     }
@@ -150 +151 @@
         {
             if (fNameValid)
-                message.second << UIGlobalSettingsNetwork::tr("The CIDR <i>%1</i> for NAT network <b>%2</b> is invalid.")
+                message.second << UIGlobalSettingsNetwork::tr("Invalid CIDR specified (<i>%1</i>) for the NAT network <b>%2</b>.")
                                                               .arg(m_data.m_strCIDR, m_data.m_strNewName);
             else
-                message.second << UIGlobalSettingsNetwork::tr("The CIDR <i>%1</i> for NAT network previously called <b>%2</b> is invalid.")
+                message.second << UIGlobalSettingsNetwork::tr("Invalid CIDR specified (<i>%1</i>) for the NAT network previously called <b>%2</b>.")
                                                               .arg(m_data.m_strCIDR, m_data.m_strName);
             fPass = false;
@@ -199 +200 @@
 
     /* Assign tool-tip finally: */
-    setToolTip(0, strToolTip);
+    setToolTip(1, strToolTip);
 }
 
@@ -922 +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)
+            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());
+    }
+
     /* Return data: */
     return data;
@@ -940 +957 @@
     network.SetIPv6Enabled(data.m_fSupportsIPv6);
     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)
+        network.AddPortForwardRule(false,
+                                   newRedirect.name, newRedirect.protocol,
+                                   newRedirect.hostIp, newRedirect.hostPort.value(),
+                                   newRedirect.guestIp, newRedirect.guestPort.value());
 }
 

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

@@ -23 +23 @@
 #include "UISettingsPage.h"
 #include "UIGlobalSettingsNetwork.gen.h"
+#include "UIMachineSettingsPortForwardingDlg.h"
 
 /* Forward declarations: */
@@ -40 +41 @@
     bool m_fSupportsIPv6;
     bool m_fAdvertiseDefaultIPv6Route;
+    UIPortForwardingDataList m_redirects;
     bool operator==(const UIDataNetworkNAT &other) const
     {
@@ -48 +50 @@
                m_fSupportsDHCP == other.m_fSupportsDHCP &&
                m_fSupportsIPv6 == other.m_fSupportsIPv6 &&
-               m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route;
+               m_fAdvertiseDefaultIPv6Route == other.m_fAdvertiseDefaultIPv6Route &&
+               m_redirects == other.m_redirects;
     }
 };

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

@@ -69 +69 @@
 }
 
+void UIGlobalSettingsNetworkDetailsNAT::sltEditPortForwarding()
+{
+    /* Open dialog to edit port-forwarding rules: */
+    UIMachineSettingsPortForwardingDlg dlg(this, m_data.m_redirects);
+    if (dlg.exec() == QDialog::Accepted)
+        m_data.m_redirects = dlg.rules();
+}
+
 void UIGlobalSettingsNetworkDetailsNAT::accept()
 {

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

@@ -48 +48 @@
 private slots:
 
+    /* Handler: Port-forwarding stuff: */
+    void sltEditPortForwarding();
+
     /* Handler: Dialog stuff: */
     void accept();

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

@@ -22 +22 @@
     <widget class="QCheckBox" name="m_pCheckboxNetwork">
      <property name="text">
-      <string>Network &amp;Enabled</string>
+      <string>&amp;Enable Network</string>
      </property>
      <property name="toolTip">
@@ -32 +32 @@
     <widget class="QWidget" name="m_pContainerOptions">
      <layout class="QGridLayout">
-      <item row="0" column="0" rowspan="3">
+      <item row="0" column="0">
        <spacer>
         <property name="orientation">
@@ -125 +125 @@
         <property name="toolTip">
          <string>Determines whether default IPv6 route should be advertised for this network.</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="2">
+       <widget class="QPushButton" name="m_pButtonPortForwarding">
+        <property name="whatsThis">
+         <string>Opens dialog to manage port forwarding rules.</string>
+        </property>
+        <property name="text">
+         <string>&amp;Port Forwarding</string>
         </property>
        </widget>
@@ -175 +185 @@
   </connection>
   <connection>
+   <sender>m_pButtonPortForwarding</sender>
+   <signal>clicked(bool)</signal>
+   <receiver>UIGlobalSettingsNetworkDetailsNAT</receiver>
+   <slot>sltEditPortForwarding()</slot>
+  </connection>
+  <connection>
    <sender>m_pButtonBox</sender>
    <signal>accepted()</signal>