summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog12
-rw-r--r--changelog_unreleased/3506-unix-control-socket3
-rw-r--r--changelog_unreleased/3566-doxygen5
-rw-r--r--doc/sphinx/debug-messages.rst2
-rw-r--r--doc/sphinx/grammar/grammar-dhcp6-parser.rst3
-rw-r--r--doc/sphinx/kea-messages.rst34
-rw-r--r--src/bin/agent/ca_cfg_mgr.h2
-rw-r--r--src/bin/dhcp6/location.hh1
-rw-r--r--src/hooks/dhcp/mysql_hb/mysql_host_data_source.h2
-rw-r--r--src/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc2
-rw-r--r--src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h2
-rw-r--r--src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc2
-rw-r--r--src/lib/config/command-socket.dox2
-rw-r--r--src/lib/dhcpsrv/dhcpsrv_messages.mes28
-rw-r--r--src/lib/dhcpsrv/host_data_source_factory.h2
-rw-r--r--src/lib/dhcpsrv/lease_mgr_factory.h2
-rw-r--r--src/lib/dhcpsrv/tests/alloc_engine_hooks_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/tests/cfg_db_access_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/tests/host_data_source_factory_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/tests/iterative_allocator_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/tests/random_allocator_unittest.cc2
-rw-r--r--src/lib/dhcpsrv/testutils/alloc_engine_utils.h2
-rw-r--r--src/lib/dhcpsrv/tracking_lease_mgr.h2
-rw-r--r--src/lib/util/multi_threading_mgr.h2
25 files changed, 81 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog
index 44425df55b..bd68149ae4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Kea 2.7.3 (development) released on August 25, 2024
+
+2286. [func] fdupont
+ Reorganized UNIX control socket code.
+ (Gitlab #3506)
+
+2285. [build] tomek
+ Changed image type in the Developer's guide from PNG to SVG.
+ This drastically reduced the size of the generated docs
+ (from 2.7GB to 560MB).
+ (Gitlab #3566)
+
2284. [build] razvan
The library version numbers have been bumped up for the Kea 2.7.3
development release.
diff --git a/changelog_unreleased/3506-unix-control-socket b/changelog_unreleased/3506-unix-control-socket
deleted file mode 100644
index 37773b90be..0000000000
--- a/changelog_unreleased/3506-unix-control-socket
+++ /dev/null
@@ -1,3 +0,0 @@
-[func] fdupont
- Reorganized UNIX control socket code.
- (Gitlab #3506)
diff --git a/changelog_unreleased/3566-doxygen b/changelog_unreleased/3566-doxygen
deleted file mode 100644
index 9552d30821..0000000000
--- a/changelog_unreleased/3566-doxygen
+++ /dev/null
@@ -1,5 +0,0 @@
-[build] tomek
- Changed image type in the Developer's guide from PNG to SVG.
- This drastically reduced the size of the generated docs
- (from 2.7GB to 560MB).
- (Gitlab #3566)
diff --git a/doc/sphinx/debug-messages.rst b/doc/sphinx/debug-messages.rst
index 830de7f8e5..5c71ff85b3 100644
--- a/doc/sphinx/debug-messages.rst
+++ b/doc/sphinx/debug-messages.rst
@@ -242,6 +242,8 @@ Messages printed on debuglevel 40
- DHCPSRV_HOOK_LEASE6_SELECT_SKIP
- DHCPSRV_LEASE4_EXTENDED_INFO_UPGRADED
- DHCPSRV_LEASE6_EXTENDED_INFO_UPGRADED
+- DHCPSRV_LEASE_MGR_BACKEND_DEREGISTER
+- DHCPSRV_LEASE_MGR_BACKEND_REGISTER
- DHCPSRV_MEMFILE_BEGIN_BUILD_EXTENDED_INFO_TABLES6
- DHCPSRV_MEMFILE_BEGIN_EXTRACT_EXTENDED_INFO4
- DHCPSRV_MEMFILE_EXTRACT_EXTENDED_INFO4
diff --git a/doc/sphinx/grammar/grammar-dhcp6-parser.rst b/doc/sphinx/grammar/grammar-dhcp6-parser.rst
index b8ca9b9e3b..22d8402329 100644
--- a/doc/sphinx/grammar/grammar-dhcp6-parser.rst
+++ b/doc/sphinx/grammar/grammar-dhcp6-parser.rst
@@ -814,6 +814,7 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
| reservation_client_classes
| ip_addresses
| prefixes
+ | excluded_prefixes
| hw_address
| hostname
| flex_id_value
@@ -826,6 +827,8 @@ This grammar is generated from ``dhcp6_parser.yy``. See :ref:`dhcp6` for more de
prefixes ::= "prefixes" ":" list_strings
+ excluded_prefixes ::= "excluded-prefixes" ":" list_strings
+
duid ::= "duid" ":" STRING
hw_address ::= "hw-address" ":" STRING
diff --git a/doc/sphinx/kea-messages.rst b/doc/sphinx/kea-messages.rst
index dabd18c758..1cec061f61 100644
--- a/doc/sphinx/kea-messages.rst
+++ b/doc/sphinx/kea-messages.rst
@@ -8790,6 +8790,38 @@ DHCPSRV_LEASE6_EXTENDED_INFO_UPGRADED
Logged at debug log level 40.
This debug message is printed when a lease extended info was upgraded.
+DHCPSRV_LEASE_MGR_BACKENDS_REGISTERED
+=====================================
+
+.. code-block:: text
+
+ the following lease backend types are available: %1
+
+This informational message lists all possible lease backends that could
+be used in lease-database.
+
+DHCPSRV_LEASE_MGR_BACKEND_DEREGISTER
+====================================
+
+.. code-block:: text
+
+ deregistered lease backend type: %1
+
+Logged at debug log level 40.
+This debug message is issued when a backend factory was deregistered.
+It is no longer possible to use lease backend of this type.
+
+DHCPSRV_LEASE_MGR_BACKEND_REGISTER
+==================================
+
+.. code-block:: text
+
+ registered lease backend type: %1
+
+Logged at debug log level 40.
+This debug message is issued when a backend factory was successfully
+registered. It is now possible to use lease backend of this type.
+
DHCPSRV_LEASE_MGR_CALLBACK_EXCEPTION
====================================
@@ -16920,7 +16952,7 @@ HTTP_COMMAND_MGR_IGNORED_TLS_SETUP_CHANGES
The warning message is issued when the HTTP/HTTPS control socket was
reconfigured with a different TLS setup but keeping the address and port.
These changes are ignored because they can't be applied without opening a new
-socket which will conflicts with the existing one.
+socket which will conflict with the existing one.
HTTP_COMMAND_MGR_SERVICE_STARTED
================================
diff --git a/src/bin/agent/ca_cfg_mgr.h b/src/bin/agent/ca_cfg_mgr.h
index 1cbfa82837..dbd841e15c 100644
--- a/src/bin/agent/ca_cfg_mgr.h
+++ b/src/bin/agent/ca_cfg_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 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/bin/dhcp6/location.hh b/src/bin/dhcp6/location.hh
index 4d329f3aaf..4fb140a70e 100644
--- a/src/bin/dhcp6/location.hh
+++ b/src/bin/dhcp6/location.hh
@@ -1,4 +1,3 @@
-// Generated 202409030818
// A Bison parser, made by GNU Bison 3.8.2.
// Locations for Bison parsers in C++
diff --git a/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h b/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h
index 390eb9cb18..e77be063aa 100644
--- a/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h
+++ b/src/hooks/dhcp/mysql_hb/mysql_host_data_source.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc b/src/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc
index 48e2a71240..27fac2c033 100644
--- a/src/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc
+++ b/src/hooks/dhcp/mysql_lb/tests/mysql_lease_extended_info_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2024 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/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h b/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h
index 83e40a5c97..6fe55fdc1b 100644
--- a/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h
+++ b/src/hooks/dhcp/pgsql_hb/pgsql_host_data_source.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 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/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc b/src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc
index 2d185874ce..7beb55ca1c 100644
--- a/src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc
+++ b/src/hooks/dhcp/pgsql_lb/tests/pgsql_lease_extended_info_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2024 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/config/command-socket.dox b/src/lib/config/command-socket.dox
index 7413746576..afa6c5f393 100644
--- a/src/lib/config/command-socket.dox
+++ b/src/lib/config/command-socket.dox
@@ -74,7 +74,7 @@ You then can type JSON commands and get responses (also in JSON format).
2. Here's an example C code that connects and gets a list of supported commands:
@code
-// Copyright (C) 2015-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index eb184e5648..bbebc4ce7a 100644
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -385,6 +385,20 @@ the extended info deleted from the lease user context.
Logged at debug log level 40.
This debug message is printed when a lease extended info was upgraded.
+% DHCPSRV_LEASE_MGR_BACKENDS_REGISTERED the following lease backend types are available: %1
+This informational message lists all possible lease backends that could
+be used in lease-database.
+
+% DHCPSRV_LEASE_MGR_BACKEND_DEREGISTER deregistered lease backend type: %1
+Logged at debug log level 40.
+This debug message is issued when a backend factory was deregistered.
+It is no longer possible to use lease backend of this type.
+
+% DHCPSRV_LEASE_MGR_BACKEND_REGISTER registered lease backend type: %1
+Logged at debug log level 40.
+This debug message is issued when a backend factory was successfully
+registered. It is now possible to use lease backend of this type.
+
% DHCPSRV_LEASE_MGR_CALLBACK_EXCEPTION exception occurred in a lease manager callback for callback type %1, subnet id %2, and lease %3: %4
This warning message is printed when one of the callback functions registered
in the lease manager causes an error. The callback functions can serve
@@ -410,20 +424,6 @@ the lease database. The operation started a retry to connect procedure.
The database access string with password redacted is logged, along with the
error and details for the reconnect procedure.
-% DHCPSRV_LEASE_MGR_BACKENDS_REGISTERED the following lease backend types are available: %1
-This informational message lists all possible lease backends that could
-be used in lease-database.
-
-% DHCPSRV_LEASE_MGR_BACKEND_DEREGISTER deregistered lease backend type: %1
-Logged at debug log level 40.
-This debug message is issued when a backend factory was deregistered.
-It is no longer possible to use lease backend of this type.
-
-% DHCPSRV_LEASE_MGR_BACKEND_REGISTER registered lease backend type: %1
-Logged at debug log level 40.
-This debug message is issued when a backend factory was successfully
-registered. It is now possible to use lease backend of this type.
-
% DHCPSRV_LEASE_SANITY_FAIL The lease %1 with subnet-id %2 failed subnet-id checks (%3).
This warning message is printed when the lease being loaded does not match the
configuration. Due to lease-checks value, the lease will be loaded, but
diff --git a/src/lib/dhcpsrv/host_data_source_factory.h b/src/lib/dhcpsrv/host_data_source_factory.h
index 0600064dff..b563c8f6fc 100644
--- a/src/lib/dhcpsrv/host_data_source_factory.h
+++ b/src/lib/dhcpsrv/host_data_source_factory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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/dhcpsrv/lease_mgr_factory.h b/src/lib/dhcpsrv/lease_mgr_factory.h
index a08a926a4b..6db39b029d 100644
--- a/src/lib/dhcpsrv/lease_mgr_factory.h
+++ b/src/lib/dhcpsrv/lease_mgr_factory.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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/dhcpsrv/tests/alloc_engine_hooks_unittest.cc b/src/lib/dhcpsrv/tests/alloc_engine_hooks_unittest.cc
index 4bbb320a67..e9c5a45804 100644
--- a/src/lib/dhcpsrv/tests/alloc_engine_hooks_unittest.cc
+++ b/src/lib/dhcpsrv/tests/alloc_engine_hooks_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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/dhcpsrv/tests/cfg_db_access_unittest.cc b/src/lib/dhcpsrv/tests/cfg_db_access_unittest.cc
index c97be45d89..a465f41bc3 100644
--- a/src/lib/dhcpsrv/tests/cfg_db_access_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfg_db_access_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2016-2024 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/dhcpsrv/tests/host_data_source_factory_unittest.cc b/src/lib/dhcpsrv/tests/host_data_source_factory_unittest.cc
index 1d05896049..22d65d4c58 100644
--- a/src/lib/dhcpsrv/tests/host_data_source_factory_unittest.cc
+++ b/src/lib/dhcpsrv/tests/host_data_source_factory_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 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/dhcpsrv/tests/iterative_allocator_unittest.cc b/src/lib/dhcpsrv/tests/iterative_allocator_unittest.cc
index 85525a1fc1..899ee8eacb 100644
--- a/src/lib/dhcpsrv/tests/iterative_allocator_unittest.cc
+++ b/src/lib/dhcpsrv/tests/iterative_allocator_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-2024 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/dhcpsrv/tests/lease_mgr_factory_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
index babf53abdb..f4741512f6 100644
--- a/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_mgr_factory_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2016 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2024 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/dhcpsrv/tests/random_allocator_unittest.cc b/src/lib/dhcpsrv/tests/random_allocator_unittest.cc
index 283b8de878..d257c4447e 100644
--- a/src/lib/dhcpsrv/tests/random_allocator_unittest.cc
+++ b/src/lib/dhcpsrv/tests/random_allocator_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2022-2024 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/dhcpsrv/testutils/alloc_engine_utils.h b/src/lib/dhcpsrv/testutils/alloc_engine_utils.h
index 756b92c7e5..90741f058c 100644
--- a/src/lib/dhcpsrv/testutils/alloc_engine_utils.h
+++ b/src/lib/dhcpsrv/testutils/alloc_engine_utils.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2015-2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2015-2024 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/dhcpsrv/tracking_lease_mgr.h b/src/lib/dhcpsrv/tracking_lease_mgr.h
index 13f2a67dd6..aa50e60934 100644
--- a/src/lib/dhcpsrv/tracking_lease_mgr.h
+++ b/src/lib/dhcpsrv/tracking_lease_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2023-2024 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.h b/src/lib/util/multi_threading_mgr.h
index f3da67bdde..f761f02eff 100644
--- a/src/lib/util/multi_threading_mgr.h
+++ b/src/lib/util/multi_threading_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2019-2024 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