Changeset 54314 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Feb 19, 2015 9:32:18 PM (10 years ago)

Author:

vboxsync

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

98389

Message:

Main/DHCPServerImpl: for DHCP options keep not just the text
representation, but also encoding of that text representation.

When XML settings are read, interpret old format, without explicit
"encoding" attribute, as legacy encoding where we are expected to know
the actual format of the option from the option code itself. When
writing legacy options, write them in old format.

This is in preparation for using "de:ad:be:ef" hex-encoded option
values for non-standard options which format we can't know a priory.

File:

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

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

@@ -1346 +1346 @@
             if (   pelmServer->getAttributeValue("networkName", srv.strNetworkName)
                 && pelmServer->getAttributeValue("IPAddress", srv.strIPAddress)
-                && pelmServer->getAttributeValue("networkMask", srv.GlobalDhcpOptions[DhcpOpt_SubnetMask])
+                && pelmServer->getAttributeValue("networkMask", srv.GlobalDhcpOptions[DhcpOpt_SubnetMask].text)
                 && pelmServer->getAttributeValue("lowerIP", srv.strIPLower)
                 && pelmServer->getAttributeValue("upperIP", srv.strIPUpper)
@@ -1385 +1385 @@
     {
         DhcpOpt_T OptName;
-        com::Utf8Str OptValue;
+        com::Utf8Str OptText;
+        int32_t OptEnc = DhcpOptValue::LEGACY;
+
         opt->getAttributeValue("name", (uint32_t&)OptName);
 
@@ -1391 +1393 @@
             continue;
 
-        opt->getAttributeValue("value", OptValue);
-
-        map.insert(std::map<DhcpOpt_T, Utf8Str>::value_type(OptName, OptValue));
+        opt->getAttributeValue("value", OptText);
+        opt->getAttributeValue("encoding", OptEnc);
+
+        map[OptName] = DhcpOptValue(OptText, (DhcpOptValue::Encoding)OptEnc);
     } /* end of forall("Option") */
 
@@ -1535 +1538 @@
 #endif
         srv.strIPAddress = "192.168.56.100";
-        srv.GlobalDhcpOptions[DhcpOpt_SubnetMask] = "255.255.255.0";
+        srv.GlobalDhcpOptions[DhcpOpt_SubnetMask] = DhcpOptValue("255.255.255.0");
         srv.strIPLower = "192.168.56.101";
         srv.strIPUpper = "192.168.56.254";
@@ -1597 +1600 @@
         pelmThis->setAttribute("IPAddress", d.strIPAddress);
         if (itOpt != d.GlobalDhcpOptions.end())
-            pelmThis->setAttribute("networkMask", itOpt->second);
+            pelmThis->setAttribute("networkMask", itOpt->second.text);
         pelmThis->setAttribute("lowerIP", d.strIPLower);
         pelmThis->setAttribute("upperIP", d.strIPUpper);
@@ -1622 +1625 @@
 
                 pelmOpt->setAttribute("name", itOpt->first);
-                pelmOpt->setAttribute("value", itOpt->second);
+                pelmOpt->setAttribute("value", itOpt->second.text);
+                if (itOpt->second.encoding != DhcpOptValue::LEGACY)
+                    pelmOpt->setAttribute("encoding", (int)itOpt->second.encoding);
             }
         } /* end of if */
@@ -1644 +1649 @@
                     xml::ElementNode *pelmOpt = pelmCfg->createChild("Option");
                     pelmOpt->setAttribute("name", itOpt1->first);
-                    pelmOpt->setAttribute("value", itOpt1->second);
+                    pelmOpt->setAttribute("value", itOpt1->second.text);
+                    if (itOpt1->second.encoding != DhcpOptValue::LEGACY)
+                        pelmOpt->setAttribute("encoding", (int)itOpt1->second.encoding);
                 }
             }