Changeset 17888 in vbox

Timestamp:

Mar 15, 2009 4:44:08 PM (16 years ago)

Author:

vboxsync

Message:

dhcp settings fixes

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• Main/DhcpServerImpl.cpp (modified) (8 diffs)
• Main/VirtualBoxImpl.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/DhcpServerImpl.h (modified) (3 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -780 +780 @@
                 RTPrintf("NetworkMask:    %lS\n", netmask.raw());
                 Bstr lowerIp;
-                svr->COMGETTER(FromIPAddress)(lowerIp.asOutParam());
+                svr->COMGETTER(LowerIP)(lowerIp.asOutParam());
                 RTPrintf("lowerIPAddress: %lS\n", lowerIp.raw());
                 Bstr upperIp;
-                svr->COMGETTER(ToIPAddress)(upperIp.asOutParam());
+                svr->COMGETTER(UpperIP)(upperIp.asOutParam());
                 RTPrintf("upperIPAddress: %lS\n", upperIp.raw());
                 RTPrintf("\n");

trunk/src/VBox/Main/DhcpServerImpl.cpp

@@ -42 +42 @@
 }
 
+void DhcpServer::uninit()
+{
+    mVirtualBox->removeDependentChild (this);
+}
+
 HRESULT DhcpServer::init(VirtualBox *aVirtualBox, IN_BSTR aName)
 {
@@ -56 +61 @@
     m.networkMask = "0.0.0.0";
     m.enabled = FALSE;
-    m.FromIPAddress = "0.0.0.0";
-    m.ToIPAddress = "0.0.0.0";
+    m.lowerIP = "0.0.0.0";
+    m.upperIP = "0.0.0.0";
 
     /* register with VirtualBox early, since uninit() will
@@ -86 +91 @@
     m.networkMask = aNode.stringValue ("networkMask");
     m.enabled = aNode.value <BOOL> ("enabled");
-    m.FromIPAddress = aNode.stringValue ("lowerIp");
-    m.ToIPAddress = aNode.stringValue ("upperIp");
+    m.lowerIP = aNode.stringValue ("lowerIP");
+    m.upperIP = aNode.stringValue ("upperIP");
 
     autoInitSpan.setSucceeded();
@@ -110 +115 @@
     aNode.setValue <Bstr> ("IPAddress", m.IPAddress);
     aNode.setValue <Bstr> ("networkMask", m.networkMask);
-    aNode.setValue <Bstr> ("FromIPAddress", m.FromIPAddress);
-    aNode.setValue <Bstr> ("ToIPAddress", m.ToIPAddress);
+    aNode.setValue <Bstr> ("lowerIP", m.lowerIP);
+    aNode.setValue <Bstr> ("upperIP", m.upperIP);
+    aNode.setValue <BOOL> ("enabled", m.enabled);
 
     return S_OK;
@@ -183 +189 @@
 }
 
-STDMETHODIMP DhcpServer::COMGETTER(FromIPAddress) (BSTR *aIPAddress)
+STDMETHODIMP DhcpServer::COMGETTER(LowerIP) (BSTR *aIPAddress)
 {
     CheckComArgOutPointerValid(aIPAddress);
@@ -190 +196 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    m.FromIPAddress.cloneTo(aIPAddress);
-
-    return S_OK;
-
-}
-
-STDMETHODIMP DhcpServer::COMGETTER(ToIPAddress) (BSTR *aIPAddress)
+    m.lowerIP.cloneTo(aIPAddress);
+
+    return S_OK;
+
+}
+
+STDMETHODIMP DhcpServer::COMGETTER(UpperIP) (BSTR *aIPAddress)
 {
     CheckComArgOutPointerValid(aIPAddress);
@@ -203 +209 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    m.ToIPAddress.cloneTo(aIPAddress);
-
-    return S_OK;
-
-}
-
-STDMETHODIMP DhcpServer::SetConfiguration (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress)
+    m.upperIP.cloneTo(aIPAddress);
+
+    return S_OK;
+
+}
+
+STDMETHODIMP DhcpServer::SetConfiguration (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aLowerIP, IN_BSTR aUpperIP)
 {
     AssertReturn (aIPAddress != NULL, E_INVALIDARG);
     AssertReturn (aNetworkMask != NULL, E_INVALIDARG);
-    AssertReturn (aFromIPAddress != NULL, E_INVALIDARG);
-    AssertReturn (aToIPAddress != NULL, E_INVALIDARG);
+    AssertReturn (aLowerIP != NULL, E_INVALIDARG);
+    AssertReturn (aUpperIP != NULL, E_INVALIDARG);
 
     AutoCaller autoCaller (this);
@@ -224 +230 @@
     m.IPAddress = aIPAddress;
     m.networkMask = aNetworkMask;
-    m.FromIPAddress = aFromIPAddress;
-    m.ToIPAddress = aToIPAddress;
+    m.lowerIP = aLowerIP;
+    m.upperIP = aUpperIP;
 
     HRESULT rc = mVirtualBox->saveSettings();
 
-    return rc;
-}
+    return S_OK;
+}

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -4778 +4778 @@
         return E_INVALIDARG;
     }
+    rc = S_OK;
 
     mData.mDhcpServers.push_back (aDhcpServer);

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1220 +1220 @@
   <interface
     name="IDhcpServer" extends="$unknown"
-    uuid="f6de19f7-f4b5-4d93-b3de-664729267a53"
+    uuid="ed5c8393-e245-476d-a272-b65063a5d542"
     wsmap="managed"
   >
@@ -1254 +1254 @@
     </attribute>
 
-    <attribute name="FromIPAddress" type="wstring" readonly="yes">
+    <attribute name="lowerIP" type="wstring" readonly="yes">
       <desc>
         specifies from IP adrres in server address range
@@ -1260 +1260 @@
     </attribute>
 
-    <attribute name="ToIPAddress" type="wstring" readonly="yes">
+    <attribute name="upperIP" type="wstring" readonly="yes">
       <desc>
         specifies to IP adrres in server address range

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

@@ -64 +64 @@
     HRESULT saveSettings (settings::Key &aParentNode);
 
+    void uninit();
+
     // IDhcpServer properties
     STDMETHOD(COMGETTER(NetworkName)) (BSTR *aName);
@@ -70 +72 @@
     STDMETHOD(COMGETTER(IPAddress)) (BSTR *aIPAddress);
     STDMETHOD(COMGETTER(NetworkMask)) (BSTR *aNetworkMask);
-    STDMETHOD(COMGETTER(FromIPAddress)) (BSTR *aIPAddress);
-    STDMETHOD(COMGETTER(ToIPAddress)) (BSTR *aIPAddress);
+    STDMETHOD(COMGETTER(LowerIP)) (BSTR *aIPAddress);
+    STDMETHOD(COMGETTER(UpperIP)) (BSTR *aIPAddress);
 
     STDMETHOD(SetConfiguration) (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aFromIPAddress, IN_BSTR aToIPAddress);
@@ -90 +92 @@
         Bstr IPAddress;
         Bstr networkMask;
-        Bstr FromIPAddress;
-        Bstr ToIPAddress;
+        Bstr lowerIP;
+        Bstr upperIP;
         BOOL enabled;
     } m;

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="required"/>
-  <xsd:attribute name="upperIp"     type="xsd:string"  use="required"/>
+  <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"/>