Changeset 48093 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2013 4:39:15 PM (11 years ago)

Author:

vboxsync

Message:

NAT/xml: loopback mappings introduces NATNetwork entities:

<Mappings>

<Loopback4 address="127.0.1.1" offset="6"/>
<Loopback4 address="127.0.1.2" offset="7"/>

</Mappings>

to describe mapppings any hostid in 127/8 network to our NAT network, e.g. in this case 127.0.1.1 corresponds to network id + 6 (network id here from CIDR defined on creation), for IPv6 (as soon localhost6 could be only one) attribute "loopback6" is reserved in NATNetwork tag.

operators: NATHostLoopbackOffset::operator == (const Utf8Str&) and NATHostLoopbackOffset::operator==(uint32_t) are introduced got using std::find on adding and modification operations in NATNetworkImpl.

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -837 +837 @@
 }
 
+void ConfigFileBase::readNATLoopbacks(const xml::ElementNode &elmParent, NATLoopbackOffsetList &llLoopbacks)
+{
+    xml::ElementNodesList plstLoopbacks;
+    elmParent.getChildElements(plstLoopbacks, "Loopback4");
+    for (xml::ElementNodesList::iterator lo = plstLoopbacks.begin();
+         lo != plstLoopbacks.end(); ++lo)
+    {
+        NATHostLoopbackOffset loopback;
+        (*lo)->getAttributeValue("address", loopback.strLoopbackHostAddress);
+        (*lo)->getAttributeValue("offset", (uint32_t&)loopback.u32Offset);
+        llLoopbacks.push_back(loopback);
+    }
+}
+
+
 /**
  * Adds a "version" attribute to the given XML element with the
@@ -1192 +1207 @@
 }
 
+
+void ConfigFileBase::buildNATLoopbacks(xml::ElementNode &elmParent, const NATLoopbackOffsetList &natLoopbackOffsetList)
+{
+    for (NATLoopbackOffsetList::const_iterator lo = natLoopbackOffsetList.begin();
+         lo != natLoopbackOffsetList.end(); ++lo)
+    {
+        xml::ElementNode *pelmLo;
+        pelmLo = elmParent.createChild("Loopback4");
+        pelmLo->setAttribute("address", (*lo).strLoopbackHostAddress);
+        pelmLo->setAttribute("offset", (*lo).u32Offset);
+    }
+}
+
 /**
  * Cleans up memory allocated by the internal XML parser. To be called by
@@ -1379 +1407 @@
                )
             {
+                pelmNet->getAttributeValue("loopback6", net.u32HostLoopback6Offset);
+                const xml::ElementNode *pelmMappings;
+                if ((pelmMappings = pelmNet->findChildElement("Mappings")))
+                    readNATLoopbacks(*pelmMappings, net.llHostLoopbackOffsetList);
+
                 const xml::ElementNode *pelmPortForwardRules4;
                 if ((pelmPortForwardRules4 = pelmNet->findChildElement("PortForwarding4")))
@@ -1633 +1666 @@
                 xml::ElementNode *pelmPf6 = pelmThis->createChild("PortForwarding6");
                 buildNATForwardRuleList(*pelmPf6, n.llPortForwardRules6);
+            }
+
+            if (n.llHostLoopbackOffsetList.size())
+            {
+                xml::ElementNode *pelmMappings = pelmThis->createChild("Mappings");
+                buildNATLoopbacks(*pelmMappings, n.llHostLoopbackOffsetList);
+
             }
         }