Changeset 17887 in vbox for trunk/src

Timestamp:

Mar 15, 2009 3:27:21 PM (16 years ago)

Author:

vboxsync

Message:

dhcp settings fixes

Location:

trunk/src/VBox/Main

Files:

• DhcpServerImpl.cpp (modified) (6 diffs)
• include/DhcpServerImpl.h (modified) (1 diff)

trunk/src/VBox/Main/DhcpServerImpl.cpp

@@ -49 +49 @@
     AssertReturn (autoInitSpan.isOk(), E_FAIL);
 
+    /* share VirtualBox weakly (parent remains NULL so far) */
+    unconst (mVirtualBox) = aVirtualBox;
+
     unconst(mName) = aName;
+    m.IPAddress = "0.0.0.0";
+    m.networkMask = "0.0.0.0";
+    m.enabled = FALSE;
+    m.FromIPAddress = "0.0.0.0";
+    m.ToIPAddress = "0.0.0.0";
 
     /* register with VirtualBox early, since uninit() will
@@ -68 +76 @@
     AutoInitSpan autoInitSpan (this);
     AssertReturn (autoInitSpan.isOk(), E_FAIL);
+
+    /* share VirtualBox weakly (parent remains NULL so far) */
+    unconst (mVirtualBox) = aVirtualBox;
 
     aVirtualBox->addDependentChild (this);
@@ -99 +110 @@
     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);
+    aNode.setValue <Bstr> ("FromIPAddress", m.FromIPAddress);
+    aNode.setValue <Bstr> ("ToIPAddress", m.ToIPAddress);
 
     return S_OK;
@@ -138 +147 @@
     CheckComRCReturnRC (autoCaller.rc());
 
+    /* VirtualBox::saveSettings() needs a write lock */
+    AutoMultiWriteLock2 alock (mVirtualBox, this);
+
     m.enabled = aEnabled;
 
-    return S_OK;
-
+    HRESULT rc = mVirtualBox->saveSettings();
+
+    return rc;
 }
 
@@ -203 +216 @@
     AssertReturn (aToIPAddress != NULL, E_INVALIDARG);
 
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* VirtualBox::saveSettings() needs a write lock */
+    AutoMultiWriteLock2 alock (mVirtualBox, this);
+
     m.IPAddress = aIPAddress;
     m.networkMask = aNetworkMask;
@@ -208 +227 @@
     m.ToIPAddress = aToIPAddress;
 
-    return S_OK;
-}
+    HRESULT rc = mVirtualBox->saveSettings();
+
+    return rc;
+}

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

@@ -79 +79 @@
 
 private:
+    /** weak VirtualBox parent */
+    const ComObjPtr <VirtualBox, ComWeakRef> mVirtualBox;
+
     const Bstr mName;