[4015] Added a IANA / standard option leading note and some EXPERIMENTAL labels

diff --git a/src/lib/dhcp/dhcp4.h b/src/lib/dhcp/dhcp4.h
index c074d6ba29ff34819b551362ade74d32fb826df4..35130e1d926aaf03c3914e5ff236d6a397a58296 100644 (file)
--- a/src/lib/dhcp/dhcp4.h
+++ b/src/lib/dhcp/dhcp4.h
@@ -36,6 +36,13 @@
 
 #include <stdint.h>
 
+/// @note Not yet implemented but assigned by IANA code points are
+/// left in a comment.
+/// To implement a standard option, remove the comment,
+/// add an entry in std_option_defs.h, stdOptionDefs4 unit test
+/// in tests/libdhcp++_unittest.cc and dhcp4-std-options-list-part2
+/// in the dhcp4-srv.xml source file of the user guide.
+
 namespace isc {
 namespace dhcp {
 

diff --git a/src/lib/dhcp/dhcp6.h b/src/lib/dhcp/dhcp6.h
index 0b4e3f583c98a32e636da7ad334b27ae9f264c47..8b7925887c60c99f57ae8ab1939fb4dc29b1aeac 100644 (file)
--- a/src/lib/dhcp/dhcp6.h
+++ b/src/lib/dhcp/dhcp6.h
@@ -15,6 +15,13 @@
 #ifndef DHCP6_H
 #define DHCP6_H
 
+/// @note Not yet implemented but assigned by IANA code points are
+/// left in a comment.
+/// To implement a standard option, remove the comment,
+/// add an entry in std_option_defs.h, stdOptionDefs6 unit test
+/// in tests/libdhcp++_unittest.cc and dhcp6-std-options-list in
+/// the dhcp6-srv.xml source file of the user guide.
+
 /* DHCPv6 Option codes: */
 
 #define D6O_CLIENTID                            1 /* RFC3315 */
@@ -122,6 +129,8 @@
 //#define D6O_LQ_END_TIME                        102
 /* 103-142 unassigned */
 //#define D6O_IPV6_ADDRESS_ANDSF                 143 /* RFC6153 */
+
+// EXPERIMENTAL
 /* secure DHCPv6 (draft-ietf-dhc-sedhcpv6-08) */
 /* temporary values for hackathon 93 */
 #define D6O_PUBLIC_KEY                         701
@@ -149,6 +158,8 @@
 //#define STATUS_CatchUpComplete          13
 //#define STATUS_NotSupported             14
 //#define STATUS_TLSConnectionRefused     15
+
+// EXPERIMENTAL
 /* secure DHCPv6 (draft-ietf-dhc-sedhcpv6-08) */
 /* temporary values for hackathon 93 */
 #define STATUS_AlgorithmNotSupported   705
@@ -199,6 +210,7 @@ extern const int dhcpv6_type_name_max;
 #define HWTYPE_ETHERNET    0x0001
 #define HWTYPE_INFINIBAND  0x0020
 
+// EXPERIMENTAL
 // Secure DHCPv6 (draft-ietf-dhc-sedhcpv6-08.txt)
 // (can't use an enum because HashAlgorithm name is already taken)
 #define SHA_256                 1