Changeset 54584 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Mar 2, 2015 4:45:57 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

98723

Message:

DHCPServer: Define DHCP option encodings as an enum. The enum is not
currently used in the API itself as we only smugle hex-encoded options
through existing API to remain backward compatible, but it provides
authoritative C definitions that we can now use on both sides of the API.

File:

• trunk/src/VBox/NetworkServices/DHCP/Config.cpp (modified) (2 diffs)

trunk/src/VBox/NetworkServices/DHCP/Config.cpp

@@ -1052 +1052 @@
 
 
-/*
- * XXX: Since encoding info is "smuggled" through the API and is not
- * exposed properly we don't have a common definition we can use here.
- *
- * TODO: We can define the encodings enum in the IDL without breaking
- * backward compatibility.  This will provide the authoritative
- * definition.
- */
 static int fillDhcpOption(RawOption &opt, const std::string &OptText, int OptEncoding)
 {
     int rc;
  
-    if (OptEncoding == /* HEX */ 1)
+    if (OptEncoding == DhcpOptEncoding_Hex)
     {
         if (OptText.empty())
@@ -1091 +1083 @@
         opt.cbRawOpt = (uint8_t)cbRawOpt;
     }
-    else if (OptEncoding == /* LEGACY */ 0)
+    else if (OptEncoding == DhcpOptEncoding_Legacy)
     {
         /*