Changeset 22173 in vbox for trunk/src/VBox/Main/DHCPServerImpl.cpp

Timestamp:

Aug 11, 2009 3:38:59 PM (15 years ago)

Author:

vboxsync

Message:

Main: the big XML settings rework. Move XML reading/writing out of interface implementation code into separate layer so it can handle individual settings versions in the future.

File:

• trunk/src/VBox/Main/DHCPServerImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/DHCPServerImpl.cpp

@@ -86 +86 @@
 }
 
-HRESULT DHCPServer::init(VirtualBox *aVirtualBox, const settings::Key &aNode)
-{
-    using namespace settings;
-
+HRESULT DHCPServer::init(VirtualBox *aVirtualBox,
+                         const settings::DHCPServer &data)
+{
     /* Enclose the state transition NotReady->InInit->Ready */
     AutoInitSpan autoInitSpan(this);
@@ -99 +98 @@
     aVirtualBox->addDependentChild (this);
 
-    unconst(mName) = aNode.stringValue ("networkName");
-    m.IPAddress = aNode.stringValue ("IPAddress");
-    m.networkMask = aNode.stringValue ("networkMask");
-    m.enabled = aNode.value <bool> ("enabled");
-    m.lowerIP = aNode.stringValue ("lowerIP");
-    m.upperIP = aNode.stringValue ("upperIP");
+    unconst(mName) = data.strNetworkName;
+    m.IPAddress = data.strIPAddress;
+    m.networkMask = data.strIPNetworkMask;
+    m.enabled = data.fEnabled;
+    m.lowerIP = data.strIPLower;
+    m.upperIP = data.strIPUpper;
 
     autoInitSpan.setSucceeded();
@@ -111 +110 @@
 }
 
-HRESULT DHCPServer::saveSettings (settings::Key &aParentNode)
-{
-    using namespace settings;
-
-    AssertReturn(!aParentNode.isNull(), E_FAIL);
-
+HRESULT DHCPServer::saveSettings(settings::DHCPServer &data)
+{
     AutoCaller autoCaller(this);
     CheckComRCReturnRC(autoCaller.rc());
@@ -122 +117 @@
     AutoReadLock alock(this);
 
-    Key aNode = aParentNode.appendKey ("DHCPServer");
-    /* required */
-    aNode.setValue <Bstr> ("networkName", mName);
-    aNode.setValue <Bstr> ("IPAddress", m.IPAddress);
-    aNode.setValue <Bstr> ("networkMask", m.networkMask);
-    aNode.setValue <Bstr> ("lowerIP", m.lowerIP);
-    aNode.setValue <Bstr> ("upperIP", m.upperIP);
-    /* To force it back to a numeric value; will otherwise break for 2.2.x. */
-    aNode.setValue <ULONG> ("enabled", m.enabled);
+    data.strNetworkName = mName;
+    data.strIPAddress = m.IPAddress;
+    data.strIPNetworkMask = m.networkMask;
+    data.fEnabled = m.enabled;
+    data.strIPLower = m.lowerIP;
+    data.strIPUpper = m.upperIP;
 
     return S_OK;
@@ -243 +235 @@
 }
 
-STDMETHODIMP DHCPServer::Start (IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType)
+STDMETHODIMP DHCPServer::Start(IN_BSTR aNetworkName, IN_BSTR aTrunkName, IN_BSTR aTrunkType)
 {
     /* Silently ignore attepmts to run disabled servers. */