Skip to content

Commit e2cb837

Browse files
[#3346] Addressed review changes:
- added references to leasequery hook - changelog reworded - typos fixed - empty lines removed
1 parent 2b1895e commit e2cb837

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

ChangeLog

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
2245. [doc] tomek
2-
Many already support RFCs are now listed in the Supported
3-
DHCP standards and Supported DHCPv6 standards in the ARM.
2+
Many already supported RFCs are now listed in the Supported
3+
DHCP standards and Supported DHCPv6 standards in the Kea
4+
Administrator Reference Manual (ARM).
45
(Gitlab #3346)
56

67
2244. [func] mgodzina

doc/sphinx/arm/dhcp4-srv.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7765,7 +7765,7 @@ The following standards are currently supported in Kea:
77657765
`RFC 3396 <https://tools.ietf.org/html/rfc3396>`__: The Kea server can both
77667766
receive and send long options. The long options can be configured and Kea
77677767
will send them as separate instances if the payload length is longer than
7768-
255 octects.
7768+
255 octets.
77697769

77707770
- *Dynamic Host Configuration Protocol (DHCP) Domain Search Option*, `RFC 3397
77717771
<https://tools.ietf.org/html/rfc3397>`__: The option is supported.
@@ -7805,7 +7805,7 @@ The following standards are currently supported in Kea:
78057805

78067806
- *Dynamic Host Configuration Protocol (DHCP) Leasequery*, `RFC 4388
78077807
<https://datatracker.ietf.org/doc/html/rfc4388>`__: The server functionality
7808-
is supported. This requires leasequery hook.
7808+
is supported. This requires leasequery hook. See :ref:`hooks-lease-query` for details.
78097809

78107810
- *Dynamic Host Configuration Protocol (DHCP) Options for the Intel Preboot
78117811
eXecution Environment (PXE)*, `RFC 4578
@@ -7855,7 +7855,7 @@ The following standards are currently supported in Kea:
78557855

78567856
- *DHCPv4 Lease Query by Relay Agent Remote ID*, `RFC 6148
78577857
<https://tools.ietf.org/html/rfc6148>`__: The leasequery by remote-id is
7858-
supported. This requires leasequery hook.
7858+
supported. This requires leasequery hook. See :ref:`hooks-lease-query` for details.
78597859

78607860
- *Client Identifier Option in DHCP Server Replies*, `RFC 6842
78617861
<https://tools.ietf.org/html/rfc6842>`__: The server by default sends back
@@ -7869,7 +7869,7 @@ The following standards are currently supported in Kea:
78697869

78707870
- *DHCPv4 Bulk Leasequery*, `RFC 6926 <https://tools.ietf.org/html/rfc6926>`__: The
78717871
server functionality (TCP connections, new query types, multiple responses, etc.)
7872-
is supported. This requires leasequery hook.
7872+
is supported. This requires leasequery hook. See :ref:`hooks-lease-query` for details.
78737873

78747874
- *Generalized UDP Source Port for the DHCP Relay Agent Option*, `RFC 8357
78757875
<https://tools.ietf.org/html/rfc8357>`__: The Kea server handles the Relay

doc/sphinx/arm/dhcp6-srv.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7589,7 +7589,7 @@ The following standards are currently supported in Kea:
75897589

75907590
- *DHCPv6 Leasequery*: `RFC 5007 <https://tools.ietf.org/html/rfc5007>`__: The
75917591
server functionality (message types, options) is supported. This requires
7592-
the leasequery hook.
7592+
the leasequery hook. See :ref:`hooks-lease-query` for details.
75937593

75947594
- *DHCP Options for Protocol for Carrying Authentication for Network Access
75957595
(PANA) Authentication Agents*: `RFC 5192 <https://tools.ietf.org/html/rfc5192>`__:
@@ -7605,7 +7605,8 @@ The following standards are currently supported in Kea:
76057605

76067606
- *DHCPv6 Bulk Leasequery*: `RFC 5460 <https://tools.ietf.org/html/rfc5460>`__:
76077607
The server functionality (TCP connection, new message types and options, new
7608-
query types) is supported. This requires the leasequery hook.
7608+
query types) is supported. This requires the leasequery hook. See
7609+
:ref:`hooks-lease-query` for details.
76097610

76107611
- *DHCPv6 Options for Network Boot*: `RFC 5970 <https://tools.ietf.org/html/rfc5970>`__:
76117612
The network boot options are supported.
@@ -7636,7 +7637,7 @@ The following standards are currently supported in Kea:
76367637
the client link-layer address option.
76377638

76387639
- *Modification to Default values of SOL_MAX_RT and INF_MAX_RT*, `RFC 7083
7639-
<https://www.rfc-editor.org/rfc/rfc7083.html>`__: The new options are
7640+
<https://tools.ietf.org/html/rfc7083>`__: The new options are
76407641
supported.
76417642

76427643
- *Issues and Recommendations with Multiple Stateful DHCPv6 Options*,

src/lib/dhcp/dhcp4.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ enum DHCPOptionType {
176176
// URL option was replaced with captive portal.
177177
// DHO_URL = 114, /* RFC3679 */
178178
DHO_V4_CAPTIVE_PORTAL = 114, /* RFC8910 */
179-
180179
// 115 is removed/unassigned
181180
DHO_AUTO_CONFIG = 116, /* RFC2563 */
182181
DHO_NAME_SERVICE_SEARCH = 117, /* RFC2937 */
@@ -227,7 +226,6 @@ enum DHCPOptionType {
227226
// DHO_VSS = 221, /* RFC6607 */
228227
// 222-223 are removed/unassigned
229228
// 224-254 are reserved for private use
230-
231229
DHO_END = 255 /* RFC2132 */
232230
};
233231

@@ -249,7 +247,7 @@ enum DHCPMessageType {
249247
DHCPLEASEACTIVE = 13,
250248
DHCPBULKLEASEQUERY = 14,
251249
DHCPLEASEQUERYDONE = 15,
252-
// DHCPACTIVELEASEQUERY = 16,
250+
// DHCPACTIVELEASEQUERY = 16,
253251
DHCPLEASEQUERYSTATUS = 17,
254252
DHCPTLS = 18,
255253
DHCP_TYPES_EOF

0 commit comments

Comments
 (0)