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

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.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -1370 +1370 @@
     RT_NOREF(pNetwork); /** @todo figure why pNetwork isn't used */
 
+    PCFGMNODE pPFTree = CFGMR3GetChild(pCfg, "PortForwarding");
+    if (pPFTree == NULL)
+        return VINF_SUCCESS;
+
     /*
      * Enumerate redirections.
      */
-    for (PCFGMNODE pNode = CFGMR3GetFirstChild(pCfg); pNode; pNode = CFGMR3GetNextChild(pNode))
-    {
-#ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-        char szNodeName[32];
-        CFGMR3GetName(pNode, szNodeName, 32);
-        if (   !RTStrICmp(szNodeName, "HostResolverMappings")
-            || !RTStrICmp(szNodeName, "AttachedDriver"))
-            continue;
-#endif
+    for (PCFGMNODE pNode = CFGMR3GetFirstChild(pPFTree); pNode; pNode = CFGMR3GetNextChild(pNode))
+    {
         /*
          * Validate the port forwarding config.
          */
-        if (!CFGMR3AreValuesValid(pNode, "Protocol\0UDP\0HostPort\0GuestPort\0GuestIP\0BindIP\0"))
+        if (!CFGMR3AreValuesValid(pNode, "Name\0Protocol\0UDP\0HostPort\0GuestPort\0GuestIP\0BindIP\0"))
             return PDMDRV_SET_ERROR(pThis->pDrvIns, VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES,
                                     N_("Unknown configuration in port forwarding"));