Changeset 79732 in vbox for trunk/include

Timestamp:

Jul 12, 2019 12:40:09 PM (6 years ago)

Author:

vboxsync

Message:

Main: Redoing the IDHCPServer interface, part I. bugref:9288

Location:

trunk/include/VBox

Files:

• log.h (modified) (2 diffs)
• settings.h (modified) (5 diffs)

trunk/include/VBox/log.h

@@ -371 +371 @@
     /** Main group, IDataStream. */
     LOG_GROUP_MAIN_DATASTREAM,
+    /** Main group, IDHCPConfig. */
+    LOG_GROUP_MAIN_DHCPCONFIG,
+    /** Main group, IDHCPGlobalConfig. */
+    LOG_GROUP_MAIN_DHCPGLOBALCONFIG,
+    /** Main group, IDHCPGroupCondition. */
+    LOG_GROUP_MAIN_DHCPGROUPCONDITION,
+    /** Main group, IDHCPGroupConfig. */
+    LOG_GROUP_MAIN_DHCPGROUPCONFIG,
+    /** Main group, IDHCPIndividualConfig. */
+    LOG_GROUP_MAIN_DHCPINDIVIDUALCONFIG,
     /** Main group, IDHCPServer. */
     LOG_GROUP_MAIN_DHCPSERVER,
@@ -892 +902 @@
     "MAIN_DATAMODEL", \
     "MAIN_DATASTREAM", \
+    "MAIN_DHCPCONFIG", \
+    "MAIN_DHCPGLOBALCONFIG", \
+    "MAIN_DHCPGROUPCONDITION", \
+    "MAIN_DHCPGROUPCONFIG", \
+    "MAIN_DHCPINDIVIDUALCONFIG", \
     "MAIN_DHCPSERVER", \
     "MAIN_DIRECTORY", \

trunk/include/VBox/settings.h

@@ -338 +338 @@
 {
     DhcpOptValue();
-    DhcpOptValue(const com::Utf8Str &aText, DhcpOptEncoding_T aEncoding = DhcpOptEncoding_Legacy);
-
-    com::Utf8Str text;
-    DhcpOptEncoding_T encoding;
+    DhcpOptValue(const com::Utf8Str &aText, DHCPOptionEncoding_T aEncoding = DHCPOptionEncoding_Legacy);
+
+    com::Utf8Str            strValue;
+    DHCPOptionEncoding_T    enmEncoding;
 };
 
@@ -349 +349 @@
 typedef DhcpOptionMap::const_iterator DhcpOptConstIterator;
 
-typedef struct VmNameSlotKey
-{
-    VmNameSlotKey(const com::Utf8Str& aVmName, LONG aSlot);
-
-    bool operator<(const VmNameSlotKey& that) const;
-
-    const com::Utf8Str VmName;
-    LONG      Slot;
-} VmNameSlotKey;
-
-typedef std::map<VmNameSlotKey, DhcpOptionMap> VmSlot2OptionsMap;
-typedef VmSlot2OptionsMap::value_type VmSlot2OptionsPair;
-typedef VmSlot2OptionsMap::iterator VmSlot2OptionsIterator;
-typedef VmSlot2OptionsMap::const_iterator VmSlot2OptionsConstIterator;
+struct DHCPConfig
+{
+    DHCPConfig();
+
+    DhcpOptionMap           OptionMap;
+    uint32_t                secMinLeaseTime;
+    uint32_t                secDefaultLeaseTime;
+    uint32_t                secMaxLeaseTime;
+};
+
+struct DHCPIndividualConfig : DHCPConfig
+{
+    DHCPIndividualConfig();
+
+    com::Utf8Str            strMACAddress;
+    com::Utf8Str            strVMName;
+    ULONG                   uSlot;
+    com::Utf8Str            strFixedAddress;
+};
+
+typedef std::map<com::Utf8Str, DHCPIndividualConfig> DHCPIndividualConfigMap;
 
 struct DHCPServer
@@ -368 +375 @@
     DHCPServer();
 
-    com::Utf8Str    strNetworkName,
-                    strIPAddress,
-                    strIPLower,
-                    strIPUpper;
-    bool            fEnabled;
-    DhcpOptionMap   GlobalDhcpOptions;
-    VmSlot2OptionsMap VmSlot2OptionsM;
+    com::Utf8Str            strNetworkName;
+    com::Utf8Str            strIPAddress;
+    com::Utf8Str            strIPLower;
+    com::Utf8Str            strIPUpper;
+    bool                    fEnabled;
+    DHCPConfig              GlobalConfig;
+    DHCPIndividualConfigMap IndividualConfigs;
 };
 
@@ -409 +416 @@
 
     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);
 
@@ -427 +432 @@
     void buildUSBDeviceSources(xml::ElementNode &elmParent, const USBDeviceSourcesList &ll);
     void readUSBDeviceSources(const xml::ElementNode &elmDeviceSources, USBDeviceSourcesList &ll);
+    void buildDHCPServers(xml::ElementNode &elmDHCPServers, DHCPServersList const &ll);
+    void buildDHCPOptions(xml::ElementNode &elmOptions, DHCPConfig const &rConfig, bool fIgnoreSubnetMask);
+    void readDHCPServers(const xml::ElementNode &elmDHCPServers);
+    void readDHCPOptions(DHCPConfig &rConfig, const xml::ElementNode &elmOptions, bool fIgnoreSubnetMask);
     bool convertGuiProxySettings(const com::Utf8Str &strUIProxySettings);
 };