Changeset 21860 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Main

Files:

• DHCPServerImpl.cpp (modified) (2 diffs)
• DHCPServerRunner.cpp (modified) (2 diffs)
• include/DHCPServerRunner.h (modified) (3 diffs)

trunk/src/VBox/Main/DHCPServerImpl.cpp

@@ -249 +249 @@
         return S_OK;
 
-    m.dhcp.setOption(DHCPCFG_NETNAME, Utf8Str(aNetworkName));
+    m.dhcp.setOption(DHCPCFG_NETNAME, Utf8Str(aNetworkName), true);
     Bstr tmp(aTrunkName);
     if (!tmp.isEmpty())
-        m.dhcp.setOption(DHCPCFG_TRUNKNAME, Utf8Str(tmp));
-    m.dhcp.setOption(DHCPCFG_TRUNKTYPE, Utf8Str(aTrunkType));
+        m.dhcp.setOption(DHCPCFG_TRUNKNAME, Utf8Str(tmp), true);
+    m.dhcp.setOption(DHCPCFG_TRUNKTYPE, Utf8Str(aTrunkType), true);
     //temporary hack for testing
     //    DHCPCFG_NAME
@@ -261 +261 @@
     RTStrPrintf (strMAC, sizeof(strMAC), "080027%02X%02X%02X",
                  guid.ptr()->au8[0], guid.ptr()->au8[1], guid.ptr()->au8[2]);
-    m.dhcp.setOption(DHCPCFG_MACADDRESS, strMAC);
-    m.dhcp.setOption(DHCPCFG_IPADDRESS,  Utf8Str(m.IPAddress));
+    m.dhcp.setOption(DHCPCFG_MACADDRESS, strMAC, true);
+    m.dhcp.setOption(DHCPCFG_IPADDRESS,  Utf8Str(m.IPAddress), true);
     //        DHCPCFG_LEASEDB,
     //        DHCPCFG_VERBOSE,
     //        DHCPCFG_GATEWAY,
-    m.dhcp.setOption(DHCPCFG_LOWERIP,  Utf8Str(m.lowerIP));
-    m.dhcp.setOption(DHCPCFG_UPPERIP,  Utf8Str(m.upperIP));
-    m.dhcp.setOption(DHCPCFG_NETMASK,  Utf8Str(m.networkMask));
+    m.dhcp.setOption(DHCPCFG_LOWERIP,  Utf8Str(m.lowerIP), true);
+    m.dhcp.setOption(DHCPCFG_UPPERIP,  Utf8Str(m.upperIP), true);
+    m.dhcp.setOption(DHCPCFG_NETMASK,  Utf8Str(m.networkMask), true);
 
     //        DHCPCFG_HELP,
     //        DHCPCFG_VERSION,
     //        DHCPCFG_NOTOPT_MAXVAL
-    m.dhcp.setOption(DHCPCFG_BEGINCONFIG,  "");
+    m.dhcp.setOption(DHCPCFG_BEGINCONFIG,  "", true);
 
     return RT_FAILURE(m.dhcp.start()) ? E_FAIL : S_OK;

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
         }
     }

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

@@ -53 +53 @@
 {
 public:
-    DHCPServerRunner() : mProcess (NIL_RTPROCESS) {}
+    DHCPServerRunner(); 
     ~DHCPServerRunner() { stop(); /* don't leave abandoned servers */}
 
-    int setOption(DHCPCFG opt, const char *val)
+    int setOption(DHCPCFG opt, const char *val, bool enabled)
     {
         if(opt == 0 || opt >= DHCPCFG_NOTOPT_MAXVAL)
@@ -75 +75 @@
             mOptions[opt] = val;
         }
+        mOptionEnabled[opt] = enabled;
         return VINF_SUCCESS;
     }
@@ -85 +86 @@
 private:
     com::Utf8Str mOptions[DHCPCFG_NOTOPT_MAXVAL];
+    bool mOptionEnabled[DHCPCFG_NOTOPT_MAXVAL];
     RTPROCESS mProcess;
 };