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

Timestamp:

Jul 17, 2019 9:12:50 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. bugref:9288

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• DhcpOptions.cpp (modified) (4 diffs)
• DhcpOptions.h (modified) (3 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.cpp

@@ -321 +321 @@
                 HANDLE(OptNonLocalSourceRouting);       // 20
                 HANDLE(OptPolicyFilter);                // 21
-                HANDLE(OptMaxDatagramReassemblySize);   // 22
+                HANDLE(OptMaxDgramReassemblySize);      // 22
                 HANDLE(OptDefaultIPTTL);                // 23
-                HANDLE(OptDefaultPathMTUAgingTimeout);  // 24
+                HANDLE(OptPathMTUAgingTimeout);         // 24
                 HANDLE(OptPathMTUPlateauTable);         // 25
                 HANDLE(OptInterfaceMTU);                // 26
@@ -342 +342 @@
                 HANDLE(OptNISServers);                  // 41
                 HANDLE(OptNTPServers);                  // 42
-                HANDLE(OptVendorSpecificInfo);          // 43
+                //HANDLE(OptVendorSpecificInfo);          // 43 - Only DHCPOptionEncoding_hex
                 HANDLE(OptNetBIOSNameServers);          // 44
                 HANDLE(OptNetBIOSDatagramServers);      // 45
                 HANDLE(OptNetBIOSNodeType);             // 46
-                HANDLE(OptNetBIOSScope);                // 47
+                //HANDLE(OptNetBIOSScope);                // 47 - Only DHCPOptionEncoding_hex
                 HANDLE(OptXWindowsFontServers);         // 48
                 HANDLE(OptXWindowsDisplayManager);      // 49
@@ -364 +364 @@
 #endif
                 HANDLE(OptNetWareIPDomainName);         // 62
-                HANDLE(OptNetWareIPInformation);        // 63
+                //HANDLE(OptNetWareIPInformation);        // 63 - Only DHCPOptionEncoding_hex
                 HANDLE(OptNISPlusDomain);               // 64
                 HANDLE(OptNISPlusServers);              // 65
-                HANDLE(OptTFTPServer);                  // 66 - perhaps we should use an alternative way to configure these.
-                HANDLE(OptBootFileName);                // 67 - perhaps we should use an alternative way to configure these.
+                HANDLE(OptTFTPServerName);              // 66 - perhaps we should use an alternative way to configure these.
+                HANDLE(OptBootfileName);                // 67 - perhaps we should use an alternative way to configure these.
                 HANDLE(OptMobileIPHomeAgents);          // 68
                 HANDLE(OptSMTPServers);                 // 69
@@ -379 +379 @@
                 HANDLE(OptSTDAServers);                 // 76
                 // OptUserClassId (77) is client only and not configurable.
-                HANDLE(OptSLPDirectoryAgent);           // 78
-                HANDLE(OptSLPServiceScope);             // 79
+                //HANDLE(OptSLPDirectoryAgent);           // 78 - Only DHCPOptionEncoding_hex
+                //HANDLE(OptSLPServiceScope);             // 79 - Only DHCPOptionEncoding_hex
                 // OptRapidCommit (80) is not configurable.
+
+                //HANDLE(OptDomainSearch);                // 119 - Only DHCPOptionEncoding_hex
 
 #undef HANDLE

trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.h

@@ -756 +756 @@
 typedef OptValue<20, bool>              OptNonLocalSourceRouting;
 typedef OptList<21, DhcpIpv4AddrAndMask> OptPolicyFilter;
-typedef OptValue<22, uint16_t>          OptMaxDatagramReassemblySize;
+typedef OptValue<22, uint16_t>          OptMaxDgramReassemblySize;
 typedef OptValue<23, uint16_t>          OptDefaultIPTTL;
-typedef OptValue<24, uint32_t>          OptDefaultPathMTUAgingTimeout;
+typedef OptValue<24, uint32_t>          OptPathMTUAgingTimeout;
 typedef OptList<25, uint16_t>           OptPathMTUPlateauTable;
 typedef OptValue<26, uint16_t>          OptInterfaceMTU;
@@ -801 +801 @@
 typedef OptString<64>                   OptNISPlusDomain;
 typedef OptString<65>                   OptNISPlusServers;
-typedef OptString<66>                   OptTFTPServer;              /**< when overloaded */
-typedef OptString<67>                   OptBootFileName;            /**< when overloaded */
+typedef OptString<66>                   OptTFTPServerName;          /**< when overloaded */
+typedef OptString<67>                   OptBootfileName;            /**< when overloaded */
 typedef OptList<68, RTNETADDRIPV4>      OptMobileIPHomeAgents;
 typedef OptList<69, RTNETADDRIPV4>      OptSMTPServers;
@@ -816 +816 @@
 typedef OptList<79, uint8_t>            OptSLPServiceScope;         /**< complicated, so just byte list for now. RFC2610 */
 typedef OptNoValue<80>                  OptRapidCommit;             /**< RFC4039 */
+typedef OptList<119, uint8_t>           OptDomainSearch;            /**< RFC3397 */
 /** @} */