Changeset 17881 in vbox

Timestamp:

Mar 14, 2009 11:33:49 PM (16 years ago)

Author:

vboxsync

Message:

dhcp settings

Location:

trunk/src/VBox/Main

Files:

• DhcpServerImpl.cpp (modified) (3 diffs)
• VirtualBoxImpl.cpp (modified) (3 diffs)
• include/DhcpServerImpl.h (modified) (1 diff)
• xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Main/DhcpServerImpl.cpp

@@ -25 +25 @@
 #include "Logging.h"
 
+#include <VBox/settings.h>
+
 // constructor / destructor
 /////////////////////////////////////////////////////////////////////////////
@@ -40 +42 @@
 }
 
-HRESULT DhcpServer::init(IN_BSTR aName)
-{
-    return E_NOTIMPL;
-}
-
-HRESULT DhcpServer::init(const settings::Key &aNode)
-{
-    return E_NOTIMPL;
+HRESULT DhcpServer::init(VirtualBox *aVirtualBox, IN_BSTR aName)
+{
+    AssertReturn (aName != NULL, E_INVALIDARG);
+
+    AutoInitSpan autoInitSpan (this);
+    AssertReturn (autoInitSpan.isOk(), E_FAIL);
+
+    unconst(mName) = aName;
+
+    /* register with VirtualBox early, since uninit() will
+     * unconditionally unregister on failure */
+    aVirtualBox->addDependentChild (this);
+
+    /* Confirm a successful initialization */
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
+}
+
+HRESULT DhcpServer::init(VirtualBox *aVirtualBox, const settings::Key &aNode)
+{
+    using namespace settings;
+
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan (this);
+    AssertReturn (autoInitSpan.isOk(), E_FAIL);
+
+    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.FromIPAddress = aNode.stringValue ("lowerIp");
+    m.ToIPAddress = aNode.stringValue ("upperIp");
+
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
 }
 
 HRESULT DhcpServer::saveSettings (settings::Key &aParentNode)
 {
-    return E_NOTIMPL;
+    using namespace settings;
+
+    AssertReturn (!aParentNode.isNull(), E_FAIL);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    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);
+    if(!m.FromIPAddress.isNull())
+        aNode.setValue <Bstr> ("FromIPAddress", m.FromIPAddress);
+    if(!m.ToIPAddress.isNull())
+        aNode.setValue <Bstr> ("ToIPAddress", m.ToIPAddress);
+
+    return S_OK;
 }
 
@@ -146 +198 @@
 STDMETHODIMP DhcpServer::SetConfiguration (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress)
 {
-    return E_NOTIMPL;
-}
+    AssertReturn (aIPAddress != NULL, E_INVALIDARG);
+    AssertReturn (aNetworkMask != NULL, E_INVALIDARG);
+    AssertReturn (aFromIPAddress != NULL, E_INVALIDARG);
+    AssertReturn (aToIPAddress != NULL, E_INVALIDARG);
+
+    m.IPAddress = aIPAddress;
+    m.networkMask = aNetworkMask;
+    m.FromIPAddress = aFromIPAddress;
+    m.ToIPAddress = aToIPAddress;
+
+    return S_OK;
+}

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3156 +3156 @@
                 ComObjPtr<DhcpServer> dhcpServer;
                 dhcpServer.createObject();
-                rc = dhcpServer->init (*it);
+                rc = dhcpServer->init (this, *it);
                 CheckComRCBreakRC (rc);
 
@@ -4663 +4663 @@
     ComObjPtr<DhcpServer> dhcpServer;
     dhcpServer.createObject();
-    HRESULT rc = dhcpServer->init (aName);
+    HRESULT rc = dhcpServer->init (this, aName);
     CheckComRCReturnRC (rc);
 
@@ -4765 +4765 @@
     if(SUCCEEDED(rc))
     {
-        return E_FAIL;
+        return E_INVALIDARG;
     }
 

trunk/src/VBox/Main/include/DhcpServerImpl.h

@@ -60 +60 @@
     void FinalRelease();
 
-    HRESULT init(IN_BSTR aName);
-    HRESULT init(const settings::Key &aNode);
+    HRESULT init(VirtualBox *aVirtualBox, IN_BSTR aName);
+    HRESULT init(VirtualBox *aVirtualBox, const settings::Key &aNode);
     HRESULT saveSettings (settings::Key &aParentNode);
 

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -257 +257 @@
 <xsd:complexType name="TDhcpServer">
   <xsd:attribute name="networkName" type="xsd:string"  use="required"/>
-  <xsd:attribute name="lowerIp"     type="xsd:string"  use="optional"/>
-  <xsd:attribute name="upperIp"     type="xsd:string"  use="optional"/>
+  <xsd:attribute name="lowerIp"     type="xsd:string"  use="required"/>
+  <xsd:attribute name="upperIp"     type="xsd:string"  use="required"/>
   <xsd:attribute name="IPAddress"   type="xsd:string"  use="required"/>
   <xsd:attribute name="networkMask" type="xsd:string"  use="required"/>