Skip to content

Commit 2fc4f40

Browse files
committed
[#1723] regenerate messages
1 parent cd41c2e commit 2fc4f40

25 files changed

+2
-233
lines changed

src/bin/dhcp4/dhcp4_messages.cc

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
namespace isc {
88
namespace dhcp {
99

10-
extern const isc::log::MessageID DHCP4_ACTIVATE_INTERFACE = "DHCP4_ACTIVATE_INTERFACE";
1110
extern const isc::log::MessageID DHCP4_ALREADY_RUNNING = "DHCP4_ALREADY_RUNNING";
1211
extern const isc::log::MessageID DHCP4_BUFFER_RECEIVED = "DHCP4_BUFFER_RECEIVED";
1312
extern const isc::log::MessageID DHCP4_BUFFER_RECEIVE_FAIL = "DHCP4_BUFFER_RECEIVE_FAIL";
@@ -30,24 +29,19 @@ extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_MALFORMED = "DHCP4_CLIENT
3029
extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_PROCESS = "DHCP4_CLIENT_HOSTNAME_PROCESS";
3130
extern const isc::log::MessageID DHCP4_CLIENT_NAME_PROC_FAIL = "DHCP4_CLIENT_NAME_PROC_FAIL";
3231
extern const isc::log::MessageID DHCP4_CONFIG_COMPLETE = "DHCP4_CONFIG_COMPLETE";
33-
extern const isc::log::MessageID DHCP4_CONFIG_FETCH = "DHCP4_CONFIG_FETCH";
3432
extern const isc::log::MessageID DHCP4_CONFIG_LOAD_FAIL = "DHCP4_CONFIG_LOAD_FAIL";
35-
extern const isc::log::MessageID DHCP4_CONFIG_NEW_SUBNET = "DHCP4_CONFIG_NEW_SUBNET";
36-
extern const isc::log::MessageID DHCP4_CONFIG_OPTION_DUPLICATE = "DHCP4_CONFIG_OPTION_DUPLICATE";
3733
extern const isc::log::MessageID DHCP4_CONFIG_PACKET_QUEUE = "DHCP4_CONFIG_PACKET_QUEUE";
3834
extern const isc::log::MessageID DHCP4_CONFIG_RECEIVED = "DHCP4_CONFIG_RECEIVED";
3935
extern const isc::log::MessageID DHCP4_CONFIG_START = "DHCP4_CONFIG_START";
4036
extern const isc::log::MessageID DHCP4_CONFIG_SYNTAX_WARNING = "DHCP4_CONFIG_SYNTAX_WARNING";
4137
extern const isc::log::MessageID DHCP4_CONFIG_UNRECOVERABLE_ERROR = "DHCP4_CONFIG_UNRECOVERABLE_ERROR";
4238
extern const isc::log::MessageID DHCP4_CONFIG_UNSUPPORTED_OBJECT = "DHCP4_CONFIG_UNSUPPORTED_OBJECT";
43-
extern const isc::log::MessageID DHCP4_CONFIG_UPDATE = "DHCP4_CONFIG_UPDATE";
4439
extern const isc::log::MessageID DHCP4_DB_RECONNECT_DISABLED = "DHCP4_DB_RECONNECT_DISABLED";
4540
extern const isc::log::MessageID DHCP4_DB_RECONNECT_FAILED = "DHCP4_DB_RECONNECT_FAILED";
4641
extern const isc::log::MessageID DHCP4_DB_RECONNECT_LOST_CONNECTION = "DHCP4_DB_RECONNECT_LOST_CONNECTION";
4742
extern const isc::log::MessageID DHCP4_DB_RECONNECT_NO_DB_CTL = "DHCP4_DB_RECONNECT_NO_DB_CTL";
4843
extern const isc::log::MessageID DHCP4_DB_RECONNECT_SUCCEEDED = "DHCP4_DB_RECONNECT_SUCCEEDED";
4944
extern const isc::log::MessageID DHCP4_DDNS_REQUEST_SEND_FAILED = "DHCP4_DDNS_REQUEST_SEND_FAILED";
50-
extern const isc::log::MessageID DHCP4_DEACTIVATE_INTERFACE = "DHCP4_DEACTIVATE_INTERFACE";
5145
extern const isc::log::MessageID DHCP4_DECLINE_FAIL = "DHCP4_DECLINE_FAIL";
5246
extern const isc::log::MessageID DHCP4_DECLINE_LEASE = "DHCP4_DECLINE_LEASE";
5347
extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH = "DHCP4_DECLINE_LEASE_MISMATCH";
@@ -74,7 +68,6 @@ extern const isc::log::MessageID DHCP4_DYNAMIC_RECONFIGURATION_SUCCESS = "DHCP4_
7468
extern const isc::log::MessageID DHCP4_EMPTY_HOSTNAME = "DHCP4_EMPTY_HOSTNAME";
7569
extern const isc::log::MessageID DHCP4_FLEX_ID = "DHCP4_FLEX_ID";
7670
extern const isc::log::MessageID DHCP4_GENERATE_FQDN = "DHCP4_GENERATE_FQDN";
77-
extern const isc::log::MessageID DHCP4_HANDLE_SIGNAL_EXCEPTION = "DHCP4_HANDLE_SIGNAL_EXCEPTION";
7871
extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_DROP = "DHCP4_HOOK_BUFFER_RCVD_DROP";
7972
extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_SKIP = "DHCP4_HOOK_BUFFER_RCVD_SKIP";
8073
extern const isc::log::MessageID DHCP4_HOOK_BUFFER_SEND_SKIP = "DHCP4_HOOK_BUFFER_SEND_SKIP";
@@ -106,12 +99,9 @@ extern const isc::log::MessageID DHCP4_MULTI_THREADING_INFO = "DHCP4_MULTI_THREA
10699
extern const isc::log::MessageID DHCP4_NCR_CREATION_FAILED = "DHCP4_NCR_CREATION_FAILED";
107100
extern const isc::log::MessageID DHCP4_NOT_RUNNING = "DHCP4_NOT_RUNNING";
108101
extern const isc::log::MessageID DHCP4_NO_LEASE_INIT_REBOOT = "DHCP4_NO_LEASE_INIT_REBOOT";
109-
extern const isc::log::MessageID DHCP4_NO_SOCKETS_OPEN = "DHCP4_NO_SOCKETS_OPEN";
110-
extern const isc::log::MessageID DHCP4_OPEN_CONFIG_DB = "DHCP4_OPEN_CONFIG_DB";
111102
extern const isc::log::MessageID DHCP4_OPEN_SOCKET = "DHCP4_OPEN_SOCKET";
112103
extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_FAILED = "DHCP4_OPEN_SOCKETS_FAILED";
113104
extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL = "DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL";
114-
extern const isc::log::MessageID DHCP4_OPEN_SOCKET_FAIL = "DHCP4_OPEN_SOCKET_FAIL";
115105
extern const isc::log::MessageID DHCP4_PACKET_DROP_0001 = "DHCP4_PACKET_DROP_0001";
116106
extern const isc::log::MessageID DHCP4_PACKET_DROP_0002 = "DHCP4_PACKET_DROP_0002";
117107
extern const isc::log::MessageID DHCP4_PACKET_DROP_0003 = "DHCP4_PACKET_DROP_0003";
@@ -131,7 +121,6 @@ extern const isc::log::MessageID DHCP4_PACKET_NAK_0002 = "DHCP4_PACKET_NAK_0002"
131121
extern const isc::log::MessageID DHCP4_PACKET_NAK_0003 = "DHCP4_PACKET_NAK_0003";
132122
extern const isc::log::MessageID DHCP4_PACKET_NAK_0004 = "DHCP4_PACKET_NAK_0004";
133123
extern const isc::log::MessageID DHCP4_PACKET_OPTIONS_SKIPPED = "DHCP4_PACKET_OPTIONS_SKIPPED";
134-
extern const isc::log::MessageID DHCP4_PACKET_OPTION_UNPACK_FAIL = "DHCP4_PACKET_OPTION_UNPACK_FAIL";
135124
extern const isc::log::MessageID DHCP4_PACKET_PACK = "DHCP4_PACKET_PACK";
136125
extern const isc::log::MessageID DHCP4_PACKET_PACK_FAIL = "DHCP4_PACKET_PACK_FAIL";
137126
extern const isc::log::MessageID DHCP4_PACKET_PROCESS_EXCEPTION = "DHCP4_PACKET_PROCESS_EXCEPTION";
@@ -168,7 +157,6 @@ extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_GENERATE = "DHCP4_RESPO
168157
extern const isc::log::MessageID DHCP4_SERVER_FAILED = "DHCP4_SERVER_FAILED";
169158
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE = "DHCP4_SERVER_INITIATED_DECLINE";
170159
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED = "DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED";
171-
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_FAILED = "DHCP4_SERVER_INITIATED_DECLINE_FAILED";
172160
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY = "DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY";
173161
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED = "DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED";
174162
extern const isc::log::MessageID DHCP4_SHUTDOWN = "DHCP4_SHUTDOWN";
@@ -193,7 +181,6 @@ extern const isc::log::MessageID DHCP4_UNKNOWN_ADDRESS_REQUESTED = "DHCP4_UNKNOW
193181
namespace {
194182

195183
const char* values[] = {
196-
"DHCP4_ACTIVATE_INTERFACE", "activating interface %1",
197184
"DHCP4_ALREADY_RUNNING", "%1 already running? %2",
198185
"DHCP4_BUFFER_RECEIVED", "received buffer from %1:%2 to %3:%4 over interface %5",
199186
"DHCP4_BUFFER_RECEIVE_FAIL", "error on attempt to receive packet: %1",
@@ -216,24 +203,19 @@ const char* values[] = {
216203
"DHCP4_CLIENT_HOSTNAME_PROCESS", "%1: processing client's Hostname option",
217204
"DHCP4_CLIENT_NAME_PROC_FAIL", "%1: failed to process the fqdn or hostname sent by a client: %2",
218205
"DHCP4_CONFIG_COMPLETE", "DHCPv4 server has completed configuration: %1",
219-
"DHCP4_CONFIG_FETCH", "Fetching configuration data from config backends.",
220206
"DHCP4_CONFIG_LOAD_FAIL", "configuration error using file: %1, reason: %2",
221-
"DHCP4_CONFIG_NEW_SUBNET", "a new subnet has been added to configuration: %1",
222-
"DHCP4_CONFIG_OPTION_DUPLICATE", "multiple options with the code %1 added to the subnet %2",
223207
"DHCP4_CONFIG_PACKET_QUEUE", "DHCPv4 packet queue info after configuration: %1",
224208
"DHCP4_CONFIG_RECEIVED", "received configuration %1",
225209
"DHCP4_CONFIG_START", "DHCPv4 server is processing the following configuration: %1",
226210
"DHCP4_CONFIG_SYNTAX_WARNING", "configuration syntax warning: %1",
227211
"DHCP4_CONFIG_UNRECOVERABLE_ERROR", "DHCPv4 server new configuration failed with an error which cannot be recovered",
228212
"DHCP4_CONFIG_UNSUPPORTED_OBJECT", "DHCPv4 server configuration includes an unsupported object: %1",
229-
"DHCP4_CONFIG_UPDATE", "updated configuration received: %1",
230213
"DHCP4_DB_RECONNECT_DISABLED", "database reconnect is disabled: max-reconnect-tries %1, reconnect-wait-time %2",
231214
"DHCP4_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success",
232215
"DHCP4_DB_RECONNECT_LOST_CONNECTION", "database connection lost.",
233216
"DHCP4_DB_RECONNECT_NO_DB_CTL", "unexpected error in database reconnect",
234217
"DHCP4_DB_RECONNECT_SUCCEEDED", "database connection recovered.",
235218
"DHCP4_DDNS_REQUEST_SEND_FAILED", "failed sending a request to kea-dhcp-ddns, error: %1, ncr: %2",
236-
"DHCP4_DEACTIVATE_INTERFACE", "deactivate interface %1",
237219
"DHCP4_DECLINE_FAIL", "%1: error on decline lease for address %2: %3",
238220
"DHCP4_DECLINE_LEASE", "Received DHCPDECLINE for addr %1 from client %2. The lease will be unavailable for %3 seconds.",
239221
"DHCP4_DECLINE_LEASE_MISMATCH", "Received DHCPDECLINE for addr %1 from client %2, but the data doesn't match: received hwaddr: %3, lease hwaddr: %4, received client-id: %5, lease client-id: %6",
@@ -260,7 +242,6 @@ const char* values[] = {
260242
"DHCP4_EMPTY_HOSTNAME", "%1: received empty hostname from the client, skipping processing of this option",
261243
"DHCP4_FLEX_ID", "%1: flexible identifier generated for incoming packet: %2",
262244
"DHCP4_GENERATE_FQDN", "%1: client did not send a FQDN or hostname; FQDN will be generated for the client",
263-
"DHCP4_HANDLE_SIGNAL_EXCEPTION", "An exception was thrown while handing signal: %1",
264245
"DHCP4_HOOK_BUFFER_RCVD_DROP", "received buffer from %1 to %2 over interface %3 was dropped because a callout set the drop flag",
265246
"DHCP4_HOOK_BUFFER_RCVD_SKIP", "received buffer from %1 to %2 over interface %3 is not parsed because a callout set the next step to SKIP.",
266247
"DHCP4_HOOK_BUFFER_SEND_SKIP", "%1: prepared response is dropped because a callout set the next step to SKIP.",
@@ -292,12 +273,9 @@ const char* values[] = {
292273
"DHCP4_NCR_CREATION_FAILED", "%1: failed to generate name change requests for DNS: %2",
293274
"DHCP4_NOT_RUNNING", "DHCPv4 server is not running",
294275
"DHCP4_NO_LEASE_INIT_REBOOT", "%1: no lease for address %2 requested by INIT-REBOOT client",
295-
"DHCP4_NO_SOCKETS_OPEN", "no interface configured to listen to DHCP traffic",
296-
"DHCP4_OPEN_CONFIG_DB", "Opening configuration database: %1",
297276
"DHCP4_OPEN_SOCKET", "opening service sockets on port %1",
298277
"DHCP4_OPEN_SOCKETS_FAILED", "maximum number of open service sockets attempts: %1, has been exhausted without success",
299278
"DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL", "unexpected error in bind service sockets.",
300-
"DHCP4_OPEN_SOCKET_FAIL", "failed to open socket: %1",
301279
"DHCP4_PACKET_DROP_0001", "%1: failed to parse packet from %2 to %3, received over interface %4, reason: %5, %6",
302280
"DHCP4_PACKET_DROP_0002", "%1, from interface %2: no suitable subnet configured for a direct client",
303281
"DHCP4_PACKET_DROP_0003", "%1, from interface %2: it contains a foreign server identifier",
@@ -317,7 +295,6 @@ const char* values[] = {
317295
"DHCP4_PACKET_NAK_0003", "%1: failed to advertise a lease, client sent ciaddr %2, requested-ip-address %3",
318296
"DHCP4_PACKET_NAK_0004", "%1: failed to grant a lease, client sent ciaddr %2, requested-ip-address %3",
319297
"DHCP4_PACKET_OPTIONS_SKIPPED", "%1: An error unpacking an option, caused subsequent options to be skipped: %2",
320-
"DHCP4_PACKET_OPTION_UNPACK_FAIL", "An error unpacking the option %1: %2",
321298
"DHCP4_PACKET_PACK", "%1: preparing on-wire format of the packet to be sent",
322299
"DHCP4_PACKET_PACK_FAIL", "%1: preparing on-wire-format of the packet to be sent failed %2",
323300
"DHCP4_PACKET_PROCESS_EXCEPTION", "%1: exception occurred during packet processing",
@@ -354,7 +331,6 @@ const char* values[] = {
354331
"DHCP4_SERVER_FAILED", "server failed: %1",
355332
"DHCP4_SERVER_INITIATED_DECLINE", "%1: Lease for addr %2 has been found to be already in use. The lease will be unavailable for %3 seconds.",
356333
"DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED", "%1: error adding a lease for address %2",
357-
"DHCP4_SERVER_INITIATED_DECLINE_FAILED", "%1: error on server-initiated decline lease for address %2: %3",
358334
"DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY", "%1: error declining a lease for address %2",
359335
"DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED", "%1: error updating lease for address %2",
360336
"DHCP4_SHUTDOWN", "server shutdown",

src/bin/dhcp4/dhcp4_messages.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
namespace isc {
99
namespace dhcp {
1010

11-
extern const isc::log::MessageID DHCP4_ACTIVATE_INTERFACE;
1211
extern const isc::log::MessageID DHCP4_ALREADY_RUNNING;
1312
extern const isc::log::MessageID DHCP4_BUFFER_RECEIVED;
1413
extern const isc::log::MessageID DHCP4_BUFFER_RECEIVE_FAIL;
@@ -31,24 +30,19 @@ extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_MALFORMED;
3130
extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_PROCESS;
3231
extern const isc::log::MessageID DHCP4_CLIENT_NAME_PROC_FAIL;
3332
extern const isc::log::MessageID DHCP4_CONFIG_COMPLETE;
34-
extern const isc::log::MessageID DHCP4_CONFIG_FETCH;
3533
extern const isc::log::MessageID DHCP4_CONFIG_LOAD_FAIL;
36-
extern const isc::log::MessageID DHCP4_CONFIG_NEW_SUBNET;
37-
extern const isc::log::MessageID DHCP4_CONFIG_OPTION_DUPLICATE;
3834
extern const isc::log::MessageID DHCP4_CONFIG_PACKET_QUEUE;
3935
extern const isc::log::MessageID DHCP4_CONFIG_RECEIVED;
4036
extern const isc::log::MessageID DHCP4_CONFIG_START;
4137
extern const isc::log::MessageID DHCP4_CONFIG_SYNTAX_WARNING;
4238
extern const isc::log::MessageID DHCP4_CONFIG_UNRECOVERABLE_ERROR;
4339
extern const isc::log::MessageID DHCP4_CONFIG_UNSUPPORTED_OBJECT;
44-
extern const isc::log::MessageID DHCP4_CONFIG_UPDATE;
4540
extern const isc::log::MessageID DHCP4_DB_RECONNECT_DISABLED;
4641
extern const isc::log::MessageID DHCP4_DB_RECONNECT_FAILED;
4742
extern const isc::log::MessageID DHCP4_DB_RECONNECT_LOST_CONNECTION;
4843
extern const isc::log::MessageID DHCP4_DB_RECONNECT_NO_DB_CTL;
4944
extern const isc::log::MessageID DHCP4_DB_RECONNECT_SUCCEEDED;
5045
extern const isc::log::MessageID DHCP4_DDNS_REQUEST_SEND_FAILED;
51-
extern const isc::log::MessageID DHCP4_DEACTIVATE_INTERFACE;
5246
extern const isc::log::MessageID DHCP4_DECLINE_FAIL;
5347
extern const isc::log::MessageID DHCP4_DECLINE_LEASE;
5448
extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH;
@@ -75,7 +69,6 @@ extern const isc::log::MessageID DHCP4_DYNAMIC_RECONFIGURATION_SUCCESS;
7569
extern const isc::log::MessageID DHCP4_EMPTY_HOSTNAME;
7670
extern const isc::log::MessageID DHCP4_FLEX_ID;
7771
extern const isc::log::MessageID DHCP4_GENERATE_FQDN;
78-
extern const isc::log::MessageID DHCP4_HANDLE_SIGNAL_EXCEPTION;
7972
extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_DROP;
8073
extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_SKIP;
8174
extern const isc::log::MessageID DHCP4_HOOK_BUFFER_SEND_SKIP;
@@ -107,12 +100,9 @@ extern const isc::log::MessageID DHCP4_MULTI_THREADING_INFO;
107100
extern const isc::log::MessageID DHCP4_NCR_CREATION_FAILED;
108101
extern const isc::log::MessageID DHCP4_NOT_RUNNING;
109102
extern const isc::log::MessageID DHCP4_NO_LEASE_INIT_REBOOT;
110-
extern const isc::log::MessageID DHCP4_NO_SOCKETS_OPEN;
111-
extern const isc::log::MessageID DHCP4_OPEN_CONFIG_DB;
112103
extern const isc::log::MessageID DHCP4_OPEN_SOCKET;
113104
extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_FAILED;
114105
extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL;
115-
extern const isc::log::MessageID DHCP4_OPEN_SOCKET_FAIL;
116106
extern const isc::log::MessageID DHCP4_PACKET_DROP_0001;
117107
extern const isc::log::MessageID DHCP4_PACKET_DROP_0002;
118108
extern const isc::log::MessageID DHCP4_PACKET_DROP_0003;
@@ -132,7 +122,6 @@ extern const isc::log::MessageID DHCP4_PACKET_NAK_0002;
132122
extern const isc::log::MessageID DHCP4_PACKET_NAK_0003;
133123
extern const isc::log::MessageID DHCP4_PACKET_NAK_0004;
134124
extern const isc::log::MessageID DHCP4_PACKET_OPTIONS_SKIPPED;
135-
extern const isc::log::MessageID DHCP4_PACKET_OPTION_UNPACK_FAIL;
136125
extern const isc::log::MessageID DHCP4_PACKET_PACK;
137126
extern const isc::log::MessageID DHCP4_PACKET_PACK_FAIL;
138127
extern const isc::log::MessageID DHCP4_PACKET_PROCESS_EXCEPTION;
@@ -169,7 +158,6 @@ extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_GENERATE;
169158
extern const isc::log::MessageID DHCP4_SERVER_FAILED;
170159
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE;
171160
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED;
172-
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_FAILED;
173161
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY;
174162
extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED;
175163
extern const isc::log::MessageID DHCP4_SHUTDOWN;

0 commit comments

Comments
 (0)