[#3346] Addressed review changes:

- added references to leasequery hook
- changelog reworded
- typos fixed
- empty lines removed

diff --git a/ChangeLog b/ChangeLog
index b25e320d7555412c2415775146d922d3a2514ec3..3300672ef25663ca880cb42c76d6458642f733ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2245.  [doc]           tomek
-       Many already support RFCs are now listed in the Supported
-       DHCP standards and Supported DHCPv6 standards in the ARM.
+       Many already supported RFCs are now listed in the Supported
+       DHCP standards and Supported DHCPv6 standards in the Kea
+       Administrator Reference Manual (ARM).
        (Gitlab #3346)
 
 2244.  [func]          mgodzina

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 28e641977dcc2923b7d96a1a948d1b9022b79de7..d47f55c866643dbfbcaa8ce0bab63ec18a7dbd36 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -7765,7 +7765,7 @@ The following standards are currently supported in Kea:
    `RFC 3396 <https://tools.ietf.org/html/rfc3396>`__: The Kea server can both
    receive and send long options. The long options can be configured and Kea
    will send them as separate instances if the payload length is longer than
-   255 octects.
+   255 octets.
 
 -  *Dynamic Host Configuration Protocol (DHCP) Domain Search Option*, `RFC 3397
    <https://tools.ietf.org/html/rfc3397>`__: The option is supported.
@@ -7805,7 +7805,7 @@ The following standards are currently supported in Kea:
 
 -  *Dynamic Host Configuration Protocol (DHCP) Leasequery*, `RFC 4388
    <https://datatracker.ietf.org/doc/html/rfc4388>`__: The server functionality
-   is supported. This requires leasequery hook.
+   is supported. This requires leasequery hook. See :ref:`hooks-lease-query` for details.
 
 -  *Dynamic Host Configuration Protocol (DHCP) Options for the Intel Preboot
    eXecution Environment (PXE)*, `RFC 4578
@@ -7855,7 +7855,7 @@ The following standards are currently supported in Kea:
 
 -  *DHCPv4 Lease Query by Relay Agent Remote ID*, `RFC 6148
    <https://tools.ietf.org/html/rfc6148>`__: The leasequery by remote-id is
-   supported. This requires leasequery hook.
+   supported. This requires leasequery hook. See :ref:`hooks-lease-query` for details.
 
 -  *Client Identifier Option in DHCP Server Replies*, `RFC 6842
    <https://tools.ietf.org/html/rfc6842>`__: The server by default sends back
@@ -7869,7 +7869,7 @@ The following standards are currently supported in Kea:
 
 -  *DHCPv4 Bulk Leasequery*, `RFC 6926 <https://tools.ietf.org/html/rfc6926>`__: The
    server functionality (TCP connections, new query types, multiple responses, etc.)
-   is supported. This requires leasequery hook.
+   is supported. This requires leasequery hook. See :ref:`hooks-lease-query` for details.
 
 -  *Generalized UDP Source Port for the DHCP Relay Agent Option*, `RFC 8357
    <https://tools.ietf.org/html/rfc8357>`__: The Kea server handles the Relay

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index ece17ac4181a9f906ac6acd26ce723727cd5231e..b9318effe66f7c055522d8983066544ebe768993 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -7589,7 +7589,7 @@ The following standards are currently supported in Kea:
 
 -  *DHCPv6 Leasequery*: `RFC 5007 <https://tools.ietf.org/html/rfc5007>`__: The
    server functionality (message types, options) is supported. This requires
-   the leasequery hook.
+   the leasequery hook. See :ref:`hooks-lease-query` for details.
 
 -  *DHCP Options for Protocol for Carrying Authentication for Network Access
    (PANA) Authentication Agents*: `RFC 5192 <https://tools.ietf.org/html/rfc5192>`__:
@@ -7605,7 +7605,8 @@ The following standards are currently supported in Kea:
 
 -  *DHCPv6 Bulk Leasequery*: `RFC 5460 <https://tools.ietf.org/html/rfc5460>`__:
    The server functionality (TCP connection, new message types and options, new
-   query types) is supported. This requires the leasequery hook.
+   query types) is supported. This requires the leasequery hook. See
+   :ref:`hooks-lease-query` for details.
 
 -  *DHCPv6 Options for Network Boot*: `RFC 5970 <https://tools.ietf.org/html/rfc5970>`__:
    The network boot options are supported.
@@ -7636,7 +7637,7 @@ The following standards are currently supported in Kea:
    the client link-layer address option.
 
 -  *Modification to Default values of SOL_MAX_RT and INF_MAX_RT*, `RFC 7083
-   <https://www.rfc-editor.org/rfc/rfc7083.html>`__: The new options are
+   <https://tools.ietf.org/html/rfc7083>`__: The new options are
    supported.
 
 -  *Issues and Recommendations with Multiple Stateful DHCPv6 Options*,

diff --git a/src/lib/dhcp/dhcp4.h b/src/lib/dhcp/dhcp4.h
index 7055f3a439241053b874dc23f03cfce929679221..ffa3d974caa825637de9a6d799af6d1c07759412 100644 (file)
--- a/src/lib/dhcp/dhcp4.h
+++ b/src/lib/dhcp/dhcp4.h
@@ -176,7 +176,6 @@ enum DHCPOptionType {
     // URL option was replaced with captive portal.
     // DHO_URL                       = 114, /* RFC3679 */
     DHO_V4_CAPTIVE_PORTAL            = 114, /* RFC8910 */
-
     // 115 is removed/unassigned
     DHO_AUTO_CONFIG                  = 116, /* RFC2563 */
     DHO_NAME_SERVICE_SEARCH          = 117, /* RFC2937 */
@@ -227,7 +226,6 @@ enum DHCPOptionType {
 //  DHO_VSS                          = 221, /* RFC6607 */
     // 222-223 are removed/unassigned
     // 224-254 are reserved for private use
-
     DHO_END                          = 255 /* RFC2132 */
 };
 
@@ -249,7 +247,7 @@ enum DHCPMessageType {
     DHCPLEASEACTIVE     =  13,
     DHCPBULKLEASEQUERY  =  14,
     DHCPLEASEQUERYDONE  =  15,
-// DHCPACTIVELEASEQUERY =  16,
+//  DHCPACTIVELEASEQUERY =  16,
     DHCPLEASEQUERYSTATUS =  17,
     DHCPTLS              =  18,
     DHCP_TYPES_EOF