Changeset 48093 in vbox

Timestamp:

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

Author:

vboxsync

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

88468

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.

Location:

trunk

Files:

• include/VBox/settings.h (modified) (4 diffs)
• src/VBox/Main/xml/Settings.cpp (modified) (4 diffs)

trunk/include/VBox/settings.h

@@ -192 +192 @@
  typedef std::list<NATRule> NATRuleList;
 
+struct NATHostLoopbackOffset
+{
+    /** Note: 128/8 is only acceptable */
+    com::Utf8Str strLoopbackHostAddress;
+    uint32_t u32Offset;
+    bool operator == (const com::Utf8Str& strAddr)
+    {
+        return (strLoopbackHostAddress == strAddr);
+    }
+    
+    bool operator == (uint32_t off)
+    {
+        return (this->u32Offset == off);
+    }
+};
+typedef std::list<NATHostLoopbackOffset> NATLoopbackOffsetList;
+
 /**
  * Common base class for both MainConfigFile and MachineConfigFile
@@ -226 +243 @@
     void readMediaRegistry(const xml::ElementNode &elmMediaRegistry, MediaRegistry &mr);
     void readNATForwardRuleList(const xml::ElementNode  &elmParent, NATRuleList &llRules);
+    void readNATLoopbacks(const xml::ElementNode &elmParent, NATLoopbackOffsetList &llLoopBacks);
 
     void setVersionAttribute(xml::ElementNode &elm);
@@ -241 +259 @@
                             const MediaRegistry &mr);
     void buildNATForwardRuleList(xml::ElementNode &elmParent, const NATRuleList &natRuleList);
+    void buildNATLoopbacks(xml::ElementNode &elmParent, const NATLoopbackOffsetList &natLoopbackList);
     void clearDocument();
 
@@ -342 +361 @@
     bool         fIPv6;
     com::Utf8Str strIPv6Prefix;
+    uint32_t     u32HostLoopback6Offset;
+    NATLoopbackOffsetList llHostLoopbackOffsetList;
     bool         fAdvertiseDefaultIPv6Route;
     bool         fNeedDhcpServer;

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);
+
             }
         }