Changeset 79747 in vbox for trunk/include

Timestamp:

Jul 12, 2019 11:00:54 PM (6 years ago)

Author:

vboxsync

Message:

Main: Redoing the IDHCPServer interface, part II. Implemented groups and fixed a couple of bugs. Made RTNetStrToMacAddr understand hexstrings w/o colon separators. bugref:9288

File:

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

trunk/include/VBox/settings.h

@@ -349 +349 @@
 typedef DhcpOptionMap::const_iterator DhcpOptConstIterator;
 
+struct DHCPGroupCondition
+{
+    DHCPGroupCondition();
+
+    bool                    fInclusive;
+    DHCPGroupConditionType_T enmType;
+    com::Utf8Str            strValue;
+};
+typedef std::vector<DHCPGroupCondition> DHCPGroupConditionVec;
+
+
 struct DHCPConfig
 {
     DHCPConfig();
 
-    DhcpOptionMap           OptionMap;
+    DhcpOptionMap           mapOptions;
     uint32_t                secMinLeaseTime;
     uint32_t                secDefaultLeaseTime;
@@ -359 +370 @@
 };
 
+struct DHCPGroupConfig : DHCPConfig
+{
+    DHCPGroupConfig();
+
+    com::Utf8Str            strName;
+    DHCPGroupConditionVec   vecConditions;
+};
+typedef std::vector<DHCPGroupConfig> DHCPGroupConfigVec;
+
 struct DHCPIndividualConfig : DHCPConfig
 {
@@ -365 +385 @@
     com::Utf8Str            strMACAddress;
     com::Utf8Str            strVMName;
-    ULONG                   uSlot;
+    uint32_t                uSlot;
     com::Utf8Str            strFixedAddress;
 };
-
 typedef std::map<com::Utf8Str, DHCPIndividualConfig> DHCPIndividualConfigMap;
 
@@ -380 +399 @@
     com::Utf8Str            strIPUpper;
     bool                    fEnabled;
-    DHCPConfig              GlobalConfig;
-    DHCPIndividualConfigMap IndividualConfigs;
-};
-
+    DHCPConfig              globalConfig;
+    DHCPGroupConfigVec      vecGroupConfigs;
+    DHCPIndividualConfigMap mapIndividualConfigs;
+};
 typedef std::list<DHCPServer> DHCPServersList;