Changeset 54267 in vbox

Timestamp:

Feb 18, 2015 3:41:30 PM (10 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: collect DHCP options specified on the command
line into a vector instead of a map so that we pass all duplicates to
the API.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageDHCPServer.cpp (modified) (4 diffs)

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

@@ -54 +54 @@
 } OPCODE;
 
-typedef std::map<DhcpOpt_T, std::string> DhcpOptMap;
-typedef DhcpOptMap::iterator DhcpOptIterator;
-typedef DhcpOptMap::value_type DhcpOptValuePair;
+typedef std::pair<DhcpOpt_T, std::string> DhcpOptSpec;
+typedef std::vector<DhcpOptSpec> DhcpOpts;
+typedef DhcpOpts::iterator DhcpOptIterator;
 
 struct VmNameSlotKey
@@ -76 +76 @@
 };
 
-typedef std::map<VmNameSlotKey, DhcpOptMap> VmSlot2OptionsM;
+typedef std::map<VmNameSlotKey, DhcpOpts> VmSlot2OptionsM;
 typedef VmSlot2OptionsM::iterator VmSlot2OptionsIterator;
 typedef VmSlot2OptionsM::value_type VmSlot2OptionsPair;
@@ -136 +136 @@
     int enable = -1;
 
-    DhcpOptMap GlobalDhcpOptions;
+    DhcpOpts        GlobalDhcpOptions;
     VmSlot2OptionsM VmSlot2Options;
     VmConfigs       VmConfigs2Delete;
@@ -289 +289 @@
                                            "--slot wasn't found");
 
-                    DhcpOptMap& map = fVmOptionRead ? VmSlot2Options[VmNameSlotKey(pszVmName, u8Slot)]
+                    DhcpOpts &opts = fVmOptionRead ? VmSlot2Options[VmNameSlotKey(pszVmName, u8Slot)]
                                                     : GlobalDhcpOptions;
                     std::string strVal = ValueUnion.psz;
-                    map.insert(DhcpOptValuePair((DhcpOpt_T)u8OptId, strVal));
+                    opts.push_back(DhcpOptSpec((DhcpOpt_T)u8OptId, strVal));
 
                 }