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

Timestamp:

Sep 19, 2013 3:17:43 PM (11 years ago)

Author:

vboxsync

Message:

Main/NetworkAdapter+Machine+Appliance+SystemProperties+Medium+Console+Settings+IDL: make NAT networking a separate network attachment type which improves the user experience, store the necessary settings, plus changing the design of the methods which will move images and entire VMs, they lacked a progress object
Frontends/VirtualBox: adapted fully, can configure NAT networks with proper drop down list support
Frontends/VBoxManage: also supports NAT networks completely, and adds the long missing code to list intnets

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageControlVM.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageHelp.cpp (modified) (4 diffs)
• VBoxManage/VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManage/VBoxManageList.cpp (modified) (11 diffs)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (4 diffs)
• VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (2 diffs)
• VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp (modified) (1 diff)
• VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (14 diffs)
• VirtualBox/src/settings/machine/UIMachineSettingsNetwork.h (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -761 +761 @@
                         CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_Generic), 1);
                     }
+                    else if (!strcmp(a->argv[2], "natnetwork"))
+                    {
+                        if (a->argc <= 3)
+                        {
+                            errorArgument("Missing argument to '%s'", a->argv[2]);
+                            rc = E_FAIL;
+                            break;
+                        }
+                        CHECK_ERROR_RET(adapter, COMSETTER(Enabled)(TRUE), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(NATNetwork)(Bstr(a->argv[3]).raw()), 1);
+                        CHECK_ERROR_RET(adapter, COMSETTER(AttachmentType)(NetworkAttachmentType_NATNetwork), 1);
+                    }
                     /** @todo obsolete, remove eventually */
                     else if (!strcmp(a->argv[2], "vde"))
@@ -1458 +1470 @@
                 break;
             }
-            
+
         }
         else

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -123 +123 @@
                            "%s list [--long|-l]%s vms|runningvms|ostypes|hostdvds|hostfloppies|\n"
 #if defined(VBOX_WITH_NETFLT)
-                     "                            bridgedifs|hostonlyifs|dhcpservers|hostinfo|\n"
+                     "                            intnets|bridgedifs|hostonlyifs|natnets|dhcpservers|\n"
 #else
-                     "                            bridgedifs|dhcpservers|hostinfo|\n"
-#endif
-                     "                            hostcpuids|hddbackends|hdds|dvds|floppies|\n"
+                     "                            intnets|bridgedifs|natnets|dhcpservers|hostinfo|\n"
+#endif
+                     "                            hostinfo|hostcpuids|hddbackends|hdds|dvds|floppies|\n"
                      "                            usbhost|usbfilters|systemproperties|extpacks|\n"
                      "                            groups\n"
@@ -217 +217 @@
 #endif
                      "|\n"
-                     "                                        generic"
+                     "                                        generic|natnetwork"
                      "]\n"
                      "                            [--nictype<1-N> Am79C970A|Am79C973"
@@ -240 +240 @@
 #endif
                      "                            [--intnet<1-N> <network name>]\n"
+                     "                            [--nat-network<1-N> <network name>]\n"
+                     "                            [--nicgenericdrv<1-N> <driver>\n"
                      "                            [--natnet<1-N> <network>|default]\n"
-                     "                            [--nicgenericdrv<1-N> <driver>\n"
                      "                            [--natsettings<1-N> [<mtu>],[<socksnd>],\n"
                      "                                                [<sockrcv>],[<tcpsnd>],\n"
@@ -440 +441 @@
                      "                            setlinkstate<1-N> on|off |\n"
 #if defined(VBOX_WITH_NETFLT)
-                     "                            nic<1-N> null|nat|bridged|intnet|hostonly|generic"
-                     "\n"
-                     "                                     [<devicename>] |\n"
+                     "                            nic<1-N> null|nat|bridged|intnet|hostonly|generic|\n"
+                     "                                     natnetwork [<devicename>] |\n"
 #else /* !VBOX_WITH_NETFLT */
-                     "                            nic<1-N> null|nat|bridged|intnet|generic\n"
+                     "                            nic<1-N> null|nat|bridged|intnet|generic|natnetwork\n"
                      "                                     [<devicename>] |\n"
 #endif /* !VBOX_WITH_NETFLT */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1073 +1073 @@
                         break;
                     }
+
                     case NetworkAttachmentType_Generic:
                     {
@@ -1103 +1104 @@
                         break;
                     }
+
+                    case NetworkAttachmentType_NATNetwork:
+                    {
+                        Bstr strNetwork;
+                        nic->COMGETTER(NATNetwork)(strNetwork.asOutParam());
+                        if (details == VMINFO_MACHINEREADABLE)
+                        {
+                            RTPrintf("nat-network%d=\"%ls\"\n", currentNIC + 1, strNetwork.raw());
+                            strAttachment = "natnetwork";
+                        }
+                        else
+                            strAttachment = Utf8StrFmt("NAT Network '%s'", Utf8Str(strNetwork).c_str());
+                        break;
+                    }
+
                     default:
                         strAttachment = "unknown";

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -76 +76 @@
 
 /**
+ * List internal networks.
+ *
+ * @returns See produceList.
+ * @param   pVirtualBox         Reference to the IVirtualBox smart pointer.
+ */
+static HRESULT listInternalNetworks(const ComPtr<IVirtualBox> pVirtualBox)
+{
+    HRESULT rc;
+    com::SafeArray<BSTR> internalNetworks;
+    CHECK_ERROR(pVirtualBox, COMGETTER(InternalNetworks)(ComSafeArrayAsOutParam(internalNetworks)));
+    for (size_t i = 0; i < internalNetworks.size(); ++i)
+    {
+        RTPrintf("Name:        %ls\n", internalNetworks[i]);
+    }
+    return rc;
+}
+
+
+/**
  * List network interfaces information (bridged/host only).
  *
  * @returns See produceList.
  * @param   pVirtualBox         Reference to the IVirtualBox smart pointer.
+ * @param   fIsBridged          Selects between listing host interfaces (for
+ *                              use with bridging) or host only interfaces.
  */
 static HRESULT listNetworkInterfaces(const ComPtr<IVirtualBox> pVirtualBox,
@@ -283 +304 @@
 
         /* File extensions */
-        com::SafeArray <BSTR> fileExtensions;
-        com::SafeArray <DeviceType_T> deviceTypes;
+        com::SafeArray<BSTR> fileExtensions;
+        com::SafeArray<DeviceType_T> deviceTypes;
         CHECK_ERROR(mediumFormats[i],
                     DescribeFileExtensions(ComSafeArrayAsOutParam(fileExtensions), ComSafeArrayAsOutParam(deviceTypes)));
@@ -296 +317 @@
 
         /* Configuration keys */
-        com::SafeArray <BSTR> propertyNames;
-        com::SafeArray <BSTR> propertyDescriptions;
-        com::SafeArray <DataType_T> propertyTypes;
-        com::SafeArray <ULONG> propertyFlags;
-        com::SafeArray <BSTR> propertyDefaults;
+        com::SafeArray<BSTR> propertyNames;
+        com::SafeArray<BSTR> propertyDescriptions;
+        com::SafeArray<DataType_T> propertyTypes;
+        com::SafeArray<ULONG> propertyFlags;
+        com::SafeArray<BSTR> propertyDefaults;
         CHECK_ERROR(mediumFormats[i],
                     DescribeProperties(ComSafeArrayAsOutParam(propertyNames),
@@ -722 +743 @@
     kListHostDvds,
     kListHostFloppies,
+    kListInternalNetworks,
     kListBridgedInterfaces,
 #if defined(VBOX_WITH_NETFLT)
@@ -894 +916 @@
         }
 
+        case kListInternalNetworks:
+            rc = listInternalNetworks(pVirtualBox);
+            break;
+
         case kListBridgedInterfaces:
 #if defined(VBOX_WITH_NETFLT)
@@ -1038 +1064 @@
                 net->COMGETTER(Enabled)(&fEnabled);
                 RTPrintf("Enabled:        %s\n", fEnabled ? "Yes" : "No");
-                
+
 #define PRINT_STRING_ARRAY(title) \
                 if (strs.size() > 0)    \
@@ -1046 +1072 @@
                     for (;j < strs.size(); ++j) \
                         RTPrintf("        %s\n", Utf8Str(strs[j]).c_str()); \
-                } 
+                }
 
                 com::SafeArray<BSTR> strs;
@@ -1096 +1122 @@
         { "hostdvds",           kListHostDvds,           RTGETOPT_REQ_NOTHING },
         { "hostfloppies",       kListHostFloppies,       RTGETOPT_REQ_NOTHING },
+        { "intnets",            kListInternalNetworks,   RTGETOPT_REQ_NOTHING },
         { "hostifs",            kListBridgedInterfaces,  RTGETOPT_REQ_NOTHING }, /* backward compatibility */
         { "bridgedifs",         kListBridgedInterfaces,  RTGETOPT_REQ_NOTHING },
@@ -1101 +1128 @@
         { "hostonlyifs",        kListHostOnlyInterfaces, RTGETOPT_REQ_NOTHING },
 #endif
+        { "natnetworks",        kListNatNetworks,        RTGETOPT_REQ_NOTHING },
+        { "natnets",            kListNatNetworks,        RTGETOPT_REQ_NOTHING },
         { "hostinfo",           kListHostInfo,           RTGETOPT_REQ_NOTHING },
         { "hostcpuids",         kListHostCpuIDs,         RTGETOPT_REQ_NOTHING },
@@ -1113 +1142 @@
         { "extpacks",           kListExtPacks,           RTGETOPT_REQ_NOTHING },
         { "groups",             kListGroups,             RTGETOPT_REQ_NOTHING },
-        { "natnetworks",        kListNatNetworks,        RTGETOPT_REQ_NOTHING },
     };
 
@@ -1141 +1169 @@
             case kListHostDvds:
             case kListHostFloppies:
+            case kListInternalNetworks:
             case kListBridgedInterfaces:
 #if defined(VBOX_WITH_NETFLT)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -113 +113 @@
     MODIFYVM_HOSTONLYADAPTER,
     MODIFYVM_INTNET,
+    MODIFYVM_GENERICDRV,
+    MODIFYVM_NATNETWORKNAME,
     MODIFYVM_NATNET,
-    MODIFYVM_GENERICDRV,
     MODIFYVM_NATBINDIP,
     MODIFYVM_NATSETTINGS,
@@ -273 +274 @@
     { "--hostonlyadapter",          MODIFYVM_HOSTONLYADAPTER,           RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--intnet",                   MODIFYVM_INTNET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
+    { "--nicgenericdrv",            MODIFYVM_GENERICDRV,                RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
+    { "--nat-network",              MODIFYVM_NATNETWORKNAME,            RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
+    { "--natnetwork",               MODIFYVM_NATNETWORKNAME,            RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natnet",                   MODIFYVM_NATNET,                    RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
-    { "--nicgenericdrv",            MODIFYVM_GENERICDRV,                RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natbindip",                MODIFYVM_NATBINDIP,                 RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
     { "--natsettings",              MODIFYVM_NATSETTINGS,               RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
@@ -1409 +1412 @@
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Generic));
                 }
+                else if (!RTStrICmp(ValueUnion.psz, "natnetwork"))
+                {
+
+                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_NATNetwork));
+                }
                 else
                 {
@@ -1493 +1502 @@
 
                 CHECK_ERROR(nic, COMSETTER(GenericDriver)(Bstr(ValueUnion.psz).raw()));
+                break;
+            }
+
+            case MODIFYVM_NATNETWORKNAME:
+            {
+                ComPtr<INetworkAdapter> nic;
+
+                CHECK_ERROR_BREAK(machine, GetNetworkAdapter(GetOptState.uIndex - 1, nic.asOutParam()));
+                ASSERT(nic);
+
+                CHECK_ERROR(nic, COMSETTER(NATNetwork)(Bstr(ValueUnion.psz).raw()));
                 break;
             }

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2012 Oracle Corporation
+ * Copyright (C) 2012-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -290 +290 @@
         case KNetworkAttachmentType_HostOnly: return QApplication::translate("VBoxGlobal", "Host-only Adapter", "NetworkAttachmentType");
         case KNetworkAttachmentType_Generic:  return QApplication::translate("VBoxGlobal", "Generic Driver", "NetworkAttachmentType");
+        case KNetworkAttachmentType_NATNetwork:  return QApplication::translate("VBoxGlobal", "NAT Network", "NetworkAttachmentType");
         default: AssertMsgFailed(("No text for %d", type)); break;
     }

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

@@ -1397 +1397 @@
                     attType = attType.arg (tr ("Generic, '%1'",
                         "details report (network)").arg (adapter.GetGenericDriver()));
+                else if (type == KNetworkAttachmentType_NATNetwork)
+                    attType = attType.arg (tr ("NAT network, '%1'",
+                        "details report (network)").arg (adapter.GetNATNetwork()));
                 else
                     attType = attType.arg (gpConverter->toString (type));

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -677 +677 @@
                             break;
                         }
+                        case KNetworkAttachmentType_NATNetwork:
+                        {
+                            strAttachmentType = strAttachmentType.arg(QApplication::translate("UIGDetails", "NAT Network, '%1'", "details (network)")
+                                                                      .arg(adapter.GetNATNetwork()));
+                            break;
+                        }
                         default:
                         {

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -30 +30 @@
 #include "CNATEngine.h"
 #include "CHostNetworkInterface.h"
+#include "CNATNetwork.h"
 
 /* Other VBox includes: */
@@ -142 +143 @@
             adapterData.m_strGenericProperties = m_pGenericPropertiesTextEdit->toPlainText();
             break;
+        case KNetworkAttachmentType_NATNetwork:
+            adapterData.m_strNATNetworkName = alternativeName();
+            break;
         default:
             break;
@@ -211 +215 @@
             {
                 message.second << tr("No generic driver is currently selected.");
+                fPass = false;
+            }
+            break;
+        }
+        case KNetworkAttachmentType_NATNetwork:
+        {
+            if (alternativeName().isNull())
+            {
+                message.second << tr("No NAT network name is currently specified.");
                 fPass = false;
             }
@@ -289 +302 @@
         case KNetworkAttachmentType_Generic:
             strResult = m_strGenericDriverName;
+            break;
+        case KNetworkAttachmentType_NATNetwork:
+            strResult = m_strNATNetworkName;
             break;
         default:
@@ -420 +436 @@
             break;
         }
+        case KNetworkAttachmentType_NATNetwork:
+        {
+            m_pAdapterNameCombo->setWhatsThis(tr("Enter the name of the NAT network that this network card "
+                                                 "will be connected to. You can create and remove adapters "
+                                                 "using the global network settings in the virtual machine "
+                                                 "manager window."));
+            m_pAdapterNameCombo->setEditable(true);
+            break;
+        }
         default:
         {
@@ -480 +505 @@
                     emit sigTabUpdated();
             }
+            break;
+        }
+        case KNetworkAttachmentType_NATNetwork:
+        {
+            QString newName(m_pAdapterNameCombo->itemData(m_pAdapterNameCombo->currentIndex()).toString() == QString(pEmptyItemCode) ||
+                            m_pAdapterNameCombo->currentText().isEmpty() ? QString() : m_pAdapterNameCombo->currentText());
+            if (m_strNATNetworkName != newName)
+                m_strNATNetworkName = newName;
             break;
         }
@@ -560 +593 @@
         m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_Generic));
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_Generic);
+        m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
+        ++iAttachmentTypeIndex;
+        m_pAttachmentTypeComboBox->insertItem(iAttachmentTypeIndex, gpConverter->toString(KNetworkAttachmentType_NATNetwork));
+        m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, KNetworkAttachmentType_NATNetwork);
         m_pAttachmentTypeComboBox->setItemData(iAttachmentTypeIndex, m_pAttachmentTypeComboBox->itemText(iAttachmentTypeIndex), Qt::ToolTipRole);
         ++iAttachmentTypeIndex;
@@ -659 +696 @@
             m_pAdapterNameCombo->insertItems(0, m_pParent->genericDriverList());
             break;
+        case KNetworkAttachmentType_NATNetwork:
+            m_pAdapterNameCombo->insertItems(0, m_pParent->natNetworkList());
+            break;
         default:
             break;
@@ -670 +710 @@
             case KNetworkAttachmentType_Bridged:
             case KNetworkAttachmentType_HostOnly:
+            case KNetworkAttachmentType_NATNetwork:
             {
                 /* If adapter list is empty => add 'Not selected' item: */
@@ -706 +747 @@
         case KNetworkAttachmentType_HostOnly:
         case KNetworkAttachmentType_Generic:
+        case KNetworkAttachmentType_NATNetwork:
         {
             m_pAdapterNameCombo->setCurrentIndex(position(m_pAdapterNameCombo, alternativeName()));
@@ -770 +812 @@
     refreshHostInterfaceList();
     refreshGenericDriverList(true);
+    refreshNATNetworkList();
 
     /* For each network adapter: */
@@ -917 +960 @@
                                 updateGenericProperties(adapter, adapterData.m_strGenericProperties);
                                 break;
+                            case KNetworkAttachmentType_NATNetwork:
+                                adapter.SetNATNetwork(adapterData.m_strNATNetworkName);
+                                break;
                             default:
                                 break;
@@ -1091 +1137 @@
 }
 
+void UIMachineSettingsNetworkPage::refreshNATNetworkList()
+{
+    /* Reload NAT network list: */
+    m_natNetworkList.clear();
+    const CNATNetworkVector &nws = vboxGlobal().virtualBox().GetNATNetworks();
+    for (int i = 0; i < nws.size(); ++i)
+    {
+        const CNATNetwork &nw = nws[i];
+        m_natNetworkList << nw.GetNetworkName();
+    }
+}
+
 /* static */
 QStringList UIMachineSettingsNetworkPage::otherInternalNetworkList()

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -44 +44 @@
         , m_strGenericDriverName(QString())
         , m_strGenericProperties(QString())
+        , m_strNATNetworkName(QString())
         , m_strMACAddress(QString())
         , m_fCableConnected(false)
@@ -60 +61 @@
                (m_strGenericDriverName == other.m_strGenericDriverName) &&
                (m_strGenericProperties == other.m_strGenericProperties) &&
+               (m_strNATNetworkName == other.m_strNATNetworkName) &&
                (m_strMACAddress == other.m_strMACAddress) &&
                (m_fCableConnected == other.m_fCableConnected) &&
@@ -78 +80 @@
     QString m_strGenericDriverName;
     QString m_strGenericProperties;
+    QString m_strNATNetworkName;
     QString m_strMACAddress;
     bool m_fCableConnected;
@@ -165 +168 @@
     QString m_strHostInterfaceName;
     QString m_strGenericDriverName;
+    QString m_strNATNetworkName;
     UIPortForwardingDataList m_portForwardingRules;
 };
@@ -186 +190 @@
     /* Generic driver list: */
     const QStringList& genericDriverList() const { return m_genericDriverList; }
+    /* NAT network list: */
+    const QStringList& natNetworkList() const { return m_natNetworkList; }
 
 protected:
@@ -225 +231 @@
     void refreshHostInterfaceList();
     void refreshGenericDriverList(bool fFullRefresh = false);
+    void refreshNATNetworkList();
 
     /* Various static stuff: */
@@ -240 +247 @@
     QStringList m_hostInterfaceList;
     QStringList m_genericDriverList;
+    QStringList m_natNetworkList;
 
     /* Cache: */