Changeset 93279 in vbox

Timestamp:

Jan 17, 2022 6:58:27 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage/NATNetwork: Move the code for "list natnetworks" into
VBoxManageNATNetwork.cpp so that it can be refactored w.r.t code for
"natnetwork list". This commit just moves it as-as with only minimal
necessary adaptations. bugref:8124.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (1 diff)
• VBoxManageList.cpp (modified) (1 diff)
• VBoxManageNATNetwork.cpp (modified) (2 diffs)

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

@@ -392 +392 @@
 /* VBoxManageNATNetwork.cpp */
 RTEXITCODE handleNATNetwork(HandlerArg *a);
-
+RTEXITCODE listNATNetworks(bool fLong, bool fSorted,
+                           const ComPtr<IVirtualBox> &pVirtualBox);
 
 /* VBoxManageBandwidthControl.cpp */

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

@@ -2182 +2182 @@
 
         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(List::tr("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(List::tr("Network:        %ls\n"), network.raw());
-                BOOL fEnabled;
-                net->COMGETTER(IPv6Enabled)(&fEnabled);
-                RTPrintf(List::tr("IPv6 Enabled:   %s\n"), fEnabled ? List::tr("Yes") : List::tr("No"));
-                Bstr ipv6prefix;
-                net->COMGETTER(IPv6Prefix)(ipv6prefix.asOutParam());
-                RTPrintf(List::tr("IPv6 Prefix:    %ls\n"), ipv6prefix.raw());
-                net->COMGETTER(NeedDhcpServer)(&fEnabled);
-                RTPrintf(List::tr("DHCP Enabled:   %s\n"), fEnabled ? List::tr("Yes") : List::tr("No"));
-                net->COMGETTER(Enabled)(&fEnabled);
-                RTPrintf(List::tr("Enabled:        %s\n"), fEnabled ? List::tr("Yes") : List::tr("No"));
-
-#define PRINT_STRING_ARRAY(title) \
-                if (strs.size() > 0)    \
-                { \
-                    RTPrintf(title); \
-                    size_t j = 0; \
-                    for (;j < strs.size(); ++j) \
-                        RTPrintf("        %s\n", Utf8Str(strs[j]).c_str()); \
-                }
-
-                com::SafeArray<BSTR> strs;
-
-                CHECK_ERROR(nets[i], COMGETTER(PortForwardRules4)(ComSafeArrayAsOutParam(strs)));
-                PRINT_STRING_ARRAY(List::tr("Port-forwarding (ipv4)\n"));
-                strs.setNull();
-
-                CHECK_ERROR(nets[i], COMGETTER(PortForwardRules6)(ComSafeArrayAsOutParam(strs)));
-                PRINT_STRING_ARRAY(List::tr("Port-forwarding (ipv6)\n"));
-                strs.setNull();
-
-                CHECK_ERROR(nets[i], COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs)));
-                PRINT_STRING_ARRAY(List::tr("loopback mappings (ipv4)\n"));
-                strs.setNull();
-
-#undef PRINT_STRING_ARRAY
-                RTPrintf("\n");
-            }
-            break;
-        }
+            rc = listNATNetworks(fOptLong, fOptSorted, pVirtualBox);
+            break;
 
         case kListVideoInputDevices:

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

@@ -566 +566 @@
 
 
+/*
+ * VBoxManage natnetwork ...
+ */
 RTEXITCODE handleNATNetwork(HandlerArg *a)
 {
@@ -589 +592 @@
 }
 
+
+/*
+ * VBoxManage list natnetworks ...
+ */
+RTEXITCODE listNATNetworks(bool fLong, bool fSorted,
+                           const ComPtr<IVirtualBox> &pVirtualBox)
+{
+    int rc;
+
+    RT_NOREF(fLong);
+    RT_NOREF(fSorted);
+
+    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(Nat::tr("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(Nat::tr("Network:        %ls\n"), network.raw());
+        BOOL fEnabled;
+        net->COMGETTER(IPv6Enabled)(&fEnabled);
+        RTPrintf(Nat::tr("IPv6 Enabled:   %s\n"), fEnabled ? Nat::tr("Yes") : Nat::tr("No"));
+        Bstr ipv6prefix;
+        net->COMGETTER(IPv6Prefix)(ipv6prefix.asOutParam());
+        RTPrintf(Nat::tr("IPv6 Prefix:    %ls\n"), ipv6prefix.raw());
+        net->COMGETTER(NeedDhcpServer)(&fEnabled);
+        RTPrintf(Nat::tr("DHCP Enabled:   %s\n"), fEnabled ? Nat::tr("Yes") : Nat::tr("No"));
+        net->COMGETTER(Enabled)(&fEnabled);
+        RTPrintf(Nat::tr("Enabled:        %s\n"), fEnabled ? Nat::tr("Yes") : Nat::tr("No"));
+
+#define PRINT_STRING_ARRAY(title)                                       \
+            if (strs.size() > 0)                                        \
+            {                                                           \
+                RTPrintf(title);                                        \
+                size_t j = 0;                                           \
+                for (;j < strs.size(); ++j)                             \
+                    RTPrintf("        %s\n", Utf8Str(strs[j]).c_str()); \
+            }
+
+        com::SafeArray<BSTR> strs;
+
+        CHECK_ERROR(nets[i], COMGETTER(PortForwardRules4)(ComSafeArrayAsOutParam(strs)));
+        PRINT_STRING_ARRAY(Nat::tr("Port-forwarding (ipv4)\n"));
+        strs.setNull();
+
+        CHECK_ERROR(nets[i], COMGETTER(PortForwardRules6)(ComSafeArrayAsOutParam(strs)));
+        PRINT_STRING_ARRAY(Nat::tr("Port-forwarding (ipv6)\n"));
+        strs.setNull();
+
+        CHECK_ERROR(nets[i], COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs)));
+        PRINT_STRING_ARRAY(Nat::tr("loopback mappings (ipv4)\n"));
+        strs.setNull();
+
+#undef PRINT_STRING_ARRAY
+
+        RTPrintf("\n");
+    }
+
+    return RTEXITCODE_SUCCESS;
+}
+
 #endif /* !VBOX_ONLY_DOCS */