Changeset 21860 in vbox for trunk/src/VBox/Main/DHCPServerRunner.cpp

Timestamp:

Jul 29, 2009 9:39:25 AM (16 years ago)

Author:

vboxsync

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

50496

Message:

DHCP Server: fix for passing on commandline options with no values (for e.g. --begin-config)

File:

• trunk/src/VBox/Main/DHCPServerRunner.cpp (modified) (2 diffs)

trunk/src/VBox/Main/DHCPServerRunner.cpp

@@ -64 +64 @@
 }
 
+DHCPServerRunner::DHCPServerRunner()
+{
+    mProcess = NIL_RTPROCESS;
+    for (unsigned i = 0; i < DHCPCFG_NOTOPT_MAXVAL; i++)
+    {
+        mOptionEnabled[i] = false;
+    }
+}
+
 void DHCPServerRunner::detachFromServer()
 {
@@ -97 +106 @@
     for (unsigned i = 0; i < DHCPCFG_NOTOPT_MAXVAL; i++)
     {
-        if (mOptions[i].length())
+        if (mOptionEnabled[i])
         {
             const ARGDEF * pArgDef = getArgDef((DHCPCFG)i);
             args[index++] = pArgDef->Name;      // e.g. "--network"
-            args[index++] = mOptions[i].raw();  // value
+
+            /* value can be null for e.g. --begin-config has no value
+             * and thus check the mOptions string length here
+             */
+            if (mOptions[i].length())
+                args[index++] = mOptions[i].raw();  // value
         }
     }