Changeset 18023 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

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

Author:

vboxsync

Message:

Dhcp->DHCP

Location:

trunk/src/VBox/Devices/Network

Files:

• DHCPServerRunner.cpp (moved) (moved from trunk/src/VBox/Devices/Network/DhcpServerRunner.cpp ) (5 diffs)
• DHCPServerRunner.h (moved) (moved from trunk/src/VBox/Devices/Network/DhcpServerRunner.h ) (1 diff)
• DrvIntNet.cpp (modified) (2 diffs)

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);