Changeset 47018 in vbox for trunk/include/VBox

Timestamp:

Jul 6, 2013 5:31:11 PM (11 years ago)

Author:

vboxsync

Message:

Main: re-commit r86967
Main/Network: DHCP server has got the ear in Main, and we able create/describe more complex infrostructures. DHCP server together with Lwip NAT can handle per vm/slot configuration and store them in xml settings.
place-holder: Host interface nameserver list, domain name and search strings, I suppose that this functions should be used on initialization stage and then on host configuration change even or directly from event.

File:

• trunk/include/VBox/settings.h (modified) (3 diffs)

trunk/include/VBox/settings.h

@@ -286 +286 @@
 typedef std::list<MachineRegistryEntry> MachinesRegistry;
 
+typedef std::map<DhcpOpt_T, com::Utf8Str> DhcpOptionMap;
+typedef DhcpOptionMap::value_type DhcpOptValuePair;
+typedef DhcpOptionMap::iterator DhcpOptIterator;
+typedef DhcpOptionMap::const_iterator DhcpOptConstIterator;
+
+typedef struct VmNameSlotKey
+{
+    VmNameSlotKey(const com::Utf8Str& aVmName, LONG aSlot): VmName(aVmName),
+      Slot(aSlot){}
+    const com::Utf8Str VmName;
+    LONG      Slot;
+    bool operator< (const VmNameSlotKey& that) const
+    {
+        if (VmName == that.VmName)
+            return Slot < that.Slot;
+        else return VmName < that.VmName;
+    }
+} VmNameSlotKey;
+typedef std::map<VmNameSlotKey, DhcpOptionMap> VmSlot2OptionsMap;
+typedef VmSlot2OptionsMap::value_type VmSlot2OptionsPair;
+typedef VmSlot2OptionsMap::iterator VmSlot2OptionsIterator;
+typedef VmSlot2OptionsMap::const_iterator VmSlot2OptionsConstIterator;
+
 struct DHCPServer
 {
@@ -294 +317 @@
     com::Utf8Str    strNetworkName,
                     strIPAddress,
-                    strIPNetworkMask,
                     strIPLower,
                     strIPUpper;
     bool            fEnabled;
+    std::map<DhcpOpt_T, com::Utf8Str>  GlobalDhcpOptions;
+    VmSlot2OptionsMap VmSlot2OptionsM;
 };
 typedef std::list<DHCPServer> DHCPServersList;
@@ -337 +361 @@
     void readMachineRegistry(const xml::ElementNode &elmMachineRegistry);
     void readDHCPServers(const xml::ElementNode &elmDHCPServers);
+    void readDhcpOptions(DhcpOptionMap& map, const xml::ElementNode& options);
     void readNATNetworks(const xml::ElementNode &elmNATNetworks);