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

Timestamp:

Mar 25, 2013 5:50:09 AM (12 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: listing/manipulating nat networks if VBOX_WITH_NAT_SERVICE is defined.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxManage.cpp (modified) (1 diff)
• VBoxManage.h (modified) (2 diffs)
• VBoxManageList.cpp (modified) (4 diffs)
• VBoxManageNATNetwork.cpp (added)

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

@@ -55 +55 @@
         VBoxManageSnapshot.cpp \
         VBoxManageStorageController.cpp \
-        VBoxManageUSB.cpp
+        VBoxManageUSB.cpp \
+        $(if $(VBOX_WITH_NAT_SERVICE),VBoxManageNATNetwork.cpp,)
 VBoxManage_LIBS      += $(LIB_DDU)
 
@@ -78 +79 @@
         $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \
         $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \
-        $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX)
+        $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX) \
+        $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE)
 
 ifneq ($(KBUILD_TARGET),win)

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

@@ -516 +516 @@
 #endif
             { "dhcpserver",       USAGE_DHCPSERVER,        handleDHCPServer},
+#ifdef VBOX_WITH_NAT_SERVICE
+            { "natnetwork",       USAGE_NATNETWORK,        handleNATNetwork},
+#endif
             { "extpack",          USAGE_EXTPACK,           handleExtPack},
             { "bandwidthctl",     USAGE_BANDWIDTHCONTROL,  handleBandwidthControl},

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -102 +102 @@
 #define USAGE_GUESTSTATS            RT_BIT_64(57)
 #define USAGE_REPAIRHD              RT_BIT_64(58)
+#define USAGE_NATNETWORK            RT_BIT_64(59)
 #define USAGE_ALL                   (~(uint64_t)0)
 /** @} */
@@ -265 +266 @@
 int handleHostonlyIf(HandlerArg *a);
 
-/* VBoxManageHostonly.cpp */
+/* VBoxManageDHCPServer.cpp */
 int handleDHCPServer(HandlerArg *a);
+
+/* VBoxManageNATNetwork.cpp */
+int handleNATNetwork(HandlerArg *a);
+
 
 /* VBoxManageBandwidthControl.cpp */

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

@@ -718 +718 @@
     kListDhcpServers,
     kListExtPacks,
-    kListGroups
+    kListGroups,
+    kListNatNetworks
 };
 
@@ -992 +993 @@
             break;
 
+        case kListNatNetworks:
+        {
+            com::SafeIfaceArray<INATNetwork> nets;
+            CHECK_ERROR(pVirtualBox, COMGETTER(NATNetworks)(ComSafeArrayAsOutParam(nets)));
+            for (size_t i = 0; i < nets.size(); ++i)
+            {
+                ComPtr<INATNetwork> net = nets[i];
+                Bstr netName;
+                net->COMGETTER(NetworkName)(netName.asOutParam());
+                RTPrintf("NetworkName:    %ls\n", netName.raw());
+                Bstr gateway;
+                net->COMGETTER(Gateway)(gateway.asOutParam());
+                RTPrintf("IP:             %ls\n", gateway.raw());
+                Bstr network;
+                net->COMGETTER(Network)(network.asOutParam());
+                RTPrintf("Network:        %ls\n", network.raw());
+                BOOL fEnabled;
+                net->COMGETTER(IPv6Enabled)(&fEnabled);
+                RTPrintf("IPv6 Enabled:    %s\n", fEnabled ? "Yes" : "No");
+                Bstr ipv6prefix;
+                net->COMGETTER(Network)(network.asOutParam());
+                RTPrintf("IPv6 Prefix:    %ls\n", ipv6prefix.raw());
+                net->COMGETTER(NeedDhcpServer)(&fEnabled);
+                RTPrintf("DHCP Server Enabled: %s\n", fEnabled ? "Yes" : "No");
+                net->COMGETTER(Enabled)(&fEnabled);
+                RTPrintf("Enabled:        %s\n", fEnabled ? "Yes" : "No");
+                RTPrintf("\n");
+            }
+            break;
+        }
+
         /* No default here, want gcc warnings. */
 
@@ -1037 +1069 @@
         { "extpacks",           kListExtPacks,           RTGETOPT_REQ_NOTHING },
         { "groups",             kListGroups,             RTGETOPT_REQ_NOTHING },
+        { "natnetworks",        kListNatNetworks,        RTGETOPT_REQ_NOTHING },
     };
 
@@ -1080 +1113 @@
             case kListExtPacks:
             case kListGroups:
+            case kListNatNetworks:
                 enmOptCommand = (enum enmListType)ch;
                 if (fOptMultiple)