[#3174] release changesKea-2.5.4

9 files changed, 65 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index 269e49449e..089114e18b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,17 @@
-2193.	[build]		razvan
+Kea 2.5.4 (development) released on November 29, 2023
+
+2194.	[build]		razvan
 	The library version numbers have been bumped up for the Kea 2.5.4
 	development release.
 	(Gitlab #3173)
 
+2193.	[func]		tmark, piotrek
+	The ping-check hook library is now functional.  It provides
+	the ability of kea-dhcp4 to check the availability of an
+	address prior to offering it to a client using ICMP ECHO
+	REQUESTs.
+	(Gitlab #3084)
+
 2192.	[func]		razvan
 	The packet logging is now more consistent between DHCPv4 and
 	DHCPv6. Also, extra details are now logged.
diff --git a/platforms.rst b/platforms.rst
index 0c6346c41b..7366137806 100644
--- a/platforms.rst
+++ b/platforms.rst
@@ -17,7 +17,7 @@ Regularly Tested Platforms
 Kea is officially supported on Alpine, Debian, Fedora, FreeBSD, RHEL, and Ubuntu
 systems. Kea-|release| builds have been tested on:
 
-* Alpine — 3.15, 3.16, 3.17
+* Alpine — 3.16, 3.17
 * Debian — 10, 11, 12
 * Fedora — 36, 37, 38
 * FreeBSD — 13
@@ -50,7 +50,7 @@ adverse effect on officially supported platforms.
 
 These include platforms past their respective EOL dates, such as:
 
-* Alpine — 3.10, 3.11, 3.12, 3.13, 3.14 (EOL 01 May 2023)
+* Alpine — 3.10, 3.11, 3.12, 3.13, 3.14, 3.15 (EOL 01 Nov 2023)
 * CentOS — 6 (EOL 30 November 2020), 7 (EOL 30 June 2024), 8 (EOL 31 December 2021)
 * Debian — 8, 9 (EOL 30 June 2022)
 * Fedora — 31, 32, 33, 34, 35 (EOL 13 December 2022)
diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes
index ba3392a76f..5818788a2f 100644
--- a/src/bin/dhcp4/dhcp4_messages.mes
+++ b/src/bin/dhcp4/dhcp4_messages.mes
@@ -452,6 +452,12 @@ for decline4 hook point and one of the callouts set next step status to DROP.
 The server will now abort processing of the packet as if it was never
 received. The lease will continue to be assigned to this client.
 
+% DHCP4_HOOK_LEASE4_OFFER_ARGUMENT_MISSING hook callouts did not set an argument as expected %1 for %2
+This error message is printed when none of the callouts installed on the
+lease4_offer hook point set an expected argument in the callout status.
+This is a programming error in the installed hook libraries.  Details of
+the argument and the query in process at the time are provided log arguments.
+
 % DHCP4_HOOK_LEASE4_OFFER_DROP %1: packet is dropped, because a callout set the next step to DROP
 This debug message is printed when a callout installed on the lease4_offer
 hook point sets the next step to DROP.
@@ -961,6 +967,41 @@ generated hostname.
 The DHCPv4 server has encountered a fatal error and is terminating.
 The reason for the failure is included in the message.
 
+% DHCP4_SERVER_INITIATED_DECLINE Lease for addr %1 has been found to be already in use. The lease will be unavailable for %2 seconds.
+This informational message is printed when the server has detected via
+ICMP ECHO (i.e. ping check) or other means that a lease which should be
+free to offer is actually in use. This message may indicate a misconfiguration
+in a network or more likely a device that is using an address that it is not
+supposed to use. The server will fully recover from this situation, but if
+the underlying problem of a misconfigured or rogue device is not solved, this
+address may be declined again in the future.
+
+% DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED %1: error adding a lease for address %2
+This error message indicates that the server failed to add a DECLINED lease to
+the lease store. The first argument includes the client and the transaction
+identification information. The second argument holds the IPv4 address for which
+the decline was attempted.
+
+% DHCP4_SERVER_INITIATED_DECLINE_FAILED %1: error on server-initiated decline lease for address %2: %3
+This error message indicates that the software failed to decline a
+lease from the lease database due to an error during a database
+operation. The first argument includes the client and the transaction
+identification information. The second argument holds the IPv4 address
+for which the decline was attempted. The last one contains the reason of
+failure.
+
+% DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY %1: error declining a lease for address %2
+This error message indicates that while one server thread was attempting to mark
+a lease as DECLINED, it was already locked by another thread. The first argument
+includes the client and the transaction identification information.  The second
+argument holds the IPv4 address for which the decline was attempted.
+
+% DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED %1: error updating lease for address %2
+This error message indicates that the server failed to update a lease in the
+lease store to the DECLINED state. The first argument includes the client and
+the transaction identification information. The second argument holds the IPv4
+address for which the decline was attempted.
+
 % DHCP4_SHUTDOWN server shutdown
 The DHCPv4 server has terminated normally.
 
@@ -1056,44 +1097,3 @@ option (if present).
 % DHCP6_DHCP4O6_PACKET_RECEIVED received DHCPv4o6 packet from DHCPv6 server (type %1) for %2 port %3 on interface %4
 This debug message is printed when the server is receiving a DHCPv4o6
 from the DHCPv6 server over inter-process communication.
-
-% DHCP4_SERVER_INITIATED_DECLINE_FAILED %1: error on server-initiated decline lease for address %2: %3
-This error message indicates that the software failed to decline a
-lease from the lease database due to an error during a database
-operation. The first argument includes the client and the transaction
-identification information. The second argument holds the IPv4 address
-for which the decline was attempted. The last one contains the reason of
-failure.
-
-% DHCP4_HOOK_LEASE4_OFFER_ARGUMENT_MISSING hook callouts did not set an argument as expected %1 for %2
-This error message is printed when none of the callouts installed on the
-lease4_offer hook point set an expected argument in the callout status.
-This is a programming error in the installed hook libraries.  Details of
-the argument and the query in process at the time are provided log arguments.
-
-% DHCP4_SERVER_INITIATED_DECLINE Lease for addr %1 has been found to be already in use. The lease will be unavailable for %2 seconds.
-This informational message is printed when the server has detected via
-ICMP ECHO (i.e. ping check) or other means that a lease which should be
-free to offer is actually in use. This message may indicate a misconfiguration
-in a network or more likely a device that is using an address that it is not
-supposed to use. The server will fully recover from this situation, but if
-the underlying problem of a misconfigured or rogue device is not solved, this
-address may be declined again in the future.
-
-% DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED %1: error updating lease for address %2
-This error message indicates that the server failed to update a lease in the
-lease store to the DECLINED state. The first argument includes the client and
-the transaction identification information. The second argument holds the IPv4
-address for which the decline was attempted.
-
-% DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED %1: error adding a lease for address %2
-This error message indicates that the server failed to add a DECLINED lease to
-the lease store. The first argument includes the client and the transaction
-identification information. The second argument holds the IPv4 address for which
-the decline was attempted.
-
-% DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY %1: error declining a lease for address %2
-This error message indicates that while one server thread was attempting to mark
-a lease as DECLINED, it was already locked by another thread. The first argument
-includes the client and the transaction identification information.  The second
-argument holds the IPv4 address for which the decline was attempted.
diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index fa5df89661..288663b9e6 100644
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -326,6 +326,13 @@ the message.
 This debug message is printed when the server is receiving a DHCPv4o6
 from the DHCPv4 server over inter-process communication socket.
 
+% DHCP6_DHCP4O6_RESPONSE_DATA %1: responding with packet %2 (type %3), packet details: %4
+A debug message including the detailed data about the packet being sent
+to the client. The first argument contains the client and the transaction
+identification information. The second and third argument contains the
+packet name and type respectively. The fourth argument contains detailed
+packet information.
+
 % DHCP6_DHCP4O6_SEND_FAIL failed to send DHCPv4o6 packet: %1
 This error is output if the IPv6 DHCP server fails to send an assembled
 DHCPv4o6 message to a client. The reason for the error is included in the
@@ -943,13 +950,6 @@ identification information. The second and third argument contains the
 packet name and type respectively. The fourth argument contains detailed
 packet information.
 
-% DHCP6_DHCP4O6_RESPONSE_DATA %1: responding with packet %2 (type %3), packet details: %4
-A debug message including the detailed data about the packet being sent
-to the client. The first argument contains the client and the transaction
-identification information. The second and third argument contains the
-packet name and type respectively. The fourth argument contains detailed
-packet information.
-
 % DHCP6_SERVER_FAILED server failed: %1
 The IPv6 DHCP server has encountered a fatal error and is terminating.
 The reason for the failure is included in the message.
diff --git a/src/bin/dhcp6/dhcp6to4_ipc.cc b/src/bin/dhcp6/dhcp6to4_ipc.cc
index 504f63f693..6a1ca08abd 100644
--- a/src/bin/dhcp6/dhcp6to4_ipc.cc
+++ b/src/bin/dhcp6/dhcp6to4_ipc.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/dhcp/pkt6.cc b/src/lib/dhcp/pkt6.cc
index b32d47c1a7..6ab5894250 100644
--- a/src/lib/dhcp/pkt6.cc
+++ b/src/lib/dhcp/pkt6.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2011-2023 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/util/multi_threading_mgr.cc b/src/lib/util/multi_threading_mgr.cc
index 4079cc2684..043b42d5a4 100644
--- a/src/lib/util/multi_threading_mgr.cc
+++ b/src/lib/util/multi_threading_mgr.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-2023 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/util/tests/thread_pool_unittest.cc b/src/lib/util/tests/thread_pool_unittest.cc
index 4fa88d9265..270deefa1d 100644
--- a/src/lib/util/tests/thread_pool_unittest.cc
+++ b/src/lib/util/tests/thread_pool_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2023 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/src/lib/util/thread_pool.h b/src/lib/util/thread_pool.h
index 6807f530ab..82f6300dfe 100644
--- a/src/lib/util/thread_pool.h
+++ b/src/lib/util/thread_pool.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2023 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this