From: Razvan Becheriu Date: Wed, 22 May 2024 20:07:03 +0000 (+0300) Subject: [#2960] addressed comments X-Git-Tag: Kea-2.6.0~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4a474ce37f019471d37c161eceec1d5d4db402e;p=thirdparty%2Fkea.git [#2960] addressed comments --- diff --git a/ChangeLog b/ChangeLog index 488f4794dd..6015baaddb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2242. [func] razvan + Removed deprecated command: "libreload". + (Gitlab #2960) + 2241. [doc] tomek Several aspects of lease_cmds documentation were updated. The examples and error messages were corrected. diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc index 678f3aa48e..8354fb97b4 100644 --- a/src/bin/dhcp4/dhcp4_messages.cc +++ b/src/bin/dhcp4/dhcp4_messages.cc @@ -55,7 +55,6 @@ extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH = "DHCP4_DECLINE_L extern const isc::log::MessageID DHCP4_DECLINE_LEASE_NOT_FOUND = "DHCP4_DECLINE_LEASE_NOT_FOUND"; extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_MISSING = "DHCP4_DEFERRED_OPTION_MISSING"; extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_UNPACK_FAIL = "DHCP4_DEFERRED_OPTION_UNPACK_FAIL"; -extern const isc::log::MessageID DHCP4_DEPRECATED = "DHCP4_DEPRECATED"; extern const isc::log::MessageID DHCP4_DEVELOPMENT_VERSION = "DHCP4_DEVELOPMENT_VERSION"; extern const isc::log::MessageID DHCP4_DHCP4O6_BAD_PACKET = "DHCP4_DHCP4O6_BAD_PACKET"; extern const isc::log::MessageID DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP = "DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP"; @@ -243,7 +242,6 @@ const char* values[] = { "DHCP4_DECLINE_LEASE_NOT_FOUND", "Received DHCPDECLINE for addr %1 from client %2, but no such lease found.", "DHCP4_DEFERRED_OPTION_MISSING", "%1: cannot find deferred option code %2 in the query", "DHCP4_DEFERRED_OPTION_UNPACK_FAIL", "%1: An error unpacking the deferred option %2: %3", - "DHCP4_DEPRECATED", "The following mechanism is now deprecated and will be removed in the future: %1", "DHCP4_DEVELOPMENT_VERSION", "This software is a development branch of Kea. It is not recommended for production use.", "DHCP4_DHCP4O6_BAD_PACKET", "%1: received malformed DHCPv4o6 packet: %2", "DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP", "%1: packet was dropped, because a callout set the next step to 'drop'", diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h index 5c092aee89..af512461bd 100644 --- a/src/bin/dhcp4/dhcp4_messages.h +++ b/src/bin/dhcp4/dhcp4_messages.h @@ -56,7 +56,6 @@ extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH; extern const isc::log::MessageID DHCP4_DECLINE_LEASE_NOT_FOUND; extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_MISSING; extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_UNPACK_FAIL; -extern const isc::log::MessageID DHCP4_DEPRECATED; extern const isc::log::MessageID DHCP4_DEVELOPMENT_VERSION; extern const isc::log::MessageID DHCP4_DHCP4O6_BAD_PACKET; extern const isc::log::MessageID DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP; diff --git a/src/bin/dhcp4/dhcp4_messages.mes b/src/bin/dhcp4/dhcp4_messages.mes index 09e1555dbf..074d5a9303 100644 --- a/src/bin/dhcp4/dhcp4_messages.mes +++ b/src/bin/dhcp4/dhcp4_messages.mes @@ -290,11 +290,6 @@ A debug message issued when deferred unpacking of an option failed, making it to be left unpacked in the packet. The first argument is the option code, the second the error. -% DHCP4_DEPRECATED The following mechanism is now deprecated and will be removed in the future: %1 -The mechanism specified by parameter 1 is deprecated. It is functional, but -there is a plan to remove this capability in the future version. You -should plan your strategy to stop using it soon. - % DHCP4_DEVELOPMENT_VERSION This software is a development branch of Kea. It is not recommended for production use. This warning message is displayed when the version is a development (vs stable) one: the second number of the version is odd. diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc index 53ec6a2eed..6446065803 100644 --- a/src/bin/dhcp6/dhcp6_messages.cc +++ b/src/bin/dhcp6/dhcp6_messages.cc @@ -57,7 +57,6 @@ extern const isc::log::MessageID DHCP6_DECLINE_FAIL_LEASE_WITHOUT_DUID = "DHCP6_ extern const isc::log::MessageID DHCP6_DECLINE_FAIL_NO_LEASE = "DHCP6_DECLINE_FAIL_NO_LEASE"; extern const isc::log::MessageID DHCP6_DECLINE_LEASE = "DHCP6_DECLINE_LEASE"; extern const isc::log::MessageID DHCP6_DECLINE_PROCESS_IA = "DHCP6_DECLINE_PROCESS_IA"; -extern const isc::log::MessageID DHCP6_DEPRECATED = "DHCP6_DEPRECATED"; extern const isc::log::MessageID DHCP6_DEVELOPMENT_VERSION = "DHCP6_DEVELOPMENT_VERSION"; extern const isc::log::MessageID DHCP6_DHCP4O6_PACKET_RECEIVED = "DHCP6_DHCP4O6_PACKET_RECEIVED"; extern const isc::log::MessageID DHCP6_DHCP4O6_RECEIVE_FAIL = "DHCP6_DHCP4O6_RECEIVE_FAIL"; @@ -234,7 +233,6 @@ const char* values[] = { "DHCP6_DECLINE_FAIL_NO_LEASE", "Client %1 sent DECLINE for address %2, but there's no lease for it", "DHCP6_DECLINE_LEASE", "Client %1 sent DECLINE for address %2 and the server marked it as declined. The lease will be recovered in %3 seconds.", "DHCP6_DECLINE_PROCESS_IA", "Processing of IA (IAID: %1) from client %2 started.", - "DHCP6_DEPRECATED", "The following mechanism is now deprecated and will be removed in the future: %1", "DHCP6_DEVELOPMENT_VERSION", "This software is a development branch of Kea. It is not recommended for production use.", "DHCP6_DHCP4O6_PACKET_RECEIVED", "received DHCPv4o6 packet from DHCPv4 server (type %1) for %2 port %3 on interface %4", "DHCP6_DHCP4O6_RECEIVE_FAIL", "failed to receive DHCPv4o6: %1", diff --git a/src/bin/dhcp6/dhcp6_messages.h b/src/bin/dhcp6/dhcp6_messages.h index 70a37b8333..7e4f7b0b2f 100644 --- a/src/bin/dhcp6/dhcp6_messages.h +++ b/src/bin/dhcp6/dhcp6_messages.h @@ -58,7 +58,6 @@ extern const isc::log::MessageID DHCP6_DECLINE_FAIL_LEASE_WITHOUT_DUID; extern const isc::log::MessageID DHCP6_DECLINE_FAIL_NO_LEASE; extern const isc::log::MessageID DHCP6_DECLINE_LEASE; extern const isc::log::MessageID DHCP6_DECLINE_PROCESS_IA; -extern const isc::log::MessageID DHCP6_DEPRECATED; extern const isc::log::MessageID DHCP6_DEVELOPMENT_VERSION; extern const isc::log::MessageID DHCP6_DHCP4O6_PACKET_RECEIVED; extern const isc::log::MessageID DHCP6_DHCP4O6_RECEIVE_FAIL; diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes index 8027fefad1..bc055a6dfe 100644 --- a/src/bin/dhcp6/dhcp6_messages.mes +++ b/src/bin/dhcp6/dhcp6_messages.mes @@ -312,11 +312,6 @@ received in Decline message. It's expected that the option will contain an address that is being declined. Specific information will be printed in a separate message. -% DHCP6_DEPRECATED The following mechanism is now deprecated and will be removed in the future: %1 -The mechanism specified by parameter 1 is deprecated. It is functional, but -there is a plan to remove this capability in the future version. You -should plan your strategy to stop using it soon. - % DHCP6_DEVELOPMENT_VERSION This software is a development branch of Kea. It is not recommended for production use. This warning message is displayed when the version is a development (vs stable) one: the second number of the version is odd. diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc index 4d4a57f2e9..992f4d82ad 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.cc +++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc @@ -55,7 +55,6 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_ALLOCATOR = "DHCPSRV_CFGMGR_ extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_UNICAST = "DHCPSRV_CFGMGR_USE_UNICAST"; extern const isc::log::MessageID DHCPSRV_CLOSE_DB = "DHCPSRV_CLOSE_DB"; extern const isc::log::MessageID DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL = "DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL"; -extern const isc::log::MessageID DHCPSRV_DEPRECATED = "DHCPSRV_DEPRECATED"; extern const isc::log::MessageID DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET = "DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET"; extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION = "DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION"; extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_HANDLER_NULL = "DHCPSRV_DHCP_DDNS_HANDLER_NULL"; @@ -340,7 +339,6 @@ const char* values[] = { "DHCPSRV_CFGMGR_USE_UNICAST", "listening on unicast address %1, on interface %2", "DHCPSRV_CLOSE_DB", "closing currently open %1 database", "DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL", "ddns-ttl-percent %1 of lease lifetime %2 is too small, ignoring it", - "DHCPSRV_DEPRECATED", "This configuration is using a deprecated feature: %1", "DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET", "received bad DHCPv4o6 packet: %1", "DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION", "error handler for DHCP_DDNS IO generated an expected exception: %1", "DHCPSRV_DHCP_DDNS_HANDLER_NULL", "error handler for DHCP_DDNS IO is not set.", diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h index 40296633dc..9013e7e2d5 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.h +++ b/src/lib/dhcpsrv/dhcpsrv_messages.h @@ -56,7 +56,6 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_ALLOCATOR; extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_UNICAST; extern const isc::log::MessageID DHCPSRV_CLOSE_DB; extern const isc::log::MessageID DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL; -extern const isc::log::MessageID DHCPSRV_DEPRECATED; extern const isc::log::MessageID DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET; extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION; extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_HANDLER_NULL; diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes index 2398daff36..a132b414f6 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.mes +++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes @@ -288,13 +288,6 @@ the DDNS TTL as though ddsn-ttl-percent were not specified. The value of ddns-ttl-percent and the lease lifetime are shown in the message details. -% DHCPSRV_DEPRECATED This configuration is using a deprecated feature: %1 -This warning is printed every time a deprecated feature (identified by the parameter) is -used. A deprecated feature is functional now, but there will be a future Kea release -where it will be completely removed. If you see this message it's not a reason for panic, -but you should consider your long term strategy to eventually stop using the deprecated -feature. - % DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET received bad DHCPv4o6 packet: %1 A bad DHCPv4o6 packet was received.