Changeset 79846 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 17, 2019 9:19:20 PM (5 years ago)

Author:

vboxsync

Message:

Main/DHCPServer,VBoxManage,Dhcpd: Created a new DHCPOption enum that replaced the incorrectly cased DhcpOpt enum in new APIs. Adjusted and documented each and every option and its format as best as I could. Also added two new attributes to IDHCPConfig, one for supressing options (from higher up the configuration scope) and one for forcing unsolicited options on a client. These attributes have not yet been pushed down to Dhcpd. [build fix] bugref:9288

File:

• trunk/src/VBox/Main/src-server/DHCPConfigImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/DHCPConfigImpl.cpp

@@ -602 +602 @@
         if (it->second.enmEncoding == DHCPOptionEncoding_Normal)
             return a_rDst.assignEx(it->second.strValue);
-        return setError(VBOX_E_OBJECT_NOT_FOUND, tr("DHCP option DhcpOpt_SubnetMask is not in a legacy encoding"));
-    }
-    return setError(VBOX_E_OBJECT_NOT_FOUND, tr("DHCP option DhcpOpt_SubnetMask was not found"));
+        return setError(VBOX_E_OBJECT_NOT_FOUND, tr("DHCP option DHCPOption_SubnetMask is not in a legacy encoding"));
+    }
+    return setError(VBOX_E_OBJECT_NOT_FOUND, tr("DHCP option DHCPOption_SubnetMask was not found"));
 }
 
@@ -628 +628 @@
 
 /**
- * Overriden to ensure the sanity of the DhcpOpt_SubnetMask option.
+ * Overriden to ensure the sanity of the DHCPOption_SubnetMask option.
  */
 HRESULT DHCPGlobalConfig::i_setOption(DHCPOption_T aOption, DHCPOptionEncoding_T aEncoding, const com::Utf8Str &aValue)
 {
-    if (aOption != DhcpOpt_SubnetMask || aEncoding == DHCPOptionEncoding_Normal)
+    if (aOption != DHCPOption_SubnetMask || aEncoding == DHCPOptionEncoding_Normal)
         return DHCPConfig::i_setOption(aOption, aEncoding, aValue);
-    return setError(E_FAIL, tr("DhcpOpt_SubnetMask must use DHCPOptionEncoding_Normal as it is reflected by IDHCPServer::networkMask"));
+    return setError(E_FAIL, tr("DHCPOption_SubnetMask must use DHCPOptionEncoding_Normal as it is reflected by IDHCPServer::networkMask"));
 }
 
 
 /**
- * Overriden to ensure the sanity of the DhcpOpt_SubnetMask option.
+ * Overriden to ensure the sanity of the DHCPOption_SubnetMask option.
  */
 HRESULT DHCPGlobalConfig::i_removeOption(DHCPOption_T aOption)
 {
-    if (aOption != DhcpOpt_SubnetMask)
+    if (aOption != DHCPOption_SubnetMask)
         return DHCPConfig::i_removeOption(aOption);
-    return setError(E_FAIL, tr("DhcpOpt_SubnetMask cannot be removed as it reflects IDHCPServer::networkMask"));
+    return setError(E_FAIL, tr("DHCPOption_SubnetMask cannot be removed as it reflects IDHCPServer::networkMask"));
 }
 
 
 /**
- * Overriden to preserve the DhcpOpt_SubnetMask option.
+ * Overriden to preserve the DHCPOption_SubnetMask option.
  */
 HRESULT DHCPGlobalConfig::i_removeAllOptions()