Changeset 21860 in vbox for trunk/src/VBox/Main/DHCPServerImpl.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/DHCPServerImpl.cpp (modified) (2 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;