Changeset 18023 in vbox for trunk/src/VBox/Main/VirtualBoxImpl.cpp

Timestamp:

Mar 17, 2009 1:48:59 PM (16 years ago)

Author:

vboxsync

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

44622

Message:

Dhcp->DHCP

File:

• trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (23 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -62 +62 @@
 #include "GuestOSTypeImpl.h"
 #include "Version.h"
-#include "DhcpServerImpl.h"
+#include "DHCPServerImpl.h"
 
 #include "VirtualBoxXMLUtil.h"
@@ -93 +93 @@
     "    <MediaRegistry/>"RTFILE_LINEFEED
     "    <NetserviceRegistry>"RTFILE_LINEFEED
-    "       <DhcpServers>"RTFILE_LINEFEED
-    "          <DhcpServer "
+    "       <DHCPServers>"RTFILE_LINEFEED
+    "          <DHCPServer "
 #ifdef RT_OS_WINDOWS
                           "networkName=\"HostInterfaceNetworking-VirtualBox Host-Only Network Adapter\" "
@@ -103 +103 @@
                           "lowerIP=\"192.168.56.101\" upperIP=\"192.168.56.254\" "
                           "enabled=\"1\"/>"RTFILE_LINEFEED
-    "       </DhcpServers>"RTFILE_LINEFEED
+    "       </DHCPServers>"RTFILE_LINEFEED
     "    </NetserviceRegistry>"RTFILE_LINEFEED
     "    <USBDeviceFilters/>"RTFILE_LINEFEED
@@ -410 +410 @@
     mData.mDVDImages.clear();
     mData.mHardDisks.clear();
-    mData.mDhcpServers.clear();
+    mData.mDHCPServers.clear();
 
     mData.mProgressOperations.clear();
@@ -760 +760 @@
 
 STDMETHODIMP
-VirtualBox::COMGETTER(DhcpServers) (ComSafeArrayOut (IDhcpServer *, aDhcpServers))
-{
-    if (ComSafeArrayOutIsNull (aDhcpServers))
+VirtualBox::COMGETTER(DHCPServers) (ComSafeArrayOut (IDHCPServer *, aDHCPServers))
+{
+    if (ComSafeArrayOutIsNull (aDHCPServers))
         return E_POINTER;
 
@@ -770 +770 @@
     AutoReadLock alock (this);
 
-    SafeIfaceArray<IDhcpServer> svrs (mData.mDhcpServers);
-    svrs.detachTo (ComSafeArrayOutArg (aDhcpServers));
+    SafeIfaceArray<IDHCPServer> svrs (mData.mDHCPServers);
+    svrs.detachTo (ComSafeArrayOutArg (aDHCPServers));
 
     return S_OK;
@@ -3167 +3167 @@
         return S_OK;
 
-    const char *kMediaNodes[] = { "DhcpServers" };
+    const char *kMediaNodes[] = { "DHCPServers" };
 
     for (size_t n = 0; n < RT_ELEMENTS (kMediaNodes); ++ n)
@@ -3178 +3178 @@
         if (n == 0)
         {
-            Key::List dhcpServers = node.keys ("DhcpServer");
+            Key::List dhcpServers = node.keys ("DHCPServer");
             for (Key::List::const_iterator it = dhcpServers.begin();
                  it != dhcpServers.end(); ++ it)
             {
-                ComObjPtr<DhcpServer> dhcpServer;
+                ComObjPtr<DHCPServer> dhcpServer;
                 dhcpServer.createObject();
                 rc = dhcpServer->init (this, *it);
                 CheckComRCBreakRC (rc);
 
-                rc = registerDhcpServer(dhcpServer, false /* aSaveRegistry */);
+                rc = registerDHCPServer(dhcpServer, false /* aSaveRegistry */);
                 CheckComRCBreakRC (rc);
             }
@@ -3311 +3311 @@
             /* hard disks */
             {
-                Key dhcpServersNode = registryNode.createKey ("DhcpServers");
-
-                for (DhcpServerList::const_iterator it =
-                        mData.mDhcpServers.begin();
-                     it != mData.mDhcpServers.end();
+                Key dhcpServersNode = registryNode.createKey ("DHCPServers");
+
+                for (DHCPServerList::const_iterator it =
+                        mData.mDHCPServers.begin();
+                     it != mData.mDHCPServers.end();
                      ++ it)
                 {
@@ -4676 +4676 @@
 }
 
-//STDMETHODIMP VirtualBox::CreateDhcpServerForInterface (/*IHostNetworkInterface * aIinterface,*/ IDhcpServer ** aServer)
+//STDMETHODIMP VirtualBox::CreateDHCPServerForInterface (/*IHostNetworkInterface * aIinterface,*/ IDHCPServer ** aServer)
 //{
 //    return E_NOTIMPL;
 //}
 
-STDMETHODIMP VirtualBox::CreateDhcpServer (IN_BSTR aName, IDhcpServer ** aServer)
+STDMETHODIMP VirtualBox::CreateDHCPServer (IN_BSTR aName, IDHCPServer ** aServer)
 {
     CheckComArgNotNull(aName);
@@ -4689 +4689 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    ComObjPtr<DhcpServer> dhcpServer;
+    ComObjPtr<DHCPServer> dhcpServer;
     dhcpServer.createObject();
     HRESULT rc = dhcpServer->init (this, aName);
     CheckComRCReturnRC (rc);
 
-    rc = registerDhcpServer(dhcpServer, true);
+    rc = registerDHCPServer(dhcpServer, true);
     CheckComRCReturnRC (rc);
 
@@ -4702 +4702 @@
 }
 
-//STDMETHODIMP VirtualBox::FindDhcpServerForInterface (IHostNetworkInterface * aIinterface, IDhcpServer ** aServer)
+//STDMETHODIMP VirtualBox::FindDHCPServerForInterface (IHostNetworkInterface * aIinterface, IDHCPServer ** aServer)
 //{
 //    return E_NOTIMPL;
 //}
 
-STDMETHODIMP VirtualBox::FindDhcpServerByName (IN_BSTR aName, IDhcpServer ** aServer)
+STDMETHODIMP VirtualBox::FindDHCPServerByNetworkName (IN_BSTR aName, IDHCPServer ** aServer)
 {
     CheckComArgNotNull(aName);
@@ -4719 +4719 @@
     HRESULT rc;
     Bstr bstr;
-    ComPtr <DhcpServer> found;
-
-    for (DhcpServerList::const_iterator it =
-            mData.mDhcpServers.begin();
-         it != mData.mDhcpServers.end();
+    ComPtr <DHCPServer> found;
+
+    for (DHCPServerList::const_iterator it =
+            mData.mDHCPServers.begin();
+         it != mData.mDHCPServers.end();
          ++ it)
     {
@@ -4742 +4742 @@
 }
 
-STDMETHODIMP VirtualBox::RemoveDhcpServer (IDhcpServer * aServer)
+STDMETHODIMP VirtualBox::RemoveDHCPServer (IDHCPServer * aServer)
 {
     CheckComArgNotNull(aServer);
@@ -4749 +4749 @@
     CheckComRCReturnRC (autoCaller.rc());
 
-    HRESULT rc = unregisterDhcpServer(static_cast<DhcpServer *>(aServer), true);
+    HRESULT rc = unregisterDHCPServer(static_cast<DHCPServer *>(aServer), true);
 
     return rc;
@@ -4757 +4757 @@
  * Remembers the given dhcp server by storing it in the hard disk registry.
  *
- * @param aDhcpServer     Dhcp Server object to remember.
+ * @param aDHCPServer     Dhcp Server object to remember.
  * @param aSaveRegistry @c true to save hard disk registry to disk (default).
  *
@@ -4767 +4767 @@
  * registered.
  *
- * @note Locks this object for writing and @a aDhcpServer for reading.
- */
-HRESULT VirtualBox::registerDhcpServer(DhcpServer *aDhcpServer,
+ * @note Locks this object for writing and @a aDHCPServer for reading.
+ */
+HRESULT VirtualBox::registerDHCPServer(DHCPServer *aDHCPServer,
                                      bool aSaveRegistry /*= true*/)
 {
-    AssertReturn (aDhcpServer != NULL, E_INVALIDARG);
+    AssertReturn (aDHCPServer != NULL, E_INVALIDARG);
 
     AutoCaller autoCaller (this);
@@ -4779 +4779 @@
     AutoWriteLock alock (this);
 
-    AutoCaller dhcpServerCaller (aDhcpServer);
+    AutoCaller dhcpServerCaller (aDHCPServer);
     AssertComRCReturn (dhcpServerCaller.rc(), dhcpServerCaller.rc());
 
-    AutoReadLock dhcpServerLock (aDhcpServer);
+    AutoReadLock dhcpServerLock (aDHCPServer);
 
     Bstr name;
     HRESULT rc;
-    rc = aDhcpServer->COMGETTER(NetworkName) (name.asOutParam());
+    rc = aDHCPServer->COMGETTER(NetworkName) (name.asOutParam());
     CheckComRCReturnRC (rc);
 
-    ComPtr<IDhcpServer> existing;
-    rc = FindDhcpServerByName(name.mutableRaw(), existing.asOutParam());
+    ComPtr<IDHCPServer> existing;
+    rc = FindDHCPServerByNetworkName(name.mutableRaw(), existing.asOutParam());
     if(SUCCEEDED(rc))
     {
@@ -4797 +4797 @@
     rc = S_OK;
 
-    mData.mDhcpServers.push_back (aDhcpServer);
+    mData.mDHCPServers.push_back (aDHCPServer);
 
     if (aSaveRegistry)
@@ -4803 +4803 @@
         rc = saveSettings();
         if (FAILED (rc))
-            unregisterDhcpServer(aDhcpServer, false /* aSaveRegistry */);
+            unregisterDHCPServer(aDHCPServer, false /* aSaveRegistry */);
     }
 
@@ -4824 +4824 @@
  * @note Locks this object for writing and @a aHardDisk for reading.
  */
-HRESULT VirtualBox::unregisterDhcpServer(DhcpServer *aDhcpServer,
+HRESULT VirtualBox::unregisterDHCPServer(DHCPServer *aDHCPServer,
                                        bool aSaveRegistry /*= true*/)
 {
-    AssertReturn (aDhcpServer != NULL, E_INVALIDARG);
+    AssertReturn (aDHCPServer != NULL, E_INVALIDARG);
 
     AutoCaller autoCaller (this);
@@ -4834 +4834 @@
     AutoWriteLock alock (this);
 
-    AutoCaller dhcpServerCaller (aDhcpServer);
+    AutoCaller dhcpServerCaller (aDHCPServer);
     AssertComRCReturn (dhcpServerCaller.rc(), dhcpServerCaller.rc());
 
-    AutoReadLock dhcpServerLock (aDhcpServer);
-
-    mData.mDhcpServers.remove (aDhcpServer);
+    AutoReadLock dhcpServerLock (aDHCPServer);
+
+    mData.mDHCPServers.remove (aDHCPServer);
 
     HRESULT rc = S_OK;
@@ -4847 +4847 @@
         rc = saveSettings();
         if (FAILED (rc))
-            registerDhcpServer(aDhcpServer, false /* aSaveRegistry */);
+            registerDHCPServer(aDHCPServer, false /* aSaveRegistry */);
     }