Changeset 18023 in vbox

Timestamp:

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

Author:

vboxsync

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

44622

Message:

Dhcp->DHCP

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (2 diffs)
• Devices/Network/DHCPServerRunner.cpp (moved) (moved from trunk/src/VBox/Devices/Network/DhcpServerRunner.cpp ) (5 diffs)
• Devices/Network/DHCPServerRunner.h (moved) (moved from trunk/src/VBox/Devices/Network/DhcpServerRunner.h ) (1 diff)
• Devices/Network/DrvIntNet.cpp (modified) (2 diffs)
• Frontends/VBoxManage/Makefile.kmk (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManage.h (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageDHCPServer.cpp (moved) (moved from trunk/src/VBox/Frontends/VBoxManage/VBoxManageDhcpServer.cpp ) (4 diffs)
• Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/DHCPServerImpl.cpp (moved) (moved from trunk/src/VBox/Main/DhcpServerImpl.cpp ) (14 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Main/VirtualBoxImpl.cpp (modified) (23 diffs)
• Main/idl/VirtualBox.xidl (modified) (8 diffs)
• Main/include/DHCPServerImpl.h (moved) (moved from trunk/src/VBox/Main/include/DhcpServerImpl.h ) (3 diffs)
• Main/include/VirtualBoxImpl.h (modified) (6 diffs)
• Main/xml/SettingsConverter.xsl (modified) (3 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (2 diffs)
• Main/xpcom/server.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -623 +623 @@
         Input/DrvMouseQueue.cpp \
         Network/DrvIntNet.cpp \
-        Network/DhcpServerRunner.cpp \
+        Network/DHCPServerRunner.cpp \
         PC/DrvACPI.cpp \
         Serial/DrvChar.cpp \
@@ -718 +718 @@
         PC/DrvACPI.cpp \
         Network/DrvIntNet.cpp \
-        Network/DhcpServerRunner.cpp \
+        Network/DHCPServerRunner.cpp \
         Network/DrvNetSniffer.cpp \
         Network/Pcap.cpp \

trunk/src/VBox/Devices/Network/DHCPServerRunner.cpp

@@ -19 +19 @@
  * additional information or have any questions.
  */
-#include "DhcpServerRunner.h"
+#include "DHCPServerRunner.h"
 #include <iprt/process.h>
 #include <iprt/param.h>
@@ -37 +37 @@
 
 static const ARGDEF g_aArgDefs[] = {
-        {DHCPCFG_NAME, "--name "},
-        {DHCPCFG_NETNAME, "--network "},
-        {DHCPCFG_TRUNKTYPE, "--trunk-type "},
-        {DHCPCFG_TRUNKNAME, "--trunk-name "},
-        {DHCPCFG_MACADDRESS, "--mac-address "},
-        {DHCPCFG_IPADDRESS, "--ip-address "},
+        {DHCPCFG_NAME, "--name"},
+        {DHCPCFG_NETNAME, "--network"},
+        {DHCPCFG_TRUNKTYPE, "--trunk-type"},
+        {DHCPCFG_TRUNKNAME, "--trunk-name"},
+        {DHCPCFG_MACADDRESS, "--mac-address"},
+        {DHCPCFG_IPADDRESS, "--ip-address"},
         {DHCPCFG_LEASEDB, "--lease-db"},
         {DHCPCFG_VERBOSE, "--verbose"},
         {DHCPCFG_BEGINCONFIG, "--begin-config"},
-        {DHCPCFG_GATEWAY, "--gateway "},
-        {DHCPCFG_LOWERIP, "--lower-ip "},
-        {DHCPCFG_UPPERIP, "--upper-ip "},
-        {DHCPCFG_NETMASK, "--netmask "},
+        {DHCPCFG_GATEWAY, "--gateway"},
+        {DHCPCFG_LOWERIP, "--lower-ip"},
+        {DHCPCFG_UPPERIP, "--upper-ip"},
+        {DHCPCFG_NETMASK, "--netmask"},
         {DHCPCFG_HELP, "--help"},
         {DHCPCFG_VERSION, "--version"}
@@ -66 +66 @@
 }
 
-void DhcpServerRunner::detachFromServer()
+void DHCPServerRunner::detachFromServer()
 {
     mProcess = NIL_RTPROCESS;
 }
 
-int DhcpServerRunner::start()
+int DHCPServerRunner::start()
 {
     if(isRunning())
@@ -123 +123 @@
 }
 
-int DhcpServerRunner::stop()
+int DHCPServerRunner::stop()
 {
     if(!isRunning())
@@ -133 +133 @@
 }
 
-bool DhcpServerRunner::isRunning()
+bool DHCPServerRunner::isRunning()
 {
     if(mProcess == NIL_RTPROCESS)

trunk/src/VBox/Devices/Network/DHCPServerRunner.h

@@ -294 +294 @@
 };
 
-class DhcpServerRunner
+class DHCPServerRunner
 {
 public:
-    DhcpServerRunner() : mProcess (NIL_RTPROCESS) {}
-    ~DhcpServerRunner() { stop(); /* don't leave abandoned servers */}
+    DHCPServerRunner() : mProcess (NIL_RTPROCESS) {}
+    ~DHCPServerRunner() { stop(); /* don't leave abandoned servers */}
 
     int setOption(DHCPCFG opt, const char *val)

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -45 +45 @@
 #endif
 
-#include "DhcpServerRunner.h"
+#include "DHCPServerRunner.h"
 
 /*******************************************************************************
@@ -1102 +1102 @@
 
 
-            DhcpServerRunner dhcp;
+            DHCPServerRunner dhcp;
             dhcp.setOption(DHCPCFG_NETNAME, OpenReq.szNetwork);
             dhcp.setOption(DHCPCFG_TRUNKNAME, OpenReq.szTrunk);

trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

@@ -60 +60 @@
         VBoxInternalManage.cpp \
         VBoxManageHostonly.cpp \
-        VBoxManageDhcpServer.cpp \
+        VBoxManageDHCPServer.cpp \
         $(if $(VBOX_WITH_GUEST_PROPS),VBoxManageGuestProp.cpp) \
         VBoxManageSVN.cpp

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

@@ -1726 +1726 @@
         { "export",           handleExportAppliance },
         { "hostonlyif",       handleHostonlyIf },
-        { "dhcpserver",       handleDhcpServer},
+        { "dhcpserver",       handleDHCPServer},
         { NULL,               NULL }
     };

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -194 +194 @@
 
 /* VBoxManageHostonly.cpp */
-int handleDhcpServer(HandlerArg *a);
+int handleDHCPServer(HandlerArg *a);
 
 #endif /* !VBOX_ONLY_DOCS */

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

@@ -235 +235 @@
     }
 
-    ComPtr<IDhcpServer> svr;
-    rc = a->virtualBox->FindDhcpServerByName(NetName.mutableRaw(), svr.asOutParam());
+    ComPtr<IDHCPServer> svr;
+    rc = a->virtualBox->FindDHCPServerByNetworkName(NetName.mutableRaw(), svr.asOutParam());
     if(enmCode == OP_ADD)
     {
@@ -242 +242 @@
             return errorArgument("dhcp server already exists");
 
-        CHECK_ERROR(a->virtualBox, CreateDhcpServer(NetName.mutableRaw(), svr.asOutParam()));
+        CHECK_ERROR(a->virtualBox, CreateDHCPServer(NetName.mutableRaw(), svr.asOutParam()));
         if(FAILED(rc))
             return errorArgument("failed to create server");
@@ -267 +267 @@
     else
     {
-        CHECK_ERROR(a->virtualBox, RemoveDhcpServer(svr));
+        CHECK_ERROR(a->virtualBox, RemoveDHCPServer(svr));
         if(FAILED(rc))
             return errorArgument("failed to remove server");
@@ -276 +276 @@
 
 
-int handleDhcpServer(HandlerArg *a)
+int handleDHCPServer(HandlerArg *a)
 {
     int result = 0;

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

@@ -765 +765 @@
         case LISTDHCPSERVERS:
         {
-            com::SafeIfaceArray<IDhcpServer> svrs;
-            CHECK_ERROR(a->virtualBox, COMGETTER(DhcpServers)(ComSafeArrayAsOutParam (svrs)));
+            com::SafeIfaceArray<IDHCPServer> svrs;
+            CHECK_ERROR(a->virtualBox, COMGETTER(DHCPServers)(ComSafeArrayAsOutParam (svrs)));
             for (size_t i = 0; i < svrs.size(); ++ i)
             {
-                ComPtr<IDhcpServer> svr = svrs[i];
+                ComPtr<IDHCPServer> svr = svrs[i];
                 Bstr netName;
                 svr->COMGETTER(NetworkName)(netName.asOutParam());

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1855 +1855 @@
         if(!networkName.isNull())
         {
-            ComPtr<IDhcpServer> dhcpServer;
-            hrc = virtualBox->FindDhcpServerByName(networkName.mutableRaw(), dhcpServer.asOutParam());
+            ComPtr<IDHCPServer> dhcpServer;
+            hrc = virtualBox->FindDHCPServerByNetworkName(networkName.mutableRaw(), dhcpServer.asOutParam());
             if(SUCCEEDED(hrc))
             {

trunk/src/VBox/Main/DHCPServerImpl.cpp

@@ -22 +22 @@
  */
 
-#include "DhcpServerImpl.h"
+#include "DHCPServerImpl.h"
 #include "Logging.h"
 
@@ -30 +30 @@
 /////////////////////////////////////////////////////////////////////////////
 
-DEFINE_EMPTY_CTOR_DTOR (DhcpServer)
-
-HRESULT DhcpServer::FinalConstruct()
-{
-    return S_OK;
-}
-
-void DhcpServer::FinalRelease()
+DEFINE_EMPTY_CTOR_DTOR (DHCPServer)
+
+HRESULT DHCPServer::FinalConstruct()
+{
+    return S_OK;
+}
+
+void DHCPServer::FinalRelease()
 {
     uninit ();
 }
 
-void DhcpServer::uninit()
+void DHCPServer::uninit()
 {
     /* Enclose the state transition Ready->InUninit->NotReady */
@@ -58 +58 @@
 }
 
-HRESULT DhcpServer::init(VirtualBox *aVirtualBox, IN_BSTR aName)
+HRESULT DHCPServer::init(VirtualBox *aVirtualBox, IN_BSTR aName)
 {
     AssertReturn (aName != NULL, E_INVALIDARG);
@@ -85 +85 @@
 }
 
-HRESULT DhcpServer::init(VirtualBox *aVirtualBox, const settings::Key &aNode)
+HRESULT DHCPServer::init(VirtualBox *aVirtualBox, const settings::Key &aNode)
 {
     using namespace settings;
@@ -110 +110 @@
 }
 
-HRESULT DhcpServer::saveSettings (settings::Key &aParentNode)
+HRESULT DHCPServer::saveSettings (settings::Key &aParentNode)
 {
     using namespace settings;
@@ -121 +121 @@
     AutoReadLock alock (this);
 
-    Key aNode = aParentNode.appendKey ("DhcpServer");
+    Key aNode = aParentNode.appendKey ("DHCPServer");
     /* required */
     aNode.setValue <Bstr> ("networkName", mName);
@@ -133 +133 @@
 }
 
-STDMETHODIMP DhcpServer::COMGETTER(NetworkName) (BSTR *aName)
+STDMETHODIMP DHCPServer::COMGETTER(NetworkName) (BSTR *aName)
 {
     CheckComArgOutPointerValid(aName);
@@ -145 +145 @@
 }
 
-STDMETHODIMP DhcpServer::COMGETTER(Enabled) (BOOL *aEnabled)
+STDMETHODIMP DHCPServer::COMGETTER(Enabled) (BOOL *aEnabled)
 {
     CheckComArgOutPointerValid(aEnabled);
@@ -157 +157 @@
 }
 
-STDMETHODIMP DhcpServer::COMSETTER(Enabled) (BOOL aEnabled)
+STDMETHODIMP DHCPServer::COMSETTER(Enabled) (BOOL aEnabled)
 {
     AutoCaller autoCaller (this);
@@ -172 +172 @@
 }
 
-STDMETHODIMP DhcpServer::COMGETTER(IPAddress) (BSTR *aIPAddress)
+STDMETHODIMP DHCPServer::COMGETTER(IPAddress) (BSTR *aIPAddress)
 {
     CheckComArgOutPointerValid(aIPAddress);
@@ -184 +184 @@
 }
 
-STDMETHODIMP DhcpServer::COMGETTER(NetworkMask) (BSTR *aNetworkMask)
+STDMETHODIMP DHCPServer::COMGETTER(NetworkMask) (BSTR *aNetworkMask)
 {
     CheckComArgOutPointerValid(aNetworkMask);
@@ -196 +196 @@
 }
 
-STDMETHODIMP DhcpServer::COMGETTER(LowerIP) (BSTR *aIPAddress)
+STDMETHODIMP DHCPServer::COMGETTER(LowerIP) (BSTR *aIPAddress)
 {
     CheckComArgOutPointerValid(aIPAddress);
@@ -208 +208 @@
 }
 
-STDMETHODIMP DhcpServer::COMGETTER(UpperIP) (BSTR *aIPAddress)
+STDMETHODIMP DHCPServer::COMGETTER(UpperIP) (BSTR *aIPAddress)
 {
     CheckComArgOutPointerValid(aIPAddress);
@@ -220 +220 @@
 }
 
-STDMETHODIMP DhcpServer::SetConfiguration (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aLowerIP, IN_BSTR aUpperIP)
+STDMETHODIMP DHCPServer::SetConfiguration (IN_BSTR aIPAddress, IN_BSTR aNetworkMask, IN_BSTR aLowerIP, IN_BSTR aUpperIP)
 {
     AssertReturn (aIPAddress != NULL, E_INVALIDARG);

trunk/src/VBox/Main/Makefile.kmk

@@ -279 +279 @@
         HostFloppyDriveImpl.cpp \
         HostNetworkInterfaceImpl.cpp \
-        DhcpServerImpl.cpp \
+        DHCPServerImpl.cpp \
         GuestOSTypeImpl.cpp \
         NetworkAdapterImpl.cpp \

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 */);
     }
 

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

@@ -1219 +1219 @@
 
   <interface
-    name="IDhcpServer" extends="$unknown"
-    uuid="ed5c8393-e245-476d-a272-b65063a5d542"
+    name="IDHCPServer" extends="$unknown"
+    uuid="fab58256-c76e-4ddd-8029-18343e5b0069"
     wsmap="managed"
   >
     <desc>
-      The IDhcpServer interface represents the vbox dhcp server configuration.
+      The IDHCPServer interface represents the vbox dhcp server configuration.
 
       To enumerate all the dhcp servers on the host, use the
-      <link to="IVirtualBox::dhcpServers"/> attribute.
+      <link to="IVirtualBox::DHCPServers"/> attribute.
     </desc>
 
@@ -1482 +1482 @@
     </attribute>
 
-    <attribute name="dhcpServers" type="IDhcpServer" safearray="yes" readonly="yes">
+    <attribute name="DHCPServers" type="IDHCPServer" safearray="yes" readonly="yes">
       <desc>
         dhcp server settings.
@@ -2753 +2753 @@
     </method>
 
-    <!--method name="createDhcpServerForInterface">
+    <!--method name="createDHCPServerForInterface">
       <desc>
         Creates a dhcp server settings to be used for the given interface
@@ -2763 +2763 @@
         <desc>Network Interface</desc>
       </param>
-      <param name="server" type="IDhcpServer" dir="out">
+      <param name="server" type="IDHCPServer" dir="out">
         <desc>Dhcp server settings</desc>
       </param>
     </method-->
 
-    <method name="createDhcpServer">
+    <method name="createDHCPServer">
       <desc>
         Creates a dhcp server settings to be used for the given internal network name
@@ -2778 +2778 @@
         <desc>server name</desc>
       </param>
-      <param name="server" type="IDhcpServer" dir="return">
+      <param name="server" type="IDHCPServer" dir="return">
         <desc>Dhcp server settings</desc>
       </param>
     </method>
 
-    <method name="findDhcpServerByName">
+    <method name="findDHCPServerByNetworkName">
       <desc>
         Searches a dhcp server settings to be used for the given internal network name
@@ -2794 +2794 @@
         <desc>server name</desc>
       </param>
-      <param name="server" type="IDhcpServer" dir="return">
+      <param name="server" type="IDHCPServer" dir="return">
         <desc>Dhcp server settings</desc>
       </param>
     </method>
 
-    <!--method name="findDhcpServerForInterface">
+    <!--method name="findDHCPServerForInterface">
       <desc>
         Searches a dhcp server settings to be used for the given interface
@@ -2809 +2809 @@
         <desc>Network Interface</desc>
       </param>
-      <param name="server" type="IDhcpServer" dir="out">
+      <param name="server" type="IDHCPServer" dir="out">
         <desc>Dhcp server settings</desc>
       </param>
     </method-->
 
-    <method name="removeDhcpServer">
+    <method name="removeDHCPServer">
       <desc>
         Removes the dhcp server settings
@@ -2821 +2821 @@
         </result>
       </desc>
-      <param name="server" type="IDhcpServer" dir="in">
+      <param name="server" type="IDHCPServer" dir="in">
         <desc>Dhcp server settings to be removed</desc>
       </param>

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

@@ -29 +29 @@
 
 #ifdef VBOX_WITH_HOSTNETIF_API
-/* class DhcpServer; */
+/* class DHCPServer; */
 /* #include "netif.h" */
 struct NETIFINFO;
 #endif
 
-class ATL_NO_VTABLE DhcpServer :
+class ATL_NO_VTABLE DHCPServer :
     public VirtualBoxBaseNEXT,
-    public VirtualBoxSupportErrorInfoImpl <DhcpServer, IDhcpServer>,
-    public VirtualBoxSupportTranslation <DhcpServer>,
-    public IDhcpServer
+    public VirtualBoxSupportErrorInfoImpl <DHCPServer, IDHCPServer>,
+    public VirtualBoxSupportTranslation <DHCPServer>,
+    public IDHCPServer
 {
 public:
 
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (DhcpServer)
+    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT (DHCPServer)
 
-    DECLARE_NOT_AGGREGATABLE (DhcpServer)
+    DECLARE_NOT_AGGREGATABLE (DHCPServer)
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    BEGIN_COM_MAP (DhcpServer)
+    BEGIN_COM_MAP (DHCPServer)
         COM_INTERFACE_ENTRY (ISupportErrorInfo)
-        COM_INTERFACE_ENTRY (IDhcpServer)
+        COM_INTERFACE_ENTRY (IDHCPServer)
     END_COM_MAP()
 
     NS_DECL_ISUPPORTS
 
-    DECLARE_EMPTY_CTOR_DTOR (DhcpServer)
+    DECLARE_EMPTY_CTOR_DTOR (DHCPServer)
 
     HRESULT FinalConstruct();
@@ -66 +66 @@
     void uninit();
 
-    // IDhcpServer properties
+    // IDHCPServer properties
     STDMETHOD(COMGETTER(NetworkName)) (BSTR *aName);
     STDMETHOD(COMGETTER(Enabled)) (BOOL *aEnabled);
@@ -78 +78 @@
 
     // for VirtualBoxSupportErrorInfoImpl
-    static const wchar_t *getComponentName() { return L"DhcpServer"; }
+    static const wchar_t *getComponentName() { return L"DHCPServer"; }
 
 private:

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

@@ -54 +54 @@
 class Host;
 class SystemProperties;
-class DhcpServer;
+class DHCPServer;
 
 #ifdef RT_OS_WINDOWS
@@ -134 +134 @@
     STDMETHOD(COMGETTER(SharedFolders)) (ComSafeArrayOut (ISharedFolder *, aSharedFolders));
     STDMETHOD(COMGETTER(PerformanceCollector)) (IPerformanceCollector **aPerformanceCollector);
-    STDMETHOD(COMGETTER(DhcpServers)) (ComSafeArrayOut (IDhcpServer *, aDhcpServers));
+    STDMETHOD(COMGETTER(DHCPServers)) (ComSafeArrayOut (IDHCPServer *, aDHCPServers));
 
     /* IVirtualBox methods */
@@ -186 +186 @@
     STDMETHOD(SaveSettingsWithBackup) (BSTR *aBakFileName);
 
-//    STDMETHOD(CreateDhcpServerForInterface) (/*IHostNetworkInterface * aIinterface, */IDhcpServer ** aServer);
-    STDMETHOD(CreateDhcpServer) (IN_BSTR aName, IDhcpServer ** aServer);
-//    STDMETHOD(FindDhcpServerForInterface) (IHostNetworkInterface * aIinterface, IDhcpServer ** aServer);
-    STDMETHOD(FindDhcpServerByName) (IN_BSTR aName, IDhcpServer ** aServer);
-    STDMETHOD(RemoveDhcpServer) (IDhcpServer * aServer);
+//    STDMETHOD(CreateDHCPServerForInterface) (/*IHostNetworkInterface * aIinterface, */IDHCPServer ** aServer);
+    STDMETHOD(CreateDHCPServer) (IN_BSTR aName, IDHCPServer ** aServer);
+//    STDMETHOD(FindDHCPServerForInterface) (IHostNetworkInterface * aIinterface, IDHCPServer ** aServer);
+    STDMETHOD(FindDHCPServerByNetworkName) (IN_BSTR aName, IDHCPServer ** aServer);
+    STDMETHOD(RemoveDHCPServer) (IDHCPServer * aServer);
 
     /* public methods only for internal purposes */
@@ -373 +373 @@
     typedef std::list <ComObjPtr <FloppyImage> > FloppyImageList;
     typedef std::list <ComObjPtr <SharedFolder> > SharedFolderList;
-    typedef std::list <ComObjPtr <DhcpServer> > DhcpServerList;
+    typedef std::list <ComObjPtr <DHCPServer> > DHCPServerList;
 
     typedef std::map <Guid, ComObjPtr<HardDisk> > HardDiskMap;
@@ -396 +396 @@
     HRESULT registerMachine (Machine *aMachine);
 
-    HRESULT registerDhcpServer(DhcpServer *aDhcpServer,
+    HRESULT registerDHCPServer(DHCPServer *aDHCPServer,
                                          bool aSaveRegistry = true);
-    HRESULT unregisterDhcpServer(DhcpServer *aDhcpServer,
+    HRESULT unregisterDHCPServer(DHCPServer *aDHCPServer,
                                          bool aSaveRegistry = true);
 
@@ -447 +447 @@
         FloppyImageList mFloppyImages;
         SharedFolderList mSharedFolders;
-        DhcpServerList mDhcpServers;
+        DHCPServerList mDHCPServers;
 
         /// @todo NEWMEDIA do we really need this map? Used only in

trunk/src/VBox/Main/xml/SettingsConverter.xsl

@@ -857 +857 @@
         <xsl:apply-templates mode="v1.7" />
         <NetserviceRegistry>
-           <DhcpServers>
+           <DHCPServers>
               <xsl:choose>
                 <xsl:when test="substring-after(../@version,'-')='windows'">
-                   <DhcpServer networkName="HostInterfaceNetworking-VirtualBox Host-Only Network Adapter" 
+                   <DHCPServer networkName="HostInterfaceNetworking-VirtualBox Host-Only Network Adapter" 
                         IPAddress="192.168.56.100" networkMask="255.255.255.0"
                         lowerIP="192.168.56.101" upperIP="192.168.56.254"
@@ -866 +866 @@
                 </xsl:when>
                 <xsl:otherwise>
-                   <DhcpServer networkName="HostInterfaceNetworking-vboxnet0" 
+                   <DHCPServer networkName="HostInterfaceNetworking-vboxnet0" 
                         IPAddress="192.168.56.2" networkMask="255.255.255.0"
                         lowerIP="192.168.56.3" upperIP="192.168.56.255"
@@ -872 +872 @@
                 </xsl:otherwise>
               </xsl:choose>
-           </DhcpServers>
+           </DHCPServers>
         </NetserviceRegistry>              
     </xsl:copy>

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

@@ -255 +255 @@
 /////////////////////////////////////////////////////////////////////////
 -->
-<xsd:complexType name="TDhcpServer">
+<xsd:complexType name="TDHCPServer">
   <xsd:attribute name="networkName" type="xsd:string"  use="required"/>
   <xsd:attribute name="lowerIP"     type="xsd:string"  use="required"/>
@@ -407 +407 @@
       <xsd:complexType>
         <xsd:all>
-          <xsd:element name="DhcpServers" minOccurs="0">
+          <xsd:element name="DHCPServers" minOccurs="0">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="DhcpServer" type="TDhcpServer" minOccurs="0" maxOccurs="unbounded"/>
+                <xsd:element name="DHCPServer" type="TDHCPServer" minOccurs="0" maxOccurs="unbounded"/>
               </xsd:sequence>
             </xsd:complexType>

trunk/src/VBox/Main/xpcom/server.cpp

@@ -111 +111 @@
 #include <ParallelPortImpl.h>
 #include <USBControllerImpl.h>
-#include "DhcpServerImpl.h"
+#include "DHCPServerImpl.h"
 #ifdef VBOX_WITH_USB
 # include <HostUSBDeviceImpl.h>
@@ -195 +195 @@
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(HostNetworkInterface, IHostNetworkInterface)
 
-NS_DECL_CLASSINFO(DhcpServer)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(DhcpServer, IDhcpServer)
+NS_DECL_CLASSINFO(DHCPServer)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(DHCPServer, IDHCPServer)
 
 NS_DECL_CLASSINFO(GuestOSType)