Skip to content

Commit f4a474c

Browse files
author
Razvan Becheriu
committed
[#2960] addressed comments
1 parent 1214966 commit f4a474c

10 files changed

+4
-26
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2242. [func] razvan
2+
Removed deprecated command: "libreload".
3+
(Gitlab #2960)
4+
15
2241. [doc] tomek
26
Several aspects of lease_cmds documentation were updated.
37
The examples and error messages were corrected.

src/bin/dhcp4/dhcp4_messages.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH = "DHCP4_DECLINE_L
5555
extern const isc::log::MessageID DHCP4_DECLINE_LEASE_NOT_FOUND = "DHCP4_DECLINE_LEASE_NOT_FOUND";
5656
extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_MISSING = "DHCP4_DEFERRED_OPTION_MISSING";
5757
extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_UNPACK_FAIL = "DHCP4_DEFERRED_OPTION_UNPACK_FAIL";
58-
extern const isc::log::MessageID DHCP4_DEPRECATED = "DHCP4_DEPRECATED";
5958
extern const isc::log::MessageID DHCP4_DEVELOPMENT_VERSION = "DHCP4_DEVELOPMENT_VERSION";
6059
extern const isc::log::MessageID DHCP4_DHCP4O6_BAD_PACKET = "DHCP4_DHCP4O6_BAD_PACKET";
6160
extern const isc::log::MessageID DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP = "DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP";
@@ -243,7 +242,6 @@ const char* values[] = {
243242
"DHCP4_DECLINE_LEASE_NOT_FOUND", "Received DHCPDECLINE for addr %1 from client %2, but no such lease found.",
244243
"DHCP4_DEFERRED_OPTION_MISSING", "%1: cannot find deferred option code %2 in the query",
245244
"DHCP4_DEFERRED_OPTION_UNPACK_FAIL", "%1: An error unpacking the deferred option %2: %3",
246-
"DHCP4_DEPRECATED", "The following mechanism is now deprecated and will be removed in the future: %1",
247245
"DHCP4_DEVELOPMENT_VERSION", "This software is a development branch of Kea. It is not recommended for production use.",
248246
"DHCP4_DHCP4O6_BAD_PACKET", "%1: received malformed DHCPv4o6 packet: %2",
249247
"DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP", "%1: packet was dropped, because a callout set the next step to 'drop'",

src/bin/dhcp4/dhcp4_messages.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH;
5656
extern const isc::log::MessageID DHCP4_DECLINE_LEASE_NOT_FOUND;
5757
extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_MISSING;
5858
extern const isc::log::MessageID DHCP4_DEFERRED_OPTION_UNPACK_FAIL;
59-
extern const isc::log::MessageID DHCP4_DEPRECATED;
6059
extern const isc::log::MessageID DHCP4_DEVELOPMENT_VERSION;
6160
extern const isc::log::MessageID DHCP4_DHCP4O6_BAD_PACKET;
6261
extern const isc::log::MessageID DHCP4_DHCP4O6_HOOK_SUBNET4_SELECT_DROP;

src/bin/dhcp4/dhcp4_messages.mes

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,6 @@ A debug message issued when deferred unpacking of an option failed, making it
290290
to be left unpacked in the packet. The first argument is the option code,
291291
the second the error.
292292

293-
% DHCP4_DEPRECATED The following mechanism is now deprecated and will be removed in the future: %1
294-
The mechanism specified by parameter 1 is deprecated. It is functional, but
295-
there is a plan to remove this capability in the future version. You
296-
should plan your strategy to stop using it soon.
297-
298293
% DHCP4_DEVELOPMENT_VERSION This software is a development branch of Kea. It is not recommended for production use.
299294
This warning message is displayed when the version is a development
300295
(vs stable) one: the second number of the version is odd.

src/bin/dhcp6/dhcp6_messages.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ extern const isc::log::MessageID DHCP6_DECLINE_FAIL_LEASE_WITHOUT_DUID = "DHCP6_
5757
extern const isc::log::MessageID DHCP6_DECLINE_FAIL_NO_LEASE = "DHCP6_DECLINE_FAIL_NO_LEASE";
5858
extern const isc::log::MessageID DHCP6_DECLINE_LEASE = "DHCP6_DECLINE_LEASE";
5959
extern const isc::log::MessageID DHCP6_DECLINE_PROCESS_IA = "DHCP6_DECLINE_PROCESS_IA";
60-
extern const isc::log::MessageID DHCP6_DEPRECATED = "DHCP6_DEPRECATED";
6160
extern const isc::log::MessageID DHCP6_DEVELOPMENT_VERSION = "DHCP6_DEVELOPMENT_VERSION";
6261
extern const isc::log::MessageID DHCP6_DHCP4O6_PACKET_RECEIVED = "DHCP6_DHCP4O6_PACKET_RECEIVED";
6362
extern const isc::log::MessageID DHCP6_DHCP4O6_RECEIVE_FAIL = "DHCP6_DHCP4O6_RECEIVE_FAIL";
@@ -234,7 +233,6 @@ const char* values[] = {
234233
"DHCP6_DECLINE_FAIL_NO_LEASE", "Client %1 sent DECLINE for address %2, but there's no lease for it",
235234
"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.",
236235
"DHCP6_DECLINE_PROCESS_IA", "Processing of IA (IAID: %1) from client %2 started.",
237-
"DHCP6_DEPRECATED", "The following mechanism is now deprecated and will be removed in the future: %1",
238236
"DHCP6_DEVELOPMENT_VERSION", "This software is a development branch of Kea. It is not recommended for production use.",
239237
"DHCP6_DHCP4O6_PACKET_RECEIVED", "received DHCPv4o6 packet from DHCPv4 server (type %1) for %2 port %3 on interface %4",
240238
"DHCP6_DHCP4O6_RECEIVE_FAIL", "failed to receive DHCPv4o6: %1",

src/bin/dhcp6/dhcp6_messages.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ extern const isc::log::MessageID DHCP6_DECLINE_FAIL_LEASE_WITHOUT_DUID;
5858
extern const isc::log::MessageID DHCP6_DECLINE_FAIL_NO_LEASE;
5959
extern const isc::log::MessageID DHCP6_DECLINE_LEASE;
6060
extern const isc::log::MessageID DHCP6_DECLINE_PROCESS_IA;
61-
extern const isc::log::MessageID DHCP6_DEPRECATED;
6261
extern const isc::log::MessageID DHCP6_DEVELOPMENT_VERSION;
6362
extern const isc::log::MessageID DHCP6_DHCP4O6_PACKET_RECEIVED;
6463
extern const isc::log::MessageID DHCP6_DHCP4O6_RECEIVE_FAIL;

src/bin/dhcp6/dhcp6_messages.mes

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,6 @@ received in Decline message. It's expected that the option will contain an
312312
address that is being declined. Specific information will be printed in a
313313
separate message.
314314

315-
% DHCP6_DEPRECATED The following mechanism is now deprecated and will be removed in the future: %1
316-
The mechanism specified by parameter 1 is deprecated. It is functional, but
317-
there is a plan to remove this capability in the future version. You
318-
should plan your strategy to stop using it soon.
319-
320315
% DHCP6_DEVELOPMENT_VERSION This software is a development branch of Kea. It is not recommended for production use.
321316
This warning message is displayed when the version is a development
322317
(vs stable) one: the second number of the version is odd.

src/lib/dhcpsrv/dhcpsrv_messages.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_ALLOCATOR = "DHCPSRV_CFGMGR_
5555
extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_UNICAST = "DHCPSRV_CFGMGR_USE_UNICAST";
5656
extern const isc::log::MessageID DHCPSRV_CLOSE_DB = "DHCPSRV_CLOSE_DB";
5757
extern const isc::log::MessageID DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL = "DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL";
58-
extern const isc::log::MessageID DHCPSRV_DEPRECATED = "DHCPSRV_DEPRECATED";
5958
extern const isc::log::MessageID DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET = "DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET";
6059
extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION = "DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION";
6160
extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_HANDLER_NULL = "DHCPSRV_DHCP_DDNS_HANDLER_NULL";
@@ -340,7 +339,6 @@ const char* values[] = {
340339
"DHCPSRV_CFGMGR_USE_UNICAST", "listening on unicast address %1, on interface %2",
341340
"DHCPSRV_CLOSE_DB", "closing currently open %1 database",
342341
"DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL", "ddns-ttl-percent %1 of lease lifetime %2 is too small, ignoring it",
343-
"DHCPSRV_DEPRECATED", "This configuration is using a deprecated feature: %1",
344342
"DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET", "received bad DHCPv4o6 packet: %1",
345343
"DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION", "error handler for DHCP_DDNS IO generated an expected exception: %1",
346344
"DHCPSRV_DHCP_DDNS_HANDLER_NULL", "error handler for DHCP_DDNS IO is not set.",

src/lib/dhcpsrv/dhcpsrv_messages.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_ALLOCATOR;
5656
extern const isc::log::MessageID DHCPSRV_CFGMGR_USE_UNICAST;
5757
extern const isc::log::MessageID DHCPSRV_CLOSE_DB;
5858
extern const isc::log::MessageID DHCPSRV_DDNS_TTL_PERCENT_TOO_SMALL;
59-
extern const isc::log::MessageID DHCPSRV_DEPRECATED;
6059
extern const isc::log::MessageID DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET;
6160
extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_ERROR_EXCEPTION;
6261
extern const isc::log::MessageID DHCPSRV_DHCP_DDNS_HANDLER_NULL;

src/lib/dhcpsrv/dhcpsrv_messages.mes

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -288,13 +288,6 @@ the DDNS TTL as though ddsn-ttl-percent were not specified. The
288288
value of ddns-ttl-percent and the lease lifetime are shown in
289289
the message details.
290290

291-
% DHCPSRV_DEPRECATED This configuration is using a deprecated feature: %1
292-
This warning is printed every time a deprecated feature (identified by the parameter) is
293-
used. A deprecated feature is functional now, but there will be a future Kea release
294-
where it will be completely removed. If you see this message it's not a reason for panic,
295-
but you should consider your long term strategy to eventually stop using the deprecated
296-
feature.
297-
298291
% DHCPSRV_DHCP4O6_RECEIVED_BAD_PACKET received bad DHCPv4o6 packet: %1
299292
A bad DHCPv4o6 packet was received.
300293

0 commit comments

Comments
 (0)