Changeset 64166 in vbox for trunk/src/VBox/Main

Timestamp:

Oct 6, 2016 2:11:46 PM (8 years ago)

Author:

vboxsync

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

111147

Message:

NAT: Don't use user supplied port-forwarding rule names as node names
in CFGM. Instead move all rules under new .../Config/PortForwarding/
node, use (transient) rule index as the node name and put the rule
name into the "Name" leaf value. Note that this is a private
interface between components, so nothing else should be affected by
this layout change.

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• src-server/NATEngineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -4967 +4967 @@
                 SafeArray<BSTR> pfs;
                 hrc = natEngine->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs));         H();
-                PCFGMNODE pPF = NULL;          /* /Devices/Dev/.../Config/PF#0/ */
+
+                PCFGMNODE pPFTree = NULL;
+                if (pfs.size() > 0)
+                    InsertConfigNode(pCfg, "PortForwarding", &pPFTree);
+
                 for (unsigned int i = 0; i < pfs.size(); ++i)
                 {
+                    PCFGMNODE pPF = NULL; /* /Devices/Dev/.../Config/PortForwarding/$n/ */
+
                     uint16_t port = 0;
                     BSTR r = pfs[i];
@@ -5018 +5024 @@
                         continue;
 
-                    if (strName.isEmpty())
-                        VMSetError(VMR3GetVM(mpUVM), VERR_CFGM_NO_NODE, RT_SRC_POS,
-                                   N_("NAT redirection rule without a name"));
-
-                    InsertConfigNode(pCfg, strName.c_str(), &pPF);
+                    InsertConfigNode(pPFTree, Utf8StrFmt("%u", i).c_str(), &pPF);
+
+                    if (!strName.isEmpty())
+                        InsertConfigString(pPF, "Name", strName);
+
                     InsertConfigString(pPF, "Protocol", strProto);
 

trunk/src/VBox/Main/src-server/NATEngineImpl.cpp

@@ -275 +275 @@
                                 tr("Whitespace in NAT rule name"));
 
-            if (   c == '/'  /* CFGM node path separator */
-                || c == ',') /* VBoxManage natpf<N> argument is csv */
+            if (c == ',') /* we use csv in several places e.g. GetRedirects or natpf<N> argument */
                 return setError(E_INVALIDARG,
                                 tr("'%c' - invalid character in NAT rule name"), c);