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

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/VBoxManage

Files:

• VBoxManageControlVM.cpp (modified) (2 diffs)
• VBoxManageHelp.cpp (modified) (4 diffs)
• VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManageList.cpp (modified) (11 diffs)
• VBoxManageModifyVM.cpp (modified) (4 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;
             }