diff options
| author | Andrei Pavel <andrei@isc.org> | 2024-06-26 15:00:48 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2024-07-09 12:49:32 +0200 |
| commit | 2fc4f40e14f9da52e6ebd1d91a87a106fc6aa97d (patch) | |
| tree | e734832812c327ca0ab455478f721e626abc8f2e | |
| parent | [#1723] remove unlogged message definitions (diff) | |
| download | kea-2fc4f40e14f9da52e6ebd1d91a87a106fc6aa97d.tar.xz kea-2fc4f40e14f9da52e6ebd1d91a87a106fc6aa97d.zip | |
[#1723] regenerate messages
25 files changed, 2 insertions, 233 deletions
diff --git a/src/bin/dhcp4/dhcp4_messages.cc b/src/bin/dhcp4/dhcp4_messages.cc index 9ed0059925..793b3a7456 100644 --- a/src/bin/dhcp4/dhcp4_messages.cc +++ b/src/bin/dhcp4/dhcp4_messages.cc @@ -7,7 +7,6 @@ namespace isc { namespace dhcp { -extern const isc::log::MessageID DHCP4_ACTIVATE_INTERFACE = "DHCP4_ACTIVATE_INTERFACE"; extern const isc::log::MessageID DHCP4_ALREADY_RUNNING = "DHCP4_ALREADY_RUNNING"; extern const isc::log::MessageID DHCP4_BUFFER_RECEIVED = "DHCP4_BUFFER_RECEIVED"; 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 extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_PROCESS = "DHCP4_CLIENT_HOSTNAME_PROCESS"; extern const isc::log::MessageID DHCP4_CLIENT_NAME_PROC_FAIL = "DHCP4_CLIENT_NAME_PROC_FAIL"; extern const isc::log::MessageID DHCP4_CONFIG_COMPLETE = "DHCP4_CONFIG_COMPLETE"; -extern const isc::log::MessageID DHCP4_CONFIG_FETCH = "DHCP4_CONFIG_FETCH"; extern const isc::log::MessageID DHCP4_CONFIG_LOAD_FAIL = "DHCP4_CONFIG_LOAD_FAIL"; -extern const isc::log::MessageID DHCP4_CONFIG_NEW_SUBNET = "DHCP4_CONFIG_NEW_SUBNET"; -extern const isc::log::MessageID DHCP4_CONFIG_OPTION_DUPLICATE = "DHCP4_CONFIG_OPTION_DUPLICATE"; extern const isc::log::MessageID DHCP4_CONFIG_PACKET_QUEUE = "DHCP4_CONFIG_PACKET_QUEUE"; extern const isc::log::MessageID DHCP4_CONFIG_RECEIVED = "DHCP4_CONFIG_RECEIVED"; extern const isc::log::MessageID DHCP4_CONFIG_START = "DHCP4_CONFIG_START"; extern const isc::log::MessageID DHCP4_CONFIG_SYNTAX_WARNING = "DHCP4_CONFIG_SYNTAX_WARNING"; extern const isc::log::MessageID DHCP4_CONFIG_UNRECOVERABLE_ERROR = "DHCP4_CONFIG_UNRECOVERABLE_ERROR"; extern const isc::log::MessageID DHCP4_CONFIG_UNSUPPORTED_OBJECT = "DHCP4_CONFIG_UNSUPPORTED_OBJECT"; -extern const isc::log::MessageID DHCP4_CONFIG_UPDATE = "DHCP4_CONFIG_UPDATE"; extern const isc::log::MessageID DHCP4_DB_RECONNECT_DISABLED = "DHCP4_DB_RECONNECT_DISABLED"; extern const isc::log::MessageID DHCP4_DB_RECONNECT_FAILED = "DHCP4_DB_RECONNECT_FAILED"; extern const isc::log::MessageID DHCP4_DB_RECONNECT_LOST_CONNECTION = "DHCP4_DB_RECONNECT_LOST_CONNECTION"; extern const isc::log::MessageID DHCP4_DB_RECONNECT_NO_DB_CTL = "DHCP4_DB_RECONNECT_NO_DB_CTL"; extern const isc::log::MessageID DHCP4_DB_RECONNECT_SUCCEEDED = "DHCP4_DB_RECONNECT_SUCCEEDED"; extern const isc::log::MessageID DHCP4_DDNS_REQUEST_SEND_FAILED = "DHCP4_DDNS_REQUEST_SEND_FAILED"; -extern const isc::log::MessageID DHCP4_DEACTIVATE_INTERFACE = "DHCP4_DEACTIVATE_INTERFACE"; extern const isc::log::MessageID DHCP4_DECLINE_FAIL = "DHCP4_DECLINE_FAIL"; extern const isc::log::MessageID DHCP4_DECLINE_LEASE = "DHCP4_DECLINE_LEASE"; 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_ extern const isc::log::MessageID DHCP4_EMPTY_HOSTNAME = "DHCP4_EMPTY_HOSTNAME"; extern const isc::log::MessageID DHCP4_FLEX_ID = "DHCP4_FLEX_ID"; extern const isc::log::MessageID DHCP4_GENERATE_FQDN = "DHCP4_GENERATE_FQDN"; -extern const isc::log::MessageID DHCP4_HANDLE_SIGNAL_EXCEPTION = "DHCP4_HANDLE_SIGNAL_EXCEPTION"; extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_DROP = "DHCP4_HOOK_BUFFER_RCVD_DROP"; extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_SKIP = "DHCP4_HOOK_BUFFER_RCVD_SKIP"; 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 extern const isc::log::MessageID DHCP4_NCR_CREATION_FAILED = "DHCP4_NCR_CREATION_FAILED"; extern const isc::log::MessageID DHCP4_NOT_RUNNING = "DHCP4_NOT_RUNNING"; extern const isc::log::MessageID DHCP4_NO_LEASE_INIT_REBOOT = "DHCP4_NO_LEASE_INIT_REBOOT"; -extern const isc::log::MessageID DHCP4_NO_SOCKETS_OPEN = "DHCP4_NO_SOCKETS_OPEN"; -extern const isc::log::MessageID DHCP4_OPEN_CONFIG_DB = "DHCP4_OPEN_CONFIG_DB"; extern const isc::log::MessageID DHCP4_OPEN_SOCKET = "DHCP4_OPEN_SOCKET"; extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_FAILED = "DHCP4_OPEN_SOCKETS_FAILED"; extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL = "DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL"; -extern const isc::log::MessageID DHCP4_OPEN_SOCKET_FAIL = "DHCP4_OPEN_SOCKET_FAIL"; extern const isc::log::MessageID DHCP4_PACKET_DROP_0001 = "DHCP4_PACKET_DROP_0001"; extern const isc::log::MessageID DHCP4_PACKET_DROP_0002 = "DHCP4_PACKET_DROP_0002"; 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" extern const isc::log::MessageID DHCP4_PACKET_NAK_0003 = "DHCP4_PACKET_NAK_0003"; extern const isc::log::MessageID DHCP4_PACKET_NAK_0004 = "DHCP4_PACKET_NAK_0004"; extern const isc::log::MessageID DHCP4_PACKET_OPTIONS_SKIPPED = "DHCP4_PACKET_OPTIONS_SKIPPED"; -extern const isc::log::MessageID DHCP4_PACKET_OPTION_UNPACK_FAIL = "DHCP4_PACKET_OPTION_UNPACK_FAIL"; extern const isc::log::MessageID DHCP4_PACKET_PACK = "DHCP4_PACKET_PACK"; extern const isc::log::MessageID DHCP4_PACKET_PACK_FAIL = "DHCP4_PACKET_PACK_FAIL"; 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 extern const isc::log::MessageID DHCP4_SERVER_FAILED = "DHCP4_SERVER_FAILED"; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE = "DHCP4_SERVER_INITIATED_DECLINE"; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED = "DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED"; -extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_FAILED = "DHCP4_SERVER_INITIATED_DECLINE_FAILED"; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY = "DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY"; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED = "DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED"; extern const isc::log::MessageID DHCP4_SHUTDOWN = "DHCP4_SHUTDOWN"; @@ -193,7 +181,6 @@ extern const isc::log::MessageID DHCP4_UNKNOWN_ADDRESS_REQUESTED = "DHCP4_UNKNOW namespace { const char* values[] = { - "DHCP4_ACTIVATE_INTERFACE", "activating interface %1", "DHCP4_ALREADY_RUNNING", "%1 already running? %2", "DHCP4_BUFFER_RECEIVED", "received buffer from %1:%2 to %3:%4 over interface %5", "DHCP4_BUFFER_RECEIVE_FAIL", "error on attempt to receive packet: %1", @@ -216,24 +203,19 @@ const char* values[] = { "DHCP4_CLIENT_HOSTNAME_PROCESS", "%1: processing client's Hostname option", "DHCP4_CLIENT_NAME_PROC_FAIL", "%1: failed to process the fqdn or hostname sent by a client: %2", "DHCP4_CONFIG_COMPLETE", "DHCPv4 server has completed configuration: %1", - "DHCP4_CONFIG_FETCH", "Fetching configuration data from config backends.", "DHCP4_CONFIG_LOAD_FAIL", "configuration error using file: %1, reason: %2", - "DHCP4_CONFIG_NEW_SUBNET", "a new subnet has been added to configuration: %1", - "DHCP4_CONFIG_OPTION_DUPLICATE", "multiple options with the code %1 added to the subnet %2", "DHCP4_CONFIG_PACKET_QUEUE", "DHCPv4 packet queue info after configuration: %1", "DHCP4_CONFIG_RECEIVED", "received configuration %1", "DHCP4_CONFIG_START", "DHCPv4 server is processing the following configuration: %1", "DHCP4_CONFIG_SYNTAX_WARNING", "configuration syntax warning: %1", "DHCP4_CONFIG_UNRECOVERABLE_ERROR", "DHCPv4 server new configuration failed with an error which cannot be recovered", "DHCP4_CONFIG_UNSUPPORTED_OBJECT", "DHCPv4 server configuration includes an unsupported object: %1", - "DHCP4_CONFIG_UPDATE", "updated configuration received: %1", "DHCP4_DB_RECONNECT_DISABLED", "database reconnect is disabled: max-reconnect-tries %1, reconnect-wait-time %2", "DHCP4_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", "DHCP4_DB_RECONNECT_LOST_CONNECTION", "database connection lost.", "DHCP4_DB_RECONNECT_NO_DB_CTL", "unexpected error in database reconnect", "DHCP4_DB_RECONNECT_SUCCEEDED", "database connection recovered.", "DHCP4_DDNS_REQUEST_SEND_FAILED", "failed sending a request to kea-dhcp-ddns, error: %1, ncr: %2", - "DHCP4_DEACTIVATE_INTERFACE", "deactivate interface %1", "DHCP4_DECLINE_FAIL", "%1: error on decline lease for address %2: %3", "DHCP4_DECLINE_LEASE", "Received DHCPDECLINE for addr %1 from client %2. The lease will be unavailable for %3 seconds.", "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[] = { "DHCP4_EMPTY_HOSTNAME", "%1: received empty hostname from the client, skipping processing of this option", "DHCP4_FLEX_ID", "%1: flexible identifier generated for incoming packet: %2", "DHCP4_GENERATE_FQDN", "%1: client did not send a FQDN or hostname; FQDN will be generated for the client", - "DHCP4_HANDLE_SIGNAL_EXCEPTION", "An exception was thrown while handing signal: %1", "DHCP4_HOOK_BUFFER_RCVD_DROP", "received buffer from %1 to %2 over interface %3 was dropped because a callout set the drop flag", "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.", "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[] = { "DHCP4_NCR_CREATION_FAILED", "%1: failed to generate name change requests for DNS: %2", "DHCP4_NOT_RUNNING", "DHCPv4 server is not running", "DHCP4_NO_LEASE_INIT_REBOOT", "%1: no lease for address %2 requested by INIT-REBOOT client", - "DHCP4_NO_SOCKETS_OPEN", "no interface configured to listen to DHCP traffic", - "DHCP4_OPEN_CONFIG_DB", "Opening configuration database: %1", "DHCP4_OPEN_SOCKET", "opening service sockets on port %1", "DHCP4_OPEN_SOCKETS_FAILED", "maximum number of open service sockets attempts: %1, has been exhausted without success", "DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL", "unexpected error in bind service sockets.", - "DHCP4_OPEN_SOCKET_FAIL", "failed to open socket: %1", "DHCP4_PACKET_DROP_0001", "%1: failed to parse packet from %2 to %3, received over interface %4, reason: %5, %6", "DHCP4_PACKET_DROP_0002", "%1, from interface %2: no suitable subnet configured for a direct client", "DHCP4_PACKET_DROP_0003", "%1, from interface %2: it contains a foreign server identifier", @@ -317,7 +295,6 @@ const char* values[] = { "DHCP4_PACKET_NAK_0003", "%1: failed to advertise a lease, client sent ciaddr %2, requested-ip-address %3", "DHCP4_PACKET_NAK_0004", "%1: failed to grant a lease, client sent ciaddr %2, requested-ip-address %3", "DHCP4_PACKET_OPTIONS_SKIPPED", "%1: An error unpacking an option, caused subsequent options to be skipped: %2", - "DHCP4_PACKET_OPTION_UNPACK_FAIL", "An error unpacking the option %1: %2", "DHCP4_PACKET_PACK", "%1: preparing on-wire format of the packet to be sent", "DHCP4_PACKET_PACK_FAIL", "%1: preparing on-wire-format of the packet to be sent failed %2", "DHCP4_PACKET_PROCESS_EXCEPTION", "%1: exception occurred during packet processing", @@ -354,7 +331,6 @@ const char* values[] = { "DHCP4_SERVER_FAILED", "server failed: %1", "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.", "DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED", "%1: error adding a lease for address %2", - "DHCP4_SERVER_INITIATED_DECLINE_FAILED", "%1: error on server-initiated decline lease for address %2: %3", "DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY", "%1: error declining a lease for address %2", "DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED", "%1: error updating lease for address %2", "DHCP4_SHUTDOWN", "server shutdown", diff --git a/src/bin/dhcp4/dhcp4_messages.h b/src/bin/dhcp4/dhcp4_messages.h index 37cde40ed7..50d550d757 100644 --- a/src/bin/dhcp4/dhcp4_messages.h +++ b/src/bin/dhcp4/dhcp4_messages.h @@ -8,7 +8,6 @@ namespace isc { namespace dhcp { -extern const isc::log::MessageID DHCP4_ACTIVATE_INTERFACE; extern const isc::log::MessageID DHCP4_ALREADY_RUNNING; extern const isc::log::MessageID DHCP4_BUFFER_RECEIVED; extern const isc::log::MessageID DHCP4_BUFFER_RECEIVE_FAIL; @@ -31,24 +30,19 @@ extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_MALFORMED; extern const isc::log::MessageID DHCP4_CLIENT_HOSTNAME_PROCESS; extern const isc::log::MessageID DHCP4_CLIENT_NAME_PROC_FAIL; extern const isc::log::MessageID DHCP4_CONFIG_COMPLETE; -extern const isc::log::MessageID DHCP4_CONFIG_FETCH; extern const isc::log::MessageID DHCP4_CONFIG_LOAD_FAIL; -extern const isc::log::MessageID DHCP4_CONFIG_NEW_SUBNET; -extern const isc::log::MessageID DHCP4_CONFIG_OPTION_DUPLICATE; extern const isc::log::MessageID DHCP4_CONFIG_PACKET_QUEUE; extern const isc::log::MessageID DHCP4_CONFIG_RECEIVED; extern const isc::log::MessageID DHCP4_CONFIG_START; extern const isc::log::MessageID DHCP4_CONFIG_SYNTAX_WARNING; extern const isc::log::MessageID DHCP4_CONFIG_UNRECOVERABLE_ERROR; extern const isc::log::MessageID DHCP4_CONFIG_UNSUPPORTED_OBJECT; -extern const isc::log::MessageID DHCP4_CONFIG_UPDATE; extern const isc::log::MessageID DHCP4_DB_RECONNECT_DISABLED; extern const isc::log::MessageID DHCP4_DB_RECONNECT_FAILED; extern const isc::log::MessageID DHCP4_DB_RECONNECT_LOST_CONNECTION; extern const isc::log::MessageID DHCP4_DB_RECONNECT_NO_DB_CTL; extern const isc::log::MessageID DHCP4_DB_RECONNECT_SUCCEEDED; extern const isc::log::MessageID DHCP4_DDNS_REQUEST_SEND_FAILED; -extern const isc::log::MessageID DHCP4_DEACTIVATE_INTERFACE; extern const isc::log::MessageID DHCP4_DECLINE_FAIL; extern const isc::log::MessageID DHCP4_DECLINE_LEASE; extern const isc::log::MessageID DHCP4_DECLINE_LEASE_MISMATCH; @@ -75,7 +69,6 @@ extern const isc::log::MessageID DHCP4_DYNAMIC_RECONFIGURATION_SUCCESS; extern const isc::log::MessageID DHCP4_EMPTY_HOSTNAME; extern const isc::log::MessageID DHCP4_FLEX_ID; extern const isc::log::MessageID DHCP4_GENERATE_FQDN; -extern const isc::log::MessageID DHCP4_HANDLE_SIGNAL_EXCEPTION; extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_DROP; extern const isc::log::MessageID DHCP4_HOOK_BUFFER_RCVD_SKIP; extern const isc::log::MessageID DHCP4_HOOK_BUFFER_SEND_SKIP; @@ -107,12 +100,9 @@ extern const isc::log::MessageID DHCP4_MULTI_THREADING_INFO; extern const isc::log::MessageID DHCP4_NCR_CREATION_FAILED; extern const isc::log::MessageID DHCP4_NOT_RUNNING; extern const isc::log::MessageID DHCP4_NO_LEASE_INIT_REBOOT; -extern const isc::log::MessageID DHCP4_NO_SOCKETS_OPEN; -extern const isc::log::MessageID DHCP4_OPEN_CONFIG_DB; extern const isc::log::MessageID DHCP4_OPEN_SOCKET; extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_FAILED; extern const isc::log::MessageID DHCP4_OPEN_SOCKETS_NO_RECONNECT_CTL; -extern const isc::log::MessageID DHCP4_OPEN_SOCKET_FAIL; extern const isc::log::MessageID DHCP4_PACKET_DROP_0001; extern const isc::log::MessageID DHCP4_PACKET_DROP_0002; extern const isc::log::MessageID DHCP4_PACKET_DROP_0003; @@ -132,7 +122,6 @@ extern const isc::log::MessageID DHCP4_PACKET_NAK_0002; extern const isc::log::MessageID DHCP4_PACKET_NAK_0003; extern const isc::log::MessageID DHCP4_PACKET_NAK_0004; extern const isc::log::MessageID DHCP4_PACKET_OPTIONS_SKIPPED; -extern const isc::log::MessageID DHCP4_PACKET_OPTION_UNPACK_FAIL; extern const isc::log::MessageID DHCP4_PACKET_PACK; extern const isc::log::MessageID DHCP4_PACKET_PACK_FAIL; extern const isc::log::MessageID DHCP4_PACKET_PROCESS_EXCEPTION; @@ -169,7 +158,6 @@ extern const isc::log::MessageID DHCP4_RESPONSE_HOSTNAME_GENERATE; extern const isc::log::MessageID DHCP4_SERVER_FAILED; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_ADD_FAILED; -extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_FAILED; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_RESOURCE_BUSY; extern const isc::log::MessageID DHCP4_SERVER_INITIATED_DECLINE_UPDATE_FAILED; extern const isc::log::MessageID DHCP4_SHUTDOWN; diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc index 7a449c6b2e..9b68bf1fe4 100644 --- a/src/bin/dhcp6/dhcp6_messages.cc +++ b/src/bin/dhcp6/dhcp6_messages.cc @@ -8,7 +8,6 @@ namespace isc { namespace dhcp { extern const isc::log::MessageID DHCP4_HOOK_SUBNET6_SELECT_PARKING_LOT_FULL = "DHCP4_HOOK_SUBNET6_SELECT_PARKING_LOT_FULL"; -extern const isc::log::MessageID DHCP6_ACTIVATE_INTERFACE = "DHCP6_ACTIVATE_INTERFACE"; extern const isc::log::MessageID DHCP6_ADD_GLOBAL_STATUS_CODE = "DHCP6_ADD_GLOBAL_STATUS_CODE"; extern const isc::log::MessageID DHCP6_ADD_STATUS_CODE_FOR_IA = "DHCP6_ADD_STATUS_CODE_FOR_IA"; extern const isc::log::MessageID DHCP6_ALREADY_RUNNING = "DHCP6_ALREADY_RUNNING"; @@ -32,8 +31,6 @@ extern const isc::log::MessageID DHCP6_CONFIG_START = "DHCP6_CONFIG_START"; extern const isc::log::MessageID DHCP6_CONFIG_SYNTAX_WARNING = "DHCP6_CONFIG_SYNTAX_WARNING"; extern const isc::log::MessageID DHCP6_CONFIG_UNRECOVERABLE_ERROR = "DHCP6_CONFIG_UNRECOVERABLE_ERROR"; extern const isc::log::MessageID DHCP6_CONFIG_UNSUPPORTED_OBJECT = "DHCP6_CONFIG_UNSUPPORTED_OBJECT"; -extern const isc::log::MessageID DHCP6_CONFIG_UPDATE = "DHCP6_CONFIG_UPDATE"; -extern const isc::log::MessageID DHCP6_DB_BACKEND_STARTED = "DHCP6_DB_BACKEND_STARTED"; extern const isc::log::MessageID DHCP6_DB_RECONNECT_DISABLED = "DHCP6_DB_RECONNECT_DISABLED"; extern const isc::log::MessageID DHCP6_DB_RECONNECT_FAILED = "DHCP6_DB_RECONNECT_FAILED"; extern const isc::log::MessageID DHCP6_DB_RECONNECT_LOST_CONNECTION = "DHCP6_DB_RECONNECT_LOST_CONNECTION"; @@ -47,8 +44,6 @@ extern const isc::log::MessageID DHCP6_DDNS_RECEIVE_FQDN = "DHCP6_DDNS_RECEIVE_F extern const isc::log::MessageID DHCP6_DDNS_REMOVE_OLD_LEASE_FQDN = "DHCP6_DDNS_REMOVE_OLD_LEASE_FQDN"; extern const isc::log::MessageID DHCP6_DDNS_REQUEST_SEND_FAILED = "DHCP6_DDNS_REQUEST_SEND_FAILED"; extern const isc::log::MessageID DHCP6_DDNS_RESPONSE_FQDN_DATA = "DHCP6_DDNS_RESPONSE_FQDN_DATA"; -extern const isc::log::MessageID DHCP6_DDNS_SEND_FQDN = "DHCP6_DDNS_SEND_FQDN"; -extern const isc::log::MessageID DHCP6_DEACTIVATE_INTERFACE = "DHCP6_DEACTIVATE_INTERFACE"; extern const isc::log::MessageID DHCP6_DECLINE_FAIL = "DHCP6_DECLINE_FAIL"; extern const isc::log::MessageID DHCP6_DECLINE_FAIL_DUID_MISMATCH = "DHCP6_DECLINE_FAIL_DUID_MISMATCH"; extern const isc::log::MessageID DHCP6_DECLINE_FAIL_IAID_MISMATCH = "DHCP6_DECLINE_FAIL_IAID_MISMATCH"; @@ -66,7 +61,6 @@ extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION = "DHCP6_DYNAMIC_ extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION_FAIL = "DHCP6_DYNAMIC_RECONFIGURATION_FAIL"; extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION_SUCCESS = "DHCP6_DYNAMIC_RECONFIGURATION_SUCCESS"; extern const isc::log::MessageID DHCP6_FLEX_ID = "DHCP6_FLEX_ID"; -extern const isc::log::MessageID DHCP6_HANDLE_SIGNAL_EXCEPTION = "DHCP6_HANDLE_SIGNAL_EXCEPTION"; extern const isc::log::MessageID DHCP6_HOOK_BUFFER_RCVD_DROP = "DHCP6_HOOK_BUFFER_RCVD_DROP"; extern const isc::log::MessageID DHCP6_HOOK_BUFFER_RCVD_SKIP = "DHCP6_HOOK_BUFFER_RCVD_SKIP"; extern const isc::log::MessageID DHCP6_HOOK_BUFFER_SEND_SKIP = "DHCP6_HOOK_BUFFER_SEND_SKIP"; @@ -97,11 +91,9 @@ extern const isc::log::MessageID DHCP6_LEASE_REUSE = "DHCP6_LEASE_REUSE"; extern const isc::log::MessageID DHCP6_MULTI_THREADING_INFO = "DHCP6_MULTI_THREADING_INFO"; extern const isc::log::MessageID DHCP6_NOT_RUNNING = "DHCP6_NOT_RUNNING"; extern const isc::log::MessageID DHCP6_NO_INTERFACES = "DHCP6_NO_INTERFACES"; -extern const isc::log::MessageID DHCP6_NO_SOCKETS_OPEN = "DHCP6_NO_SOCKETS_OPEN"; extern const isc::log::MessageID DHCP6_OPEN_SOCKET = "DHCP6_OPEN_SOCKET"; extern const isc::log::MessageID DHCP6_OPEN_SOCKETS_FAILED = "DHCP6_OPEN_SOCKETS_FAILED"; extern const isc::log::MessageID DHCP6_OPEN_SOCKETS_NO_RECONNECT_CTL = "DHCP6_OPEN_SOCKETS_NO_RECONNECT_CTL"; -extern const isc::log::MessageID DHCP6_OPEN_SOCKET_FAIL = "DHCP6_OPEN_SOCKET_FAIL"; extern const isc::log::MessageID DHCP6_PACKET_DROP_DHCP_DISABLED = "DHCP6_PACKET_DROP_DHCP_DISABLED"; extern const isc::log::MessageID DHCP6_PACKET_DROP_DROP_CLASS = "DHCP6_PACKET_DROP_DROP_CLASS"; extern const isc::log::MessageID DHCP6_PACKET_DROP_DROP_CLASS2 = "DHCP6_PACKET_DROP_DROP_CLASS2"; @@ -161,11 +153,9 @@ extern const isc::log::MessageID DHCP6_RESPONSE_DATA = "DHCP6_RESPONSE_DATA"; extern const isc::log::MessageID DHCP6_SERVER_FAILED = "DHCP6_SERVER_FAILED"; extern const isc::log::MessageID DHCP6_SHUTDOWN = "DHCP6_SHUTDOWN"; extern const isc::log::MessageID DHCP6_SHUTDOWN_REQUEST = "DHCP6_SHUTDOWN_REQUEST"; -extern const isc::log::MessageID DHCP6_SOCKET_UNICAST = "DHCP6_SOCKET_UNICAST"; extern const isc::log::MessageID DHCP6_SRV_CONSTRUCT_ERROR = "DHCP6_SRV_CONSTRUCT_ERROR"; extern const isc::log::MessageID DHCP6_SRV_D2STOP_ERROR = "DHCP6_SRV_D2STOP_ERROR"; extern const isc::log::MessageID DHCP6_SRV_UNLOAD_LIBRARIES_ERROR = "DHCP6_SRV_UNLOAD_LIBRARIES_ERROR"; -extern const isc::log::MessageID DHCP6_STANDALONE = "DHCP6_STANDALONE"; extern const isc::log::MessageID DHCP6_STARTED = "DHCP6_STARTED"; extern const isc::log::MessageID DHCP6_STARTING = "DHCP6_STARTING"; extern const isc::log::MessageID DHCP6_START_INFO = "DHCP6_START_INFO"; @@ -183,7 +173,6 @@ namespace { const char* values[] = { "DHCP4_HOOK_SUBNET6_SELECT_PARKING_LOT_FULL", "The parked-packet-limit %1, has been reached, dropping query: %2", - "DHCP6_ACTIVATE_INTERFACE", "activating interface %1", "DHCP6_ADD_GLOBAL_STATUS_CODE", "%1: adding Status Code to DHCPv6 packet: %2", "DHCP6_ADD_STATUS_CODE_FOR_IA", "%1: adding Status Code to IA with iaid=%2: %3", "DHCP6_ALREADY_RUNNING", "%1 already running? %2", @@ -207,8 +196,6 @@ const char* values[] = { "DHCP6_CONFIG_SYNTAX_WARNING", "configuration syntax warning: %1", "DHCP6_CONFIG_UNRECOVERABLE_ERROR", "DHCPv6 server new configuration failed with an error which cannot be recovered", "DHCP6_CONFIG_UNSUPPORTED_OBJECT", "DHCPv6 server configuration includes an unsupported object: %1", - "DHCP6_CONFIG_UPDATE", "updated configuration received: %1", - "DHCP6_DB_BACKEND_STARTED", "lease database started (type: %1, name: %2)", "DHCP6_DB_RECONNECT_DISABLED", "database reconnect is disabled: max-reconnect-tries %1, reconnect-wait-time %2", "DHCP6_DB_RECONNECT_FAILED", "maximum number of database reconnect attempts: %1, has been exhausted without success", "DHCP6_DB_RECONNECT_LOST_CONNECTION", "database connection lost.", @@ -222,8 +209,6 @@ const char* values[] = { "DHCP6_DDNS_REMOVE_OLD_LEASE_FQDN", "%1: FQDN for a lease: %2 has changed. New values: hostname = %3, reverse mapping = %4, forward mapping = %5", "DHCP6_DDNS_REQUEST_SEND_FAILED", "failed sending a request to kea-dhcp-ddns, error: %1, ncr: %2", "DHCP6_DDNS_RESPONSE_FQDN_DATA", "%1: including FQDN option in the server's response: %2", - "DHCP6_DDNS_SEND_FQDN", "sending DHCPv6 Client FQDN Option to the client: %1", - "DHCP6_DEACTIVATE_INTERFACE", "deactivate interface %1", "DHCP6_DECLINE_FAIL", "%1: error on decline lease for address %2: %3", "DHCP6_DECLINE_FAIL_DUID_MISMATCH", "Client %1 sent DECLINE for address %2, but it belongs to client with DUID %3", "DHCP6_DECLINE_FAIL_IAID_MISMATCH", "Client %1 sent DECLINE for address %2, but used a wrong IAID (%3), instead of expected %4", @@ -241,7 +226,6 @@ const char* values[] = { "DHCP6_DYNAMIC_RECONFIGURATION_FAIL", "dynamic server reconfiguration failed with file: %1", "DHCP6_DYNAMIC_RECONFIGURATION_SUCCESS", "dynamic server reconfiguration succeeded with file: %1", "DHCP6_FLEX_ID", "%1: flexible identifier generated for incoming packet: %2", - "DHCP6_HANDLE_SIGNAL_EXCEPTION", "An exception was thrown while handing signal: %1", "DHCP6_HOOK_BUFFER_RCVD_DROP", "received buffer from %1 to %2 over interface %3 was dropped because a callout set the drop flag", "DHCP6_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", "DHCP6_HOOK_BUFFER_SEND_SKIP", "%1: prepared DHCPv6 response was dropped because a callout set the next step to SKIP", @@ -272,11 +256,9 @@ const char* values[] = { "DHCP6_MULTI_THREADING_INFO", "enabled: %1, number of threads: %2, queue size: %3", "DHCP6_NOT_RUNNING", "IPv6 DHCP server is not running", "DHCP6_NO_INTERFACES", "failed to detect any network interfaces", - "DHCP6_NO_SOCKETS_OPEN", "no interface configured to listen to DHCP traffic", "DHCP6_OPEN_SOCKET", "opening service sockets on port %1", "DHCP6_OPEN_SOCKETS_FAILED", "maximum number of open service sockets attempts: %1, has been exhausted without success", "DHCP6_OPEN_SOCKETS_NO_RECONNECT_CTL", "unexpected error in bind service sockets.", - "DHCP6_OPEN_SOCKET_FAIL", "failed to open socket: %1", "DHCP6_PACKET_DROP_DHCP_DISABLED", "%1: DHCP service is globally disabled", "DHCP6_PACKET_DROP_DROP_CLASS", "dropped as member of the special class 'DROP': %1 %2", "DHCP6_PACKET_DROP_DROP_CLASS2", "dropped as member of the special class 'DROP' after host reservation lookup: %1 %2", @@ -296,7 +278,7 @@ const char* values[] = { "DHCP6_PACKET_RECEIVE_FAIL", "error on attempt to receive packet: %1", "DHCP6_PACKET_SEND", "%1: trying to send packet %2 (type %3) from [%4]:%5 to [%6]:%7 on interface %8", "DHCP6_PACKET_SEND_FAIL", "%1: failed to send DHCPv6 packet: %2", - "DHCP6_PACK_FAIL", "1%: failed to assemble response correctly: %2", + "DHCP6_PACK_FAIL", "%1: failed to assemble response correctly: %2", "DHCP6_PARSER_COMMIT_EXCEPTION", "parser failed to commit changes", "DHCP6_PARSER_COMMIT_FAIL", "parser failed to commit changes: %1", "DHCP6_PARSER_EXCEPTION", "failed to create or run parser for configuration element %1", @@ -336,11 +318,9 @@ const char* values[] = { "DHCP6_SERVER_FAILED", "server failed: %1", "DHCP6_SHUTDOWN", "server shutdown", "DHCP6_SHUTDOWN_REQUEST", "shutdown of server requested", - "DHCP6_SOCKET_UNICAST", "server is about to open socket on address %1 on interface %2", "DHCP6_SRV_CONSTRUCT_ERROR", "error creating Dhcpv6Srv object, reason: %1", "DHCP6_SRV_D2STOP_ERROR", "error stopping IO with DHCP_DDNS during shutdown: %1", "DHCP6_SRV_UNLOAD_LIBRARIES_ERROR", "error unloading hooks libraries during shutdown: %1", - "DHCP6_STANDALONE", "skipping message queue, running standalone", "DHCP6_STARTED", "Kea DHCPv6 server version %1 started", "DHCP6_STARTING", "Kea DHCPv6 server version %1 (%2) starting", "DHCP6_START_INFO", "pid: %1, server port: %2, client port: %3, verbose: %4", diff --git a/src/bin/dhcp6/dhcp6_messages.h b/src/bin/dhcp6/dhcp6_messages.h index 6203303c5c..76fa8dd26e 100644 --- a/src/bin/dhcp6/dhcp6_messages.h +++ b/src/bin/dhcp6/dhcp6_messages.h @@ -9,7 +9,6 @@ namespace isc { namespace dhcp { extern const isc::log::MessageID DHCP4_HOOK_SUBNET6_SELECT_PARKING_LOT_FULL; -extern const isc::log::MessageID DHCP6_ACTIVATE_INTERFACE; extern const isc::log::MessageID DHCP6_ADD_GLOBAL_STATUS_CODE; extern const isc::log::MessageID DHCP6_ADD_STATUS_CODE_FOR_IA; extern const isc::log::MessageID DHCP6_ALREADY_RUNNING; @@ -33,8 +32,6 @@ extern const isc::log::MessageID DHCP6_CONFIG_START; extern const isc::log::MessageID DHCP6_CONFIG_SYNTAX_WARNING; extern const isc::log::MessageID DHCP6_CONFIG_UNRECOVERABLE_ERROR; extern const isc::log::MessageID DHCP6_CONFIG_UNSUPPORTED_OBJECT; -extern const isc::log::MessageID DHCP6_CONFIG_UPDATE; -extern const isc::log::MessageID DHCP6_DB_BACKEND_STARTED; extern const isc::log::MessageID DHCP6_DB_RECONNECT_DISABLED; extern const isc::log::MessageID DHCP6_DB_RECONNECT_FAILED; extern const isc::log::MessageID DHCP6_DB_RECONNECT_LOST_CONNECTION; @@ -48,8 +45,6 @@ extern const isc::log::MessageID DHCP6_DDNS_RECEIVE_FQDN; extern const isc::log::MessageID DHCP6_DDNS_REMOVE_OLD_LEASE_FQDN; extern const isc::log::MessageID DHCP6_DDNS_REQUEST_SEND_FAILED; extern const isc::log::MessageID DHCP6_DDNS_RESPONSE_FQDN_DATA; -extern const isc::log::MessageID DHCP6_DDNS_SEND_FQDN; -extern const isc::log::MessageID DHCP6_DEACTIVATE_INTERFACE; extern const isc::log::MessageID DHCP6_DECLINE_FAIL; extern const isc::log::MessageID DHCP6_DECLINE_FAIL_DUID_MISMATCH; extern const isc::log::MessageID DHCP6_DECLINE_FAIL_IAID_MISMATCH; @@ -67,7 +62,6 @@ extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION; extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION_FAIL; extern const isc::log::MessageID DHCP6_DYNAMIC_RECONFIGURATION_SUCCESS; extern const isc::log::MessageID DHCP6_FLEX_ID; -extern const isc::log::MessageID DHCP6_HANDLE_SIGNAL_EXCEPTION; extern const isc::log::MessageID DHCP6_HOOK_BUFFER_RCVD_DROP; extern const isc::log::MessageID DHCP6_HOOK_BUFFER_RCVD_SKIP; extern const isc::log::MessageID DHCP6_HOOK_BUFFER_SEND_SKIP; @@ -98,11 +92,9 @@ extern const isc::log::MessageID DHCP6_LEASE_REUSE; extern const isc::log::MessageID DHCP6_MULTI_THREADING_INFO; extern const isc::log::MessageID DHCP6_NOT_RUNNING; extern const isc::log::MessageID DHCP6_NO_INTERFACES; -extern const isc::log::MessageID DHCP6_NO_SOCKETS_OPEN; extern const isc::log::MessageID DHCP6_OPEN_SOCKET; extern const isc::log::MessageID DHCP6_OPEN_SOCKETS_FAILED; extern const isc::log::MessageID DHCP6_OPEN_SOCKETS_NO_RECONNECT_CTL; -extern const isc::log::MessageID DHCP6_OPEN_SOCKET_FAIL; extern const isc::log::MessageID DHCP6_PACKET_DROP_DHCP_DISABLED; extern const isc::log::MessageID DHCP6_PACKET_DROP_DROP_CLASS; extern const isc::log::MessageID DHCP6_PACKET_DROP_DROP_CLASS2; @@ -162,11 +154,9 @@ extern const isc::log::MessageID DHCP6_RESPONSE_DATA; extern const isc::log::MessageID DHCP6_SERVER_FAILED; extern const isc::log::MessageID DHCP6_SHUTDOWN; extern const isc::log::MessageID DHCP6_SHUTDOWN_REQUEST; -extern const isc::log::MessageID DHCP6_SOCKET_UNICAST; extern const isc::log::MessageID DHCP6_SRV_CONSTRUCT_ERROR; extern const isc::log::MessageID DHCP6_SRV_D2STOP_ERROR; extern const isc::log::MessageID DHCP6_SRV_UNLOAD_LIBRARIES_ERROR; -extern const isc::log::MessageID DHCP6_STANDALONE; extern const isc::log::MessageID DHCP6_STARTED; extern const isc::log::MessageID DHCP6_STARTING; extern const isc::log::MessageID DHCP6_START_INFO; diff --git a/src/bin/netconf/netconf_messages.cc b/src/bin/netconf/netconf_messages.cc index baac6ceeea..e8acb1d4ca 100644 --- a/src/bin/netconf/netconf_messages.cc +++ b/src/bin/netconf/netconf_messages.cc @@ -17,7 +17,6 @@ extern const isc::log::MessageID NETCONF_FAILED = "NETCONF_FAILED"; extern const isc::log::MessageID NETCONF_GET_CONFIG = "NETCONF_GET_CONFIG"; extern const isc::log::MessageID NETCONF_GET_CONFIG_FAILED = "NETCONF_GET_CONFIG_FAILED"; extern const isc::log::MessageID NETCONF_GET_CONFIG_STARTED = "NETCONF_GET_CONFIG_STARTED"; -extern const isc::log::MessageID NETCONF_LOG_CHANGE_FAIL = "NETCONF_LOG_CHANGE_FAIL"; extern const isc::log::MessageID NETCONF_MODULE_CHANGE_INTERNAL_ERROR = "NETCONF_MODULE_CHANGE_INTERNAL_ERROR"; extern const isc::log::MessageID NETCONF_MODULE_MISSING_ERR = "NETCONF_MODULE_MISSING_ERR"; extern const isc::log::MessageID NETCONF_MODULE_MISSING_WARN = "NETCONF_MODULE_MISSING_WARN"; @@ -60,7 +59,6 @@ const char* values[] = { "NETCONF_GET_CONFIG", "got configuration from %1 server: %2", "NETCONF_GET_CONFIG_FAILED", "getting configuration from %1 server failed: %2", "NETCONF_GET_CONFIG_STARTED", "getting configuration from %1 server", - "NETCONF_LOG_CHANGE_FAIL", "NETCONF configuration change logging failed: %1", "NETCONF_MODULE_CHANGE_INTERNAL_ERROR", "an internal error occurred while processing changes for module %1: %2", "NETCONF_MODULE_MISSING_ERR", "Missing essential module %1 in sysrepo", "NETCONF_MODULE_MISSING_WARN", "Missing module %1 in sysrepo", diff --git a/src/bin/netconf/netconf_messages.h b/src/bin/netconf/netconf_messages.h index 065406b317..d9918d95a7 100644 --- a/src/bin/netconf/netconf_messages.h +++ b/src/bin/netconf/netconf_messages.h @@ -18,7 +18,6 @@ extern const isc::log::MessageID NETCONF_FAILED; extern const isc::log::MessageID NETCONF_GET_CONFIG; extern const isc::log::MessageID NETCONF_GET_CONFIG_FAILED; extern const isc::log::MessageID NETCONF_GET_CONFIG_STARTED; -extern const isc::log::MessageID NETCONF_LOG_CHANGE_FAIL; extern const isc::log::MessageID NETCONF_MODULE_CHANGE_INTERNAL_ERROR; extern const isc::log::MessageID NETCONF_MODULE_MISSING_ERR; extern const isc::log::MessageID NETCONF_MODULE_MISSING_WARN; diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc index 5efe6941b2..2732de09f2 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc +++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.cc @@ -12,7 +12,6 @@ extern const isc::log::MessageID LEASE_CMDS_ADD6_CONFLICT = "LEASE_CMDS_ADD6_CON extern const isc::log::MessageID LEASE_CMDS_ADD6_FAILED = "LEASE_CMDS_ADD6_FAILED"; extern const isc::log::MessageID LEASE_CMDS_BULK_APPLY6 = "LEASE_CMDS_BULK_APPLY6"; extern const isc::log::MessageID LEASE_CMDS_BULK_APPLY6_FAILED = "LEASE_CMDS_BULK_APPLY6_FAILED"; -extern const isc::log::MessageID LEASE_CMDS_DEINIT_FAILED = "LEASE_CMDS_DEINIT_FAILED"; extern const isc::log::MessageID LEASE_CMDS_DEINIT_OK = "LEASE_CMDS_DEINIT_OK"; extern const isc::log::MessageID LEASE_CMDS_DEL4 = "LEASE_CMDS_DEL4"; extern const isc::log::MessageID LEASE_CMDS_DEL4_FAILED = "LEASE_CMDS_DEL4_FAILED"; @@ -20,7 +19,6 @@ extern const isc::log::MessageID LEASE_CMDS_DEL6 = "LEASE_CMDS_DEL6"; extern const isc::log::MessageID LEASE_CMDS_DEL6_FAILED = "LEASE_CMDS_DEL6_FAILED"; extern const isc::log::MessageID LEASE_CMDS_GET4_FAILED = "LEASE_CMDS_GET4_FAILED"; extern const isc::log::MessageID LEASE_CMDS_GET6_FAILED = "LEASE_CMDS_GET6_FAILED"; -extern const isc::log::MessageID LEASE_CMDS_INIT_FAILED = "LEASE_CMDS_INIT_FAILED"; extern const isc::log::MessageID LEASE_CMDS_INIT_OK = "LEASE_CMDS_INIT_OK"; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4 = "LEASE_CMDS_RESEND_DDNS4"; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4_FAILED = "LEASE_CMDS_RESEND_DDNS4_FAILED"; @@ -50,7 +48,6 @@ const char* values[] = { "LEASE_CMDS_ADD6_FAILED", "lease6-add command failed (parameters: %1, reason: %2)", "LEASE_CMDS_BULK_APPLY6", "lease6-bulk-apply command successful (applied addresses count: %1)", "LEASE_CMDS_BULK_APPLY6_FAILED", "lease6-bulk-apply command failed (parameters: %1, reason: %2)", - "LEASE_CMDS_DEINIT_FAILED", "unloading Lease Commands hooks library failed: %1", "LEASE_CMDS_DEINIT_OK", "unloading Lease Commands hooks library successful", "LEASE_CMDS_DEL4", "lease4-del command successful (address: %1)", "LEASE_CMDS_DEL4_FAILED", "lease4-del command failed (parameters: %1, reason: %2)", @@ -58,7 +55,6 @@ const char* values[] = { "LEASE_CMDS_DEL6_FAILED", "lease6-del command failed (parameters: %1, reason: %2)", "LEASE_CMDS_GET4_FAILED", "lease4-get command failed (parameters: %1, reason: %2)", "LEASE_CMDS_GET6_FAILED", "lease6-get command failed (parameters: %1, reason: %2)", - "LEASE_CMDS_INIT_FAILED", "loading Lease Commands hooks library failed: %1", "LEASE_CMDS_INIT_OK", "loading Lease Commands hooks library successful", "LEASE_CMDS_RESEND_DDNS4", "lease4-resend-ddns command successful: %1", "LEASE_CMDS_RESEND_DDNS4_FAILED", "lease4-resend-ddns command failed: %1", diff --git a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h index 84613b0900..90efb4596f 100644 --- a/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h +++ b/src/hooks/dhcp/lease_cmds/lease_cmds_messages.h @@ -13,7 +13,6 @@ extern const isc::log::MessageID LEASE_CMDS_ADD6_CONFLICT; extern const isc::log::MessageID LEASE_CMDS_ADD6_FAILED; extern const isc::log::MessageID LEASE_CMDS_BULK_APPLY6; extern const isc::log::MessageID LEASE_CMDS_BULK_APPLY6_FAILED; -extern const isc::log::MessageID LEASE_CMDS_DEINIT_FAILED; extern const isc::log::MessageID LEASE_CMDS_DEINIT_OK; extern const isc::log::MessageID LEASE_CMDS_DEL4; extern const isc::log::MessageID LEASE_CMDS_DEL4_FAILED; @@ -21,7 +20,6 @@ extern const isc::log::MessageID LEASE_CMDS_DEL6; extern const isc::log::MessageID LEASE_CMDS_DEL6_FAILED; extern const isc::log::MessageID LEASE_CMDS_GET4_FAILED; extern const isc::log::MessageID LEASE_CMDS_GET6_FAILED; -extern const isc::log::MessageID LEASE_CMDS_INIT_FAILED; extern const isc::log::MessageID LEASE_CMDS_INIT_OK; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4; extern const isc::log::MessageID LEASE_CMDS_RESEND_DDNS4_FAILED; diff --git a/src/hooks/dhcp/perfmon/perfmon_messages.cc b/src/hooks/dhcp/perfmon/perfmon_messages.cc index 5875d30afe..6ddf64c574 100644 --- a/src/hooks/dhcp/perfmon/perfmon_messages.cc +++ b/src/hooks/dhcp/perfmon/perfmon_messages.cc @@ -10,7 +10,6 @@ extern const isc::log::MessageID PERFMON_CMDS_CONTROL_ERROR = "PERFMON_CMDS_CONT extern const isc::log::MessageID PERFMON_CMDS_CONTROL_OK = "PERFMON_CMDS_CONTROL_OK"; extern const isc::log::MessageID PERFMON_CMDS_GET_ALL_DURATIONS_ERROR = "PERFMON_CMDS_GET_ALL_DURATIONS_ERROR"; extern const isc::log::MessageID PERFMON_CMDS_GET_ALL_DURATIONS_OK = "PERFMON_CMDS_GET_ALL_DURATIONS_OK"; -extern const isc::log::MessageID PERFMON_DEINIT_FAILED = "PERFMON_DEINIT_FAILED"; extern const isc::log::MessageID PERFMON_DEINIT_OK = "PERFMON_DEINIT_OK"; extern const isc::log::MessageID PERFMON_DHCP4_PKT_EVENTS = "PERFMON_DHCP4_PKT_EVENTS"; extern const isc::log::MessageID PERFMON_DHCP4_PKT_PROCESS_ERROR = "PERFMON_DHCP4_PKT_PROCESS_ERROR"; @@ -30,7 +29,6 @@ const char* values[] = { "PERFMON_CMDS_CONTROL_OK", "perfmon-control command success: active monitoring: %1, stats-mgr-reporting: %2", "PERFMON_CMDS_GET_ALL_DURATIONS_ERROR", "perfmon-get-all-durations command processing failed: %1", "PERFMON_CMDS_GET_ALL_DURATIONS_OK", "perfmon-get-all-durations returning %1 durations", - "PERFMON_DEINIT_FAILED", "unloading PerfMon hooks library failed: %1", "PERFMON_DEINIT_OK", "unloading PerfMon hooks library successful", "PERFMON_DHCP4_PKT_EVENTS", "query: %1 events=[%2]", "PERFMON_DHCP4_PKT_PROCESS_ERROR", "Packet event stack was not processed for query %1, reason %2", diff --git a/src/hooks/dhcp/perfmon/perfmon_messages.h b/src/hooks/dhcp/perfmon/perfmon_messages.h index 8ba726f80e..9cec553bdd 100644 --- a/src/hooks/dhcp/perfmon/perfmon_messages.h +++ b/src/hooks/dhcp/perfmon/perfmon_messages.h @@ -11,7 +11,6 @@ extern const isc::log::MessageID PERFMON_CMDS_CONTROL_ERROR; extern const isc::log::MessageID PERFMON_CMDS_CONTROL_OK; extern const isc::log::MessageID PERFMON_CMDS_GET_ALL_DURATIONS_ERROR; extern const isc::log::MessageID PERFMON_CMDS_GET_ALL_DURATIONS_OK; -extern const isc::log::MessageID PERFMON_DEINIT_FAILED; extern const isc::log::MessageID PERFMON_DEINIT_OK; extern const isc::log::MessageID PERFMON_DHCP4_PKT_EVENTS; extern const isc::log::MessageID PERFMON_DHCP4_PKT_PROCESS_ERROR; diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc index b43cbbb35a..66329ca0ba 100644 --- a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc +++ b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.cc @@ -4,9 +4,7 @@ #include <log/message_types.h> #include <log/message_initializer.h> -extern const isc::log::MessageID STAT_CMDS_DEINIT_FAILED = "STAT_CMDS_DEINIT_FAILED"; extern const isc::log::MessageID STAT_CMDS_DEINIT_OK = "STAT_CMDS_DEINIT_OK"; -extern const isc::log::MessageID STAT_CMDS_INIT_FAILED = "STAT_CMDS_INIT_FAILED"; extern const isc::log::MessageID STAT_CMDS_INIT_OK = "STAT_CMDS_INIT_OK"; extern const isc::log::MessageID STAT_CMDS_LEASE4_FAILED = "STAT_CMDS_LEASE4_FAILED"; extern const isc::log::MessageID STAT_CMDS_LEASE4_GET = "STAT_CMDS_LEASE4_GET"; @@ -24,9 +22,7 @@ extern const isc::log::MessageID STAT_CMDS_LEASE6_ORPHANED_STATS = "STAT_CMDS_LE namespace { const char* values[] = { - "STAT_CMDS_DEINIT_FAILED", "unloading Stat Commands hooks library failed: %1", "STAT_CMDS_DEINIT_OK", "unloading Stat Commands hooks library successful", - "STAT_CMDS_INIT_FAILED", "loading Stat Commands hooks library failed: %1", "STAT_CMDS_INIT_OK", "loading Stat Commands hooks library successful", "STAT_CMDS_LEASE4_FAILED", "stat-lease4-get command failed: reason: %1", "STAT_CMDS_LEASE4_GET", "stat-lease4-get command successful, parameters: %1 rows found: %2", diff --git a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h index 988ad43802..100d7a8e46 100644 --- a/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h +++ b/src/hooks/dhcp/stat_cmds/stat_cmds_messages.h @@ -5,9 +5,7 @@ #include <log/message_types.h> -extern const isc::log::MessageID STAT_CMDS_DEINIT_FAILED; extern const isc::log::MessageID STAT_CMDS_DEINIT_OK; -extern const isc::log::MessageID STAT_CMDS_INIT_FAILED; extern const isc::log::MessageID STAT_CMDS_INIT_OK; extern const isc::log::MessageID STAT_CMDS_LEASE4_FAILED; extern const isc::log::MessageID STAT_CMDS_LEASE4_GET; diff --git a/src/lib/asiodns/asiodns_messages.cc b/src/lib/asiodns/asiodns_messages.cc index 7900294a35..c61d9f3ff5 100644 --- a/src/lib/asiodns/asiodns_messages.cc +++ b/src/lib/asiodns/asiodns_messages.cc @@ -7,29 +7,12 @@ namespace isc { namespace asiodns { -extern const isc::log::MessageID ASIODNS_FD_ADD_TCP = "ASIODNS_FD_ADD_TCP"; -extern const isc::log::MessageID ASIODNS_FD_ADD_UDP = "ASIODNS_FD_ADD_UDP"; extern const isc::log::MessageID ASIODNS_FETCH_COMPLETED = "ASIODNS_FETCH_COMPLETED"; extern const isc::log::MessageID ASIODNS_FETCH_STOPPED = "ASIODNS_FETCH_STOPPED"; extern const isc::log::MessageID ASIODNS_OPEN_SOCKET = "ASIODNS_OPEN_SOCKET"; extern const isc::log::MessageID ASIODNS_READ_DATA = "ASIODNS_READ_DATA"; extern const isc::log::MessageID ASIODNS_READ_TIMEOUT = "ASIODNS_READ_TIMEOUT"; extern const isc::log::MessageID ASIODNS_SEND_DATA = "ASIODNS_SEND_DATA"; -extern const isc::log::MessageID ASIODNS_SYNC_UDP_CLOSE_FAIL = "ASIODNS_SYNC_UDP_CLOSE_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_ACCEPT_FAIL = "ASIODNS_TCP_ACCEPT_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_CLEANUP_CLOSE_FAIL = "ASIODNS_TCP_CLEANUP_CLOSE_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_CLOSE_ACCEPTOR_FAIL = "ASIODNS_TCP_CLOSE_ACCEPTOR_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_CLOSE_FAIL = "ASIODNS_TCP_CLOSE_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_CLOSE_NORESP_FAIL = "ASIODNS_TCP_CLOSE_NORESP_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_GETREMOTE_FAIL = "ASIODNS_TCP_GETREMOTE_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_READDATA_FAIL = "ASIODNS_TCP_READDATA_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_READLEN_FAIL = "ASIODNS_TCP_READLEN_FAIL"; -extern const isc::log::MessageID ASIODNS_TCP_WRITE_FAIL = "ASIODNS_TCP_WRITE_FAIL"; -extern const isc::log::MessageID ASIODNS_UDP_ASYNC_SEND_FAIL = "ASIODNS_UDP_ASYNC_SEND_FAIL"; -extern const isc::log::MessageID ASIODNS_UDP_CLOSE_FAIL = "ASIODNS_UDP_CLOSE_FAIL"; -extern const isc::log::MessageID ASIODNS_UDP_RECEIVE_FAIL = "ASIODNS_UDP_RECEIVE_FAIL"; -extern const isc::log::MessageID ASIODNS_UDP_SYNC_RECEIVE_FAIL = "ASIODNS_UDP_SYNC_RECEIVE_FAIL"; -extern const isc::log::MessageID ASIODNS_UDP_SYNC_SEND_FAIL = "ASIODNS_UDP_SYNC_SEND_FAIL"; extern const isc::log::MessageID ASIODNS_UNKNOWN_ORIGIN = "ASIODNS_UNKNOWN_ORIGIN"; extern const isc::log::MessageID ASIODNS_UNKNOWN_RESULT = "ASIODNS_UNKNOWN_RESULT"; @@ -39,29 +22,12 @@ extern const isc::log::MessageID ASIODNS_UNKNOWN_RESULT = "ASIODNS_UNKNOWN_RESUL namespace { const char* values[] = { - "ASIODNS_FD_ADD_TCP", "adding a new TCP server by opened fd %1", - "ASIODNS_FD_ADD_UDP", "adding a new UDP server by opened fd %1", "ASIODNS_FETCH_COMPLETED", "upstream fetch to %1(%2) has now completed", "ASIODNS_FETCH_STOPPED", "upstream fetch to %1(%2) has been stopped", "ASIODNS_OPEN_SOCKET", "error %1 opening %2 socket to %3(%4)", "ASIODNS_READ_DATA", "error %1 reading %2 data from %3(%4)", "ASIODNS_READ_TIMEOUT", "receive timeout while waiting for data from %1(%2)", "ASIODNS_SEND_DATA", "error %1 sending data using %2 to %3(%4)", - "ASIODNS_SYNC_UDP_CLOSE_FAIL", "failed to close a DNS/UDP socket: %1", - "ASIODNS_TCP_ACCEPT_FAIL", "failed to accept TCP DNS connection: %1", - "ASIODNS_TCP_CLEANUP_CLOSE_FAIL", "failed to close a DNS/TCP socket on port cleanup: %1", - "ASIODNS_TCP_CLOSE_ACCEPTOR_FAIL", "failed to close listening TCP socket: %1", - "ASIODNS_TCP_CLOSE_FAIL", "failed to close DNS/TCP socket with a client: %1", - "ASIODNS_TCP_CLOSE_NORESP_FAIL", "failed to close DNS/TCP socket with a client: %1", - "ASIODNS_TCP_GETREMOTE_FAIL", "failed to get remote address of a DNS TCP connection: %1", - "ASIODNS_TCP_READDATA_FAIL", "failed to get DNS data on a TCP socket: %1", - "ASIODNS_TCP_READLEN_FAIL", "failed to get DNS data length on a TCP socket: %1", - "ASIODNS_TCP_WRITE_FAIL", "failed to send DNS message over a TCP socket: %1", - "ASIODNS_UDP_ASYNC_SEND_FAIL", "Error sending UDP packet to %1: %2", - "ASIODNS_UDP_CLOSE_FAIL", "failed to close a DNS/UDP socket: %1", - "ASIODNS_UDP_RECEIVE_FAIL", "failed to receive UDP DNS packet: %1", - "ASIODNS_UDP_SYNC_RECEIVE_FAIL", "failed to receive UDP DNS packet: %1", - "ASIODNS_UDP_SYNC_SEND_FAIL", "Error sending UDP packet to %1: %2", "ASIODNS_UNKNOWN_ORIGIN", "unknown origin for ASIO error code %1 (protocol: %2, address %3)", "ASIODNS_UNKNOWN_RESULT", "unknown result (%1) when IOFetch::stop() was executed for I/O to %2(%3)", NULL diff --git a/src/lib/asiodns/asiodns_messages.h b/src/lib/asiodns/asiodns_messages.h index b3dab48ce4..e4b45788ff 100644 --- a/src/lib/asiodns/asiodns_messages.h +++ b/src/lib/asiodns/asiodns_messages.h @@ -8,29 +8,12 @@ namespace isc { namespace asiodns { -extern const isc::log::MessageID ASIODNS_FD_ADD_TCP; -extern const isc::log::MessageID ASIODNS_FD_ADD_UDP; extern const isc::log::MessageID ASIODNS_FETCH_COMPLETED; extern const isc::log::MessageID ASIODNS_FETCH_STOPPED; extern const isc::log::MessageID ASIODNS_OPEN_SOCKET; extern const isc::log::MessageID ASIODNS_READ_DATA; extern const isc::log::MessageID ASIODNS_READ_TIMEOUT; extern const isc::log::MessageID ASIODNS_SEND_DATA; -extern const isc::log::MessageID ASIODNS_SYNC_UDP_CLOSE_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_ACCEPT_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_CLEANUP_CLOSE_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_CLOSE_ACCEPTOR_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_CLOSE_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_CLOSE_NORESP_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_GETREMOTE_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_READDATA_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_READLEN_FAIL; -extern const isc::log::MessageID ASIODNS_TCP_WRITE_FAIL; -extern const isc::log::MessageID ASIODNS_UDP_ASYNC_SEND_FAIL; -extern const isc::log::MessageID ASIODNS_UDP_CLOSE_FAIL; -extern const isc::log::MessageID ASIODNS_UDP_RECEIVE_FAIL; -extern const isc::log::MessageID ASIODNS_UDP_SYNC_RECEIVE_FAIL; -extern const isc::log::MessageID ASIODNS_UDP_SYNC_SEND_FAIL; extern const isc::log::MessageID ASIODNS_UNKNOWN_ORIGIN; extern const isc::log::MessageID ASIODNS_UNKNOWN_RESULT; diff --git a/src/lib/d2srv/d2_messages.cc b/src/lib/d2srv/d2_messages.cc index 9439876357..d45ee2892b 100644 --- a/src/lib/d2srv/d2_messages.cc +++ b/src/lib/d2srv/d2_messages.cc @@ -9,10 +9,8 @@ namespace d2 { extern const isc::log::MessageID DHCP_DDNS_ADD_FAILED = "DHCP_DDNS_ADD_FAILED"; extern const isc::log::MessageID DHCP_DDNS_ADD_SUCCEEDED = "DHCP_DDNS_ADD_SUCCEEDED"; -extern const isc::log::MessageID DHCP_DDNS_ALREADY_RUNNING = "DHCP_DDNS_ALREADY_RUNNING"; extern const isc::log::MessageID DHCP_DDNS_AT_MAX_TRANSACTIONS = "DHCP_DDNS_AT_MAX_TRANSACTIONS"; extern const isc::log::MessageID DHCP_DDNS_CLEARED_FOR_SHUTDOWN = "DHCP_DDNS_CLEARED_FOR_SHUTDOWN"; -extern const isc::log::MessageID DHCP_DDNS_COMMAND = "DHCP_DDNS_COMMAND"; extern const isc::log::MessageID DHCP_DDNS_CONFIGURE = "DHCP_DDNS_CONFIGURE"; extern const isc::log::MessageID DHCP_DDNS_CONFIGURED_CALLOUT_DROP = "DHCP_DDNS_CONFIGURED_CALLOUT_DROP"; extern const isc::log::MessageID DHCP_DDNS_CONFIG_CHECK_FAIL = "DHCP_DDNS_CONFIG_CHECK_FAIL"; @@ -51,7 +49,6 @@ extern const isc::log::MessageID DHCP_DDNS_NO_ELIGIBLE_JOBS = "DHCP_DDNS_NO_ELIG extern const isc::log::MessageID DHCP_DDNS_NO_FWD_MATCH_ERROR = "DHCP_DDNS_NO_FWD_MATCH_ERROR"; extern const isc::log::MessageID DHCP_DDNS_NO_MATCH = "DHCP_DDNS_NO_MATCH"; extern const isc::log::MessageID DHCP_DDNS_NO_REV_MATCH_ERROR = "DHCP_DDNS_NO_REV_MATCH_ERROR"; -extern const isc::log::MessageID DHCP_DDNS_PROCESS_INIT = "DHCP_DDNS_PROCESS_INIT"; extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_QUEUE_FULL = "DHCP_DDNS_QUEUE_MGR_QUEUE_FULL"; extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_QUEUE_RECEIVE = "DHCP_DDNS_QUEUE_MGR_QUEUE_RECEIVE"; extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_RECONFIGURING = "DHCP_DDNS_QUEUE_MGR_RECONFIGURING"; @@ -99,10 +96,8 @@ namespace { const char* values[] = { "DHCP_DDNS_ADD_FAILED", "DHCP_DDNS Request ID %1: Transaction outcome %2", "DHCP_DDNS_ADD_SUCCEEDED", "DHCP_DDNS Request ID %1: successfully added the DNS mapping addition for this request: %2", - "DHCP_DDNS_ALREADY_RUNNING", "%1 already running? %2", "DHCP_DDNS_AT_MAX_TRANSACTIONS", "application has %1 queued requests but has reached maximum number of %2 concurrent transactions", "DHCP_DDNS_CLEARED_FOR_SHUTDOWN", "application has met shutdown criteria for shutdown type: %1", - "DHCP_DDNS_COMMAND", "command directive received, command: %1 - args: %2", "DHCP_DDNS_CONFIGURE", "configuration %1 received: %2", "DHCP_DDNS_CONFIGURED_CALLOUT_DROP", "configuration was rejected because a callout set the next step to 'drop': %1", "DHCP_DDNS_CONFIG_CHECK_FAIL", "DHCP-DDNS server configuration check failed: %1", @@ -141,7 +136,6 @@ const char* values[] = { "DHCP_DDNS_NO_FWD_MATCH_ERROR", "Request ID %1: the configured list of forward DDNS domains does not contain a match for: %2 The request has been discarded.", "DHCP_DDNS_NO_MATCH", "No DNS servers match FQDN %1", "DHCP_DDNS_NO_REV_MATCH_ERROR", "Request ID %1: the configured list of reverse DDNS domains does not contain a match for: %2 The request has been discarded.", - "DHCP_DDNS_PROCESS_INIT", "application init invoked", "DHCP_DDNS_QUEUE_MGR_QUEUE_FULL", "application request queue has reached maximum number of entries %1", "DHCP_DDNS_QUEUE_MGR_QUEUE_RECEIVE", "Request ID %1: received and queued a request.", "DHCP_DDNS_QUEUE_MGR_RECONFIGURING", "application is reconfiguring the queue manager", diff --git a/src/lib/d2srv/d2_messages.h b/src/lib/d2srv/d2_messages.h index 7c1d2740ad..c06490e6b5 100644 --- a/src/lib/d2srv/d2_messages.h +++ b/src/lib/d2srv/d2_messages.h @@ -10,10 +10,8 @@ namespace d2 { extern const isc::log::MessageID DHCP_DDNS_ADD_FAILED; extern const isc::log::MessageID DHCP_DDNS_ADD_SUCCEEDED; -extern const isc::log::MessageID DHCP_DDNS_ALREADY_RUNNING; extern const isc::log::MessageID DHCP_DDNS_AT_MAX_TRANSACTIONS; extern const isc::log::MessageID DHCP_DDNS_CLEARED_FOR_SHUTDOWN; -extern const isc::log::MessageID DHCP_DDNS_COMMAND; extern const isc::log::MessageID DHCP_DDNS_CONFIGURE; extern const isc::log::MessageID DHCP_DDNS_CONFIGURED_CALLOUT_DROP; extern const isc::log::MessageID DHCP_DDNS_CONFIG_CHECK_FAIL; @@ -52,7 +50,6 @@ extern const isc::log::MessageID DHCP_DDNS_NO_ELIGIBLE_JOBS; extern const isc::log::MessageID DHCP_DDNS_NO_FWD_MATCH_ERROR; extern const isc::log::MessageID DHCP_DDNS_NO_MATCH; extern const isc::log::MessageID DHCP_DDNS_NO_REV_MATCH_ERROR; -extern const isc::log::MessageID DHCP_DDNS_PROCESS_INIT; extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_QUEUE_FULL; extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_QUEUE_RECEIVE; extern const isc::log::MessageID DHCP_DDNS_QUEUE_MGR_RECONFIGURING; diff --git a/src/lib/dhcpsrv/alloc_engine_messages.cc b/src/lib/dhcpsrv/alloc_engine_messages.cc index d74155c27e..dab647a0fa 100644 --- a/src/lib/dhcpsrv/alloc_engine_messages.cc +++ b/src/lib/dhcpsrv/alloc_engine_messages.cc @@ -10,7 +10,6 @@ namespace dhcp { extern const isc::log::MessageID ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS = "ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS"; extern const isc::log::MessageID ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS6 = "ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS6"; extern const isc::log::MessageID ALLOC_ENGINE_LEASE_RECLAIMED = "ALLOC_ENGINE_LEASE_RECLAIMED"; -extern const isc::log::MessageID ALLOC_ENGINE_REMOVAL_NCR_FAILED = "ALLOC_ENGINE_REMOVAL_NCR_FAILED"; extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_ERROR = "ALLOC_ENGINE_V4_ALLOC_ERROR"; extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_FAIL = "ALLOC_ENGINE_V4_ALLOC_FAIL"; extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_FAIL_CLASSES = "ALLOC_ENGINE_V4_ALLOC_FAIL_CLASSES"; @@ -80,7 +79,6 @@ extern const isc::log::MessageID ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_COMPLET extern const isc::log::MessageID ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_FAILED = "ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_FAILED"; extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_HR = "ALLOC_ENGINE_V6_RENEW_HR"; extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_REMOVE_RESERVED = "ALLOC_ENGINE_V6_RENEW_REMOVE_RESERVED"; -extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_REMOVE_UNRESERVED = "ALLOC_ENGINE_V6_RENEW_REMOVE_UNRESERVED"; extern const isc::log::MessageID ALLOC_ENGINE_V6_REUSE_EXPIRED_LEASE_DATA = "ALLOC_ENGINE_V6_REUSE_EXPIRED_LEASE_DATA"; extern const isc::log::MessageID ALLOC_ENGINE_V6_REVOKED_ADDR_LEASE = "ALLOC_ENGINE_V6_REVOKED_ADDR_LEASE"; extern const isc::log::MessageID ALLOC_ENGINE_V6_REVOKED_PREFIX_LEASE = "ALLOC_ENGINE_V6_REVOKED_PREFIX_LEASE"; @@ -96,7 +94,6 @@ const char* values[] = { "ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS", "%1: ignoring globally reserved address %2, it falls outside %3", "ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS6", "%1: ignoring globally reserved address %2, it falls outside %3", "ALLOC_ENGINE_LEASE_RECLAIMED", "successfully reclaimed lease %1", - "ALLOC_ENGINE_REMOVAL_NCR_FAILED", "sending removal name change request failed for lease %1: %2", "ALLOC_ENGINE_V4_ALLOC_ERROR", "%1: error during attempt to allocate an IPv4 address: %2", "ALLOC_ENGINE_V4_ALLOC_FAIL", "%1: failed to allocate an IPv4 address after %2 attempt(s)", "ALLOC_ENGINE_V4_ALLOC_FAIL_CLASSES", "%1: Failed to allocate an IPv4 address for client with classes: %2", @@ -166,7 +163,6 @@ const char* values[] = { "ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_FAILED", "deletion of expired-reclaimed leases failed: %1", "ALLOC_ENGINE_V6_RENEW_HR", "allocating leases reserved for the client %1 as a result of Renew", "ALLOC_ENGINE_V6_RENEW_REMOVE_RESERVED", "%1: checking if existing client's leases are reserved for another client", - "ALLOC_ENGINE_V6_RENEW_REMOVE_UNRESERVED", "dynamically allocating leases for the renewing client %1", "ALLOC_ENGINE_V6_REUSE_EXPIRED_LEASE_DATA", "%1: reusing expired lease, updated lease information: %2", "ALLOC_ENGINE_V6_REVOKED_ADDR_LEASE", "%1: address %2 was revoked from client %3 as it is reserved for client %4", "ALLOC_ENGINE_V6_REVOKED_PREFIX_LEASE", "%1: prefix %2/%3 was revoked from client %4 as it is reserved for client %5", diff --git a/src/lib/dhcpsrv/alloc_engine_messages.h b/src/lib/dhcpsrv/alloc_engine_messages.h index e9cd896b88..40bc79a388 100644 --- a/src/lib/dhcpsrv/alloc_engine_messages.h +++ b/src/lib/dhcpsrv/alloc_engine_messages.h @@ -11,7 +11,6 @@ namespace dhcp { extern const isc::log::MessageID ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS; extern const isc::log::MessageID ALLOC_ENGINE_IGNORING_UNSUITABLE_GLOBAL_ADDRESS6; extern const isc::log::MessageID ALLOC_ENGINE_LEASE_RECLAIMED; -extern const isc::log::MessageID ALLOC_ENGINE_REMOVAL_NCR_FAILED; extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_ERROR; extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_FAIL; extern const isc::log::MessageID ALLOC_ENGINE_V4_ALLOC_FAIL_CLASSES; @@ -81,7 +80,6 @@ extern const isc::log::MessageID ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_COMPLET extern const isc::log::MessageID ALLOC_ENGINE_V6_RECLAIMED_LEASES_DELETE_FAILED; extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_HR; extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_REMOVE_RESERVED; -extern const isc::log::MessageID ALLOC_ENGINE_V6_RENEW_REMOVE_UNRESERVED; extern const isc::log::MessageID ALLOC_ENGINE_V6_REUSE_EXPIRED_LEASE_DATA; extern const isc::log::MessageID ALLOC_ENGINE_V6_REVOKED_ADDR_LEASE; extern const isc::log::MessageID ALLOC_ENGINE_V6_REVOKED_PREFIX_LEASE; diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.cc b/src/lib/dhcpsrv/dhcpsrv_messages.cc index 992f4d82ad..e213ee756f 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.cc +++ b/src/lib/dhcpsrv/dhcpsrv_messages.cc @@ -12,12 +12,9 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET4 = "DHCPSRV_CFGMGR_AD extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET6 = "DHCPSRV_CFGMGR_ADD_SUBNET6"; extern const isc::log::MessageID DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE = "DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE"; extern const isc::log::MessageID DHCPSRV_CFGMGR_CFG_DHCP_DDNS = "DHCPSRV_CFGMGR_CFG_DHCP_DDNS"; -extern const isc::log::MessageID DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES = "DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES"; extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIG4_MERGED = "DHCPSRV_CFGMGR_CONFIG4_MERGED"; extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIG6_MERGED = "DHCPSRV_CFGMGR_CONFIG6_MERGED"; extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIGURE_SERVERID = "DHCPSRV_CFGMGR_CONFIGURE_SERVERID"; -extern const isc::log::MessageID DHCPSRV_CFGMGR_DDNS_PARAMETER_IGNORED = "DHCPSRV_CFGMGR_DDNS_PARAMETER_IGNORED"; -extern const isc::log::MessageID DHCPSRV_CFGMGR_DDNS_PARAMETER_MOVED = "DHCPSRV_CFGMGR_DDNS_PARAMETER_MOVED"; extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET4 = "DHCPSRV_CFGMGR_DEL_SUBNET4"; extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET6 = "DHCPSRV_CFGMGR_DEL_SUBNET6"; extern const isc::log::MessageID DHCPSRV_CFGMGR_FLQ_POPULATE_FREE_ADDRESS_LEASES = "DHCPSRV_CFGMGR_FLQ_POPULATE_FREE_ADDRESS_LEASES"; @@ -30,10 +27,6 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATE extern const isc::log::MessageID DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_POSSIBLE = "DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_POSSIBLE"; extern const isc::log::MessageID DHCPSRV_CFGMGR_NEW_SUBNET4 = "DHCPSRV_CFGMGR_NEW_SUBNET4"; extern const isc::log::MessageID DHCPSRV_CFGMGR_NEW_SUBNET6 = "DHCPSRV_CFGMGR_NEW_SUBNET6"; -extern const isc::log::MessageID DHCPSRV_CFGMGR_NO_SUBNET4 = "DHCPSRV_CFGMGR_NO_SUBNET4"; -extern const isc::log::MessageID DHCPSRV_CFGMGR_NO_SUBNET6 = "DHCPSRV_CFGMGR_NO_SUBNET6"; -extern const isc::log::MessageID DHCPSRV_CFGMGR_ONLY_SUBNET4 = "DHCPSRV_CFGMGR_ONLY_SUBNET4"; -extern const isc::log::MessageID DHCPSRV_CFGMGR_ONLY_SUBNET6 = "DHCPSRV_CFGMGR_ONLY_SUBNET6"; extern const isc::log::MessageID DHCPSRV_CFGMGR_OPTION_DUPLICATE = "DHCPSRV_CFGMGR_OPTION_DUPLICATE"; extern const isc::log::MessageID DHCPSRV_CFGMGR_RENEW_GTR_REBIND = "DHCPSRV_CFGMGR_RENEW_GTR_REBIND"; extern const isc::log::MessageID DHCPSRV_CFGMGR_SOCKET_RAW_UNSUPPORTED = "DHCPSRV_CFGMGR_SOCKET_RAW_UNSUPPORTED"; @@ -70,7 +63,6 @@ extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_EXTEND_SKIP = "DHCPSRV_HOOK extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_RECOVER_SKIP = "DHCPSRV_HOOK_LEASE6_RECOVER_SKIP"; extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_SELECT_SKIP = "DHCPSRV_HOOK_LEASE6_SELECT_SKIP"; extern const isc::log::MessageID DHCPSRV_HOST_MGR_DB_OPEN_CONNECTION_WITH_RETRY_FAILED = "DHCPSRV_HOST_MGR_DB_OPEN_CONNECTION_WITH_RETRY_FAILED"; -extern const isc::log::MessageID DHCPSRV_INVALID_ACCESS = "DHCPSRV_INVALID_ACCESS"; extern const isc::log::MessageID DHCPSRV_LEASE4_EXTENDED_INFO_SANITY_FAIL = "DHCPSRV_LEASE4_EXTENDED_INFO_SANITY_FAIL"; extern const isc::log::MessageID DHCPSRV_LEASE4_EXTENDED_INFO_UPGRADED = "DHCPSRV_LEASE4_EXTENDED_INFO_UPGRADED"; extern const isc::log::MessageID DHCPSRV_LEASE6_EXTENDED_INFO_SANITY_FAIL = "DHCPSRV_LEASE6_EXTENDED_INFO_SANITY_FAIL"; @@ -85,7 +77,6 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_ADD_ADDR4 = "DHCPSRV_MEMFILE_AD extern const isc::log::MessageID DHCPSRV_MEMFILE_ADD_ADDR6 = "DHCPSRV_MEMFILE_ADD_ADDR6"; extern const isc::log::MessageID DHCPSRV_MEMFILE_BEGIN_BUILD_EXTENDED_INFO_TABLES6 = "DHCPSRV_MEMFILE_BEGIN_BUILD_EXTENDED_INFO_TABLES6"; extern const isc::log::MessageID DHCPSRV_MEMFILE_BEGIN_EXTRACT_EXTENDED_INFO4 = "DHCPSRV_MEMFILE_BEGIN_EXTRACT_EXTENDED_INFO4"; -extern const isc::log::MessageID DHCPSRV_MEMFILE_BEGIN_TRANSACTION = "DHCPSRV_MEMFILE_BEGIN_TRANSACTION"; extern const isc::log::MessageID DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6 = "DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6"; extern const isc::log::MessageID DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6_ERROR = "DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6_ERROR"; extern const isc::log::MessageID DHCPSRV_MEMFILE_COMMIT = "DHCPSRV_MEMFILE_COMMIT"; @@ -121,7 +112,6 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID6 = "DHCPSRV_MEMFILE_G extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_CLIENTID = "DHCPSRV_MEMFILE_GET_SUBID_CLIENTID"; extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_HWADDR = "DHCPSRV_MEMFILE_GET_SUBID_HWADDR"; extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_PAGE6 = "DHCPSRV_MEMFILE_GET_SUBID_PAGE6"; -extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_VERSION = "DHCPSRV_MEMFILE_GET_VERSION"; extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_FILE_LOAD = "DHCPSRV_MEMFILE_LEASE_FILE_LOAD"; extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_LOAD = "DHCPSRV_MEMFILE_LEASE_LOAD"; extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_LOAD_ROW_ERROR = "DHCPSRV_MEMFILE_LEASE_LOAD_ROW_ERROR"; @@ -147,14 +137,12 @@ extern const isc::log::MessageID DHCPSRV_MT_DISABLED_QUEUE_CONTROL = "DHCPSRV_MT extern const isc::log::MessageID DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE = "DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE"; extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR4 = "DHCPSRV_MYSQL_ADD_ADDR4"; extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR6 = "DHCPSRV_MYSQL_ADD_ADDR6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_BEGIN_TRANSACTION = "DHCPSRV_MYSQL_BEGIN_TRANSACTION"; extern const isc::log::MessageID DHCPSRV_MYSQL_COMMIT = "DHCPSRV_MYSQL_COMMIT"; extern const isc::log::MessageID DHCPSRV_MYSQL_DB = "DHCPSRV_MYSQL_DB"; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED = "DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED"; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_ADDR = "DHCPSRV_MYSQL_DELETE_ADDR"; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4 = "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4"; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6 = "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6"; -extern const isc::log::MessageID DHCPSRV_MYSQL_FATAL_ERROR = "DHCPSRV_MYSQL_FATAL_ERROR"; extern const isc::log::MessageID DHCPSRV_MYSQL_GET4 = "DHCPSRV_MYSQL_GET4"; extern const isc::log::MessageID DHCPSRV_MYSQL_GET6 = "DHCPSRV_MYSQL_GET6"; extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR4 = "DHCPSRV_MYSQL_GET_ADDR4"; @@ -192,7 +180,6 @@ extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED = "DHCP extern const isc::log::MessageID DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT = "DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT"; extern const isc::log::MessageID DHCPSRV_MYSQL_NO_TLS = "DHCPSRV_MYSQL_NO_TLS"; extern const isc::log::MessageID DHCPSRV_MYSQL_ROLLBACK = "DHCPSRV_MYSQL_ROLLBACK"; -extern const isc::log::MessageID DHCPSRV_MYSQL_START_TRANSACTION = "DHCPSRV_MYSQL_START_TRANSACTION"; extern const isc::log::MessageID DHCPSRV_MYSQL_TLS_CIPHER = "DHCPSRV_MYSQL_TLS_CIPHER"; extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR4 = "DHCPSRV_MYSQL_UPDATE_ADDR4"; extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR6 = "DHCPSRV_MYSQL_UPDATE_ADDR6"; @@ -207,14 +194,11 @@ extern const isc::log::MessageID DHCPSRV_NO_SOCKETS_OPEN = "DHCPSRV_NO_SOCKETS_O extern const isc::log::MessageID DHCPSRV_OPEN_SOCKET_FAIL = "DHCPSRV_OPEN_SOCKET_FAIL"; extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR4 = "DHCPSRV_PGSQL_ADD_ADDR4"; extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR6 = "DHCPSRV_PGSQL_ADD_ADDR6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_BEGIN_TRANSACTION = "DHCPSRV_PGSQL_BEGIN_TRANSACTION"; extern const isc::log::MessageID DHCPSRV_PGSQL_COMMIT = "DHCPSRV_PGSQL_COMMIT"; extern const isc::log::MessageID DHCPSRV_PGSQL_DB = "DHCPSRV_PGSQL_DB"; -extern const isc::log::MessageID DHCPSRV_PGSQL_DEALLOC_ERROR = "DHCPSRV_PGSQL_DEALLOC_ERROR"; extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_ADDR = "DHCPSRV_PGSQL_DELETE_ADDR"; extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4 = "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4"; extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6 = "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6"; -extern const isc::log::MessageID DHCPSRV_PGSQL_FATAL_ERROR = "DHCPSRV_PGSQL_FATAL_ERROR"; extern const isc::log::MessageID DHCPSRV_PGSQL_GET4 = "DHCPSRV_PGSQL_GET4"; extern const isc::log::MessageID DHCPSRV_PGSQL_GET6 = "DHCPSRV_PGSQL_GET6"; extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR4 = "DHCPSRV_PGSQL_GET_ADDR4"; @@ -252,7 +236,6 @@ extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED = "DHCP extern const isc::log::MessageID DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT = "DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT"; extern const isc::log::MessageID DHCPSRV_PGSQL_NO_TLS_SUPPORT = "DHCPSRV_PGSQL_NO_TLS_SUPPORT"; extern const isc::log::MessageID DHCPSRV_PGSQL_ROLLBACK = "DHCPSRV_PGSQL_ROLLBACK"; -extern const isc::log::MessageID DHCPSRV_PGSQL_START_TRANSACTION = "DHCPSRV_PGSQL_START_TRANSACTION"; extern const isc::log::MessageID DHCPSRV_PGSQL_TLS_SUPPORT = "DHCPSRV_PGSQL_TLS_SUPPORT"; extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR4 = "DHCPSRV_PGSQL_UPDATE_ADDR4"; extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR6 = "DHCPSRV_PGSQL_UPDATE_ADDR6"; @@ -282,7 +265,6 @@ extern const isc::log::MessageID DHCPSRV_TIMERMGR_START_TIMER = "DHCPSRV_TIMERMG extern const isc::log::MessageID DHCPSRV_TIMERMGR_STOP_TIMER = "DHCPSRV_TIMERMGR_STOP_TIMER"; extern const isc::log::MessageID DHCPSRV_TIMERMGR_UNREGISTER_ALL_TIMERS = "DHCPSRV_TIMERMGR_UNREGISTER_ALL_TIMERS"; extern const isc::log::MessageID DHCPSRV_TIMERMGR_UNREGISTER_TIMER = "DHCPSRV_TIMERMGR_UNREGISTER_TIMER"; -extern const isc::log::MessageID DHCPSRV_UNEXPECTED_NAME = "DHCPSRV_UNEXPECTED_NAME"; extern const isc::log::MessageID DHCPSRV_UNKNOWN_DB = "DHCPSRV_UNKNOWN_DB"; } // namespace dhcp @@ -296,12 +278,9 @@ const char* values[] = { "DHCPSRV_CFGMGR_ADD_SUBNET6", "adding subnet %1", "DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE", "enabling listening on all interfaces", "DHCPSRV_CFGMGR_CFG_DHCP_DDNS", "Setting DHCP-DDNS configuration to: %1", - "DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES", "stop listening on all interfaces", "DHCPSRV_CFGMGR_CONFIG4_MERGED", "Configuration backend data has been merged.", "DHCPSRV_CFGMGR_CONFIG6_MERGED", "Configuration backend data has been merged.", "DHCPSRV_CFGMGR_CONFIGURE_SERVERID", "server configuration includes specification of a server identifier", - "DHCPSRV_CFGMGR_DDNS_PARAMETER_IGNORED", "dhcp-ddns:%1 is deprecated, using existing global:%2", - "DHCPSRV_CFGMGR_DDNS_PARAMETER_MOVED", "dhcp-ddns:%1 is deprecated, moving it to global:%2", "DHCPSRV_CFGMGR_DEL_SUBNET4", "IPv4 subnet %1 removed", "DHCPSRV_CFGMGR_DEL_SUBNET6", "IPv6 subnet %1 removed", "DHCPSRV_CFGMGR_FLQ_POPULATE_FREE_ADDRESS_LEASES", "populating free address leases for the FLQ allocator in subnet %1; it can take a while!", @@ -314,10 +293,6 @@ const char* values[] = { "DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_POSSIBLE", "setting \"ip-reservations-unique\" from false to true poses a risk that some host backends may still contain multiple reservations for the same IP address", "DHCPSRV_CFGMGR_NEW_SUBNET4", "a new subnet has been added to configuration: %1", "DHCPSRV_CFGMGR_NEW_SUBNET6", "a new subnet has been added to configuration: %1", - "DHCPSRV_CFGMGR_NO_SUBNET4", "no suitable subnet is defined for address hint %1", - "DHCPSRV_CFGMGR_NO_SUBNET6", "no suitable subnet is defined for address hint %1", - "DHCPSRV_CFGMGR_ONLY_SUBNET4", "retrieved subnet %1 for address hint %2", - "DHCPSRV_CFGMGR_ONLY_SUBNET6", "retrieved subnet %1 for address hint %2", "DHCPSRV_CFGMGR_OPTION_DUPLICATE", "multiple options with the code: %1 added to the subnet: %2", "DHCPSRV_CFGMGR_RENEW_GTR_REBIND", "in %1, the value of renew-timer %2 is greater than the value of rebind-timer %3, ignoring renew-timer", "DHCPSRV_CFGMGR_SOCKET_RAW_UNSUPPORTED", "use of raw sockets is unsupported on this OS, UDP sockets will be used", @@ -354,7 +329,6 @@ const char* values[] = { "DHCPSRV_HOOK_LEASE6_RECOVER_SKIP", "DHCPv6 lease %1 was not recovered from declined state because a callout set the skip status.", "DHCPSRV_HOOK_LEASE6_SELECT_SKIP", "Lease6 (non-temporary) creation was skipped, because of callout skip flag.", "DHCPSRV_HOST_MGR_DB_OPEN_CONNECTION_WITH_RETRY_FAILED", "Failed to connect to database: %1 with error: %2", - "DHCPSRV_INVALID_ACCESS", "invalid database access string: %1", "DHCPSRV_LEASE4_EXTENDED_INFO_SANITY_FAIL", "extended info for lease %1 failed checks (%2)", "DHCPSRV_LEASE4_EXTENDED_INFO_UPGRADED", "extended info for lease %1 was upgraded", "DHCPSRV_LEASE6_EXTENDED_INFO_SANITY_FAIL", "extended info for lease %1 failed checks (%2)", @@ -369,7 +343,6 @@ const char* values[] = { "DHCPSRV_MEMFILE_ADD_ADDR6", "adding IPv6 lease with address %1", "DHCPSRV_MEMFILE_BEGIN_BUILD_EXTENDED_INFO_TABLES6", "building extended info tables with %1 sanity check level, tables %2", "DHCPSRV_MEMFILE_BEGIN_EXTRACT_EXTENDED_INFO4", "extract extended info with %1 sanity check level%2", - "DHCPSRV_MEMFILE_BEGIN_TRANSACTION", "committing to memory file database", "DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6", "building extended info tables saw %1 leases, extended info sanity checks modified %2 leases and %3 leases were entered into tables", "DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6_ERROR", "building extended info tables got an exception on the lease for %1: %2", "DHCPSRV_MEMFILE_COMMIT", "committing to memory file database", @@ -405,7 +378,6 @@ const char* values[] = { "DHCPSRV_MEMFILE_GET_SUBID_CLIENTID", "obtaining IPv4 lease for subnet ID %1 and client ID %2", "DHCPSRV_MEMFILE_GET_SUBID_HWADDR", "obtaining IPv4 lease for subnet ID %1 and hardware address %2", "DHCPSRV_MEMFILE_GET_SUBID_PAGE6", "obtaining at most %1 IPv6 leases starting from address %2 for subnet ID %3", - "DHCPSRV_MEMFILE_GET_VERSION", "obtaining schema version information", "DHCPSRV_MEMFILE_LEASE_FILE_LOAD", "loading leases from file %1", "DHCPSRV_MEMFILE_LEASE_LOAD", "loading lease %1", "DHCPSRV_MEMFILE_LEASE_LOAD_ROW_ERROR", "discarding row %1, error: %2", @@ -431,14 +403,12 @@ const char* values[] = { "DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE", "current configuration will result in opening multiple broadcast capable sockets on some interfaces and some DHCP messages may be duplicated", "DHCPSRV_MYSQL_ADD_ADDR4", "adding IPv4 lease with address %1", "DHCPSRV_MYSQL_ADD_ADDR6", "adding IPv6 lease with address %1, lease type %2", - "DHCPSRV_MYSQL_BEGIN_TRANSACTION", "committing to MySQL database", "DHCPSRV_MYSQL_COMMIT", "committing to MySQL database", "DHCPSRV_MYSQL_DB", "opening MySQL lease database: %1", "DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED", "deleted %1 reclaimed leases from the database", "DHCPSRV_MYSQL_DELETE_ADDR", "deleting lease for address %1", "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4", "deleting reclaimed IPv4 leases that expired more than %1 seconds ago", "DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6", "deleting reclaimed IPv6 leases that expired more than %1 seconds ago", - "DHCPSRV_MYSQL_FATAL_ERROR", "Unrecoverable MySQL error occurred: %1 for <%2>, reason: %3 (error code: %4).", "DHCPSRV_MYSQL_GET4", "obtaining all IPv4 leases", "DHCPSRV_MYSQL_GET6", "obtaining all IPv6 leases", "DHCPSRV_MYSQL_GET_ADDR4", "obtaining IPv4 lease for address %1", @@ -476,7 +446,6 @@ const char* values[] = { "DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT", "recount of leases returned a negative value", "DHCPSRV_MYSQL_NO_TLS", "TLS was required but is not used", "DHCPSRV_MYSQL_ROLLBACK", "rolling back MySQL database", - "DHCPSRV_MYSQL_START_TRANSACTION", "starting new MySQL transaction", "DHCPSRV_MYSQL_TLS_CIPHER", "TLS cipher: %1", "DHCPSRV_MYSQL_UPDATE_ADDR4", "updating IPv4 lease for address %1", "DHCPSRV_MYSQL_UPDATE_ADDR6", "updating IPv6 lease for address %1, lease type %2", @@ -491,14 +460,11 @@ const char* values[] = { "DHCPSRV_OPEN_SOCKET_FAIL", "failed to open socket: %1", "DHCPSRV_PGSQL_ADD_ADDR4", "adding IPv4 lease with address %1", "DHCPSRV_PGSQL_ADD_ADDR6", "adding IPv6 lease with address %1, lease type %2", - "DHCPSRV_PGSQL_BEGIN_TRANSACTION", "committing to PostgreSQL database", "DHCPSRV_PGSQL_COMMIT", "committing to PostgreSQL database", "DHCPSRV_PGSQL_DB", "opening PostgreSQL lease database: %1", - "DHCPSRV_PGSQL_DEALLOC_ERROR", "An error occurred deallocating SQL statements while closing the PostgreSQL lease database: %1", "DHCPSRV_PGSQL_DELETE_ADDR", "deleting lease for address %1", "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4", "deleting reclaimed IPv4 leases that expired more than %1 seconds ago", "DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6", "deleting reclaimed IPv6 leases that expired more than %1 seconds ago", - "DHCPSRV_PGSQL_FATAL_ERROR", "Unrecoverable PostgreSQL error occurred: Statement: <%1>, reason: %2 (error code: %3).", "DHCPSRV_PGSQL_GET4", "obtaining all IPv4 leases", "DHCPSRV_PGSQL_GET6", "obtaining all IPv6 leases", "DHCPSRV_PGSQL_GET_ADDR4", "obtaining IPv4 lease for address %1", @@ -536,7 +502,6 @@ const char* values[] = { "DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT", "recount of leases returned a negative value", "DHCPSRV_PGSQL_NO_TLS_SUPPORT", "Attempt to configure TLS (unsupported for PostgreSQL): %1", "DHCPSRV_PGSQL_ROLLBACK", "rolling back PostgreSQL database", - "DHCPSRV_PGSQL_START_TRANSACTION", "starting a new PostgreSQL transaction", "DHCPSRV_PGSQL_TLS_SUPPORT", "Attempt to configure TLS: %1", "DHCPSRV_PGSQL_UPDATE_ADDR4", "updating IPv4 lease for address %1", "DHCPSRV_PGSQL_UPDATE_ADDR6", "updating IPv6 lease for address %1, lease type %2", @@ -566,7 +531,6 @@ const char* values[] = { "DHCPSRV_TIMERMGR_STOP_TIMER", "stopping timer: %1", "DHCPSRV_TIMERMGR_UNREGISTER_ALL_TIMERS", "unregistering all timers", "DHCPSRV_TIMERMGR_UNREGISTER_TIMER", "unregistering timer: %1", - "DHCPSRV_UNEXPECTED_NAME", "database access parameters passed through '%1', expected 'lease-database'", "DHCPSRV_UNKNOWN_DB", "unknown database type: %1", NULL }; diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.h b/src/lib/dhcpsrv/dhcpsrv_messages.h index 9013e7e2d5..e57a2eda80 100644 --- a/src/lib/dhcpsrv/dhcpsrv_messages.h +++ b/src/lib/dhcpsrv/dhcpsrv_messages.h @@ -13,12 +13,9 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET4; extern const isc::log::MessageID DHCPSRV_CFGMGR_ADD_SUBNET6; extern const isc::log::MessageID DHCPSRV_CFGMGR_ALL_IFACES_ACTIVE; extern const isc::log::MessageID DHCPSRV_CFGMGR_CFG_DHCP_DDNS; -extern const isc::log::MessageID DHCPSRV_CFGMGR_CLEAR_ACTIVE_IFACES; extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIG4_MERGED; extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIG6_MERGED; extern const isc::log::MessageID DHCPSRV_CFGMGR_CONFIGURE_SERVERID; -extern const isc::log::MessageID DHCPSRV_CFGMGR_DDNS_PARAMETER_IGNORED; -extern const isc::log::MessageID DHCPSRV_CFGMGR_DDNS_PARAMETER_MOVED; extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET4; extern const isc::log::MessageID DHCPSRV_CFGMGR_DEL_SUBNET6; extern const isc::log::MessageID DHCPSRV_CFGMGR_FLQ_POPULATE_FREE_ADDRESS_LEASES; @@ -31,10 +28,6 @@ extern const isc::log::MessageID DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATE extern const isc::log::MessageID DHCPSRV_CFGMGR_IP_RESERVATIONS_UNIQUE_DUPLICATES_POSSIBLE; extern const isc::log::MessageID DHCPSRV_CFGMGR_NEW_SUBNET4; extern const isc::log::MessageID DHCPSRV_CFGMGR_NEW_SUBNET6; -extern const isc::log::MessageID DHCPSRV_CFGMGR_NO_SUBNET4; -extern const isc::log::MessageID DHCPSRV_CFGMGR_NO_SUBNET6; -extern const isc::log::MessageID DHCPSRV_CFGMGR_ONLY_SUBNET4; -extern const isc::log::MessageID DHCPSRV_CFGMGR_ONLY_SUBNET6; extern const isc::log::MessageID DHCPSRV_CFGMGR_OPTION_DUPLICATE; extern const isc::log::MessageID DHCPSRV_CFGMGR_RENEW_GTR_REBIND; extern const isc::log::MessageID DHCPSRV_CFGMGR_SOCKET_RAW_UNSUPPORTED; @@ -71,7 +64,6 @@ extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_EXTEND_SKIP; extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_RECOVER_SKIP; extern const isc::log::MessageID DHCPSRV_HOOK_LEASE6_SELECT_SKIP; extern const isc::log::MessageID DHCPSRV_HOST_MGR_DB_OPEN_CONNECTION_WITH_RETRY_FAILED; -extern const isc::log::MessageID DHCPSRV_INVALID_ACCESS; extern const isc::log::MessageID DHCPSRV_LEASE4_EXTENDED_INFO_SANITY_FAIL; extern const isc::log::MessageID DHCPSRV_LEASE4_EXTENDED_INFO_UPGRADED; extern const isc::log::MessageID DHCPSRV_LEASE6_EXTENDED_INFO_SANITY_FAIL; @@ -86,7 +78,6 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_ADD_ADDR4; extern const isc::log::MessageID DHCPSRV_MEMFILE_ADD_ADDR6; extern const isc::log::MessageID DHCPSRV_MEMFILE_BEGIN_BUILD_EXTENDED_INFO_TABLES6; extern const isc::log::MessageID DHCPSRV_MEMFILE_BEGIN_EXTRACT_EXTENDED_INFO4; -extern const isc::log::MessageID DHCPSRV_MEMFILE_BEGIN_TRANSACTION; extern const isc::log::MessageID DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6; extern const isc::log::MessageID DHCPSRV_MEMFILE_BUILD_EXTENDED_INFO_TABLES6_ERROR; extern const isc::log::MessageID DHCPSRV_MEMFILE_COMMIT; @@ -122,7 +113,6 @@ extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID6; extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_CLIENTID; extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_HWADDR; extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_SUBID_PAGE6; -extern const isc::log::MessageID DHCPSRV_MEMFILE_GET_VERSION; extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_FILE_LOAD; extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_LOAD; extern const isc::log::MessageID DHCPSRV_MEMFILE_LEASE_LOAD_ROW_ERROR; @@ -148,14 +138,12 @@ extern const isc::log::MessageID DHCPSRV_MT_DISABLED_QUEUE_CONTROL; extern const isc::log::MessageID DHCPSRV_MULTIPLE_RAW_SOCKETS_PER_IFACE; extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR4; extern const isc::log::MessageID DHCPSRV_MYSQL_ADD_ADDR6; -extern const isc::log::MessageID DHCPSRV_MYSQL_BEGIN_TRANSACTION; extern const isc::log::MessageID DHCPSRV_MYSQL_COMMIT; extern const isc::log::MessageID DHCPSRV_MYSQL_DB; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETED_EXPIRED_RECLAIMED; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_ADDR; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED4; extern const isc::log::MessageID DHCPSRV_MYSQL_DELETE_EXPIRED_RECLAIMED6; -extern const isc::log::MessageID DHCPSRV_MYSQL_FATAL_ERROR; extern const isc::log::MessageID DHCPSRV_MYSQL_GET4; extern const isc::log::MessageID DHCPSRV_MYSQL_GET6; extern const isc::log::MessageID DHCPSRV_MYSQL_GET_ADDR4; @@ -193,7 +181,6 @@ extern const isc::log::MessageID DHCPSRV_MYSQL_LEASE_DB_RECONNECT_FAILED; extern const isc::log::MessageID DHCPSRV_MYSQL_NEGATIVE_LEASES_STAT; extern const isc::log::MessageID DHCPSRV_MYSQL_NO_TLS; extern const isc::log::MessageID DHCPSRV_MYSQL_ROLLBACK; -extern const isc::log::MessageID DHCPSRV_MYSQL_START_TRANSACTION; extern const isc::log::MessageID DHCPSRV_MYSQL_TLS_CIPHER; extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR4; extern const isc::log::MessageID DHCPSRV_MYSQL_UPDATE_ADDR6; @@ -208,14 +195,11 @@ extern const isc::log::MessageID DHCPSRV_NO_SOCKETS_OPEN; extern const isc::log::MessageID DHCPSRV_OPEN_SOCKET_FAIL; extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR4; extern const isc::log::MessageID DHCPSRV_PGSQL_ADD_ADDR6; -extern const isc::log::MessageID DHCPSRV_PGSQL_BEGIN_TRANSACTION; extern const isc::log::MessageID DHCPSRV_PGSQL_COMMIT; extern const isc::log::MessageID DHCPSRV_PGSQL_DB; -extern const isc::log::MessageID DHCPSRV_PGSQL_DEALLOC_ERROR; extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_ADDR; extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED4; extern const isc::log::MessageID DHCPSRV_PGSQL_DELETE_EXPIRED_RECLAIMED6; -extern const isc::log::MessageID DHCPSRV_PGSQL_FATAL_ERROR; extern const isc::log::MessageID DHCPSRV_PGSQL_GET4; extern const isc::log::MessageID DHCPSRV_PGSQL_GET6; extern const isc::log::MessageID DHCPSRV_PGSQL_GET_ADDR4; @@ -253,7 +237,6 @@ extern const isc::log::MessageID DHCPSRV_PGSQL_LEASE_DB_RECONNECT_FAILED; extern const isc::log::MessageID DHCPSRV_PGSQL_NEGATIVE_LEASES_STAT; extern const isc::log::MessageID DHCPSRV_PGSQL_NO_TLS_SUPPORT; extern const isc::log::MessageID DHCPSRV_PGSQL_ROLLBACK; -extern const isc::log::MessageID DHCPSRV_PGSQL_START_TRANSACTION; extern const isc::log::MessageID DHCPSRV_PGSQL_TLS_SUPPORT; extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR4; extern const isc::log::MessageID DHCPSRV_PGSQL_UPDATE_ADDR6; @@ -283,7 +266,6 @@ extern const isc::log::MessageID DHCPSRV_TIMERMGR_START_TIMER; extern const isc::log::MessageID DHCPSRV_TIMERMGR_STOP_TIMER; extern const isc::log::MessageID DHCPSRV_TIMERMGR_UNREGISTER_ALL_TIMERS; extern const isc::log::MessageID DHCPSRV_TIMERMGR_UNREGISTER_TIMER; -extern const isc::log::MessageID DHCPSRV_UNEXPECTED_NAME; extern const isc::log::MessageID DHCPSRV_UNKNOWN_DB; } // namespace dhcp diff --git a/src/lib/dhcpsrv/fuzz_messages.cc b/src/lib/dhcpsrv/fuzz_messages.cc index 651f2e2017..66e878710b 100644 --- a/src/lib/dhcpsrv/fuzz_messages.cc +++ b/src/lib/dhcpsrv/fuzz_messages.cc @@ -28,7 +28,7 @@ const char* values[] = { "FUZZ_READ_FAIL", "error reading input from fuzzer: %1", "FUZZ_SEND", "sent %1 byte(s) to the socket connected to the Kea interface", "FUZZ_SEND_ERROR", "failed to send data to Kea input socket: %1", - "FUZZ_SHORT_SEND", "expected to send %d bytes to Kea input socket but only sent %2", + "FUZZ_SHORT_SEND", "expected to send %1 bytes to Kea input socket but only sent %2", "FUZZ_SOCKET_CREATE_FAIL", "failed to crease socket for use by fuzzing thread: %1", NULL }; diff --git a/src/lib/process/process_messages.cc b/src/lib/process/process_messages.cc index bd19813f1c..bd01e3d707 100644 --- a/src/lib/process/process_messages.cc +++ b/src/lib/process/process_messages.cc @@ -8,19 +8,14 @@ namespace isc { namespace process { extern const isc::log::MessageID DCTL_ALREADY_RUNNING = "DCTL_ALREADY_RUNNING"; -extern const isc::log::MessageID DCTL_CCSESSION_ENDING = "DCTL_CCSESSION_ENDING"; extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_ERROR = "DCTL_CFG_FILE_RELOAD_ERROR"; extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD = "DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD"; -extern const isc::log::MessageID DCTL_COMMAND_RECEIVED = "DCTL_COMMAND_RECEIVED"; extern const isc::log::MessageID DCTL_CONFIG_CHECK_COMPLETE = "DCTL_CONFIG_CHECK_COMPLETE"; extern const isc::log::MessageID DCTL_CONFIG_COMPLETE = "DCTL_CONFIG_COMPLETE"; extern const isc::log::MessageID DCTL_CONFIG_DEPRECATED = "DCTL_CONFIG_DEPRECATED"; extern const isc::log::MessageID DCTL_CONFIG_FETCH = "DCTL_CONFIG_FETCH"; extern const isc::log::MessageID DCTL_CONFIG_FILE_LOAD_FAIL = "DCTL_CONFIG_FILE_LOAD_FAIL"; -extern const isc::log::MessageID DCTL_CONFIG_LOAD_FAIL = "DCTL_CONFIG_LOAD_FAIL"; extern const isc::log::MessageID DCTL_CONFIG_START = "DCTL_CONFIG_START"; -extern const isc::log::MessageID DCTL_CONFIG_STUB = "DCTL_CONFIG_STUB"; -extern const isc::log::MessageID DCTL_CONFIG_UPDATE = "DCTL_CONFIG_UPDATE"; extern const isc::log::MessageID DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED = "DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED"; extern const isc::log::MessageID DCTL_DEVELOPMENT_VERSION = "DCTL_DEVELOPMENT_VERSION"; extern const isc::log::MessageID DCTL_INIT_PROCESS = "DCTL_INIT_PROCESS"; @@ -31,7 +26,6 @@ extern const isc::log::MessageID DCTL_PARSER_FAIL = "DCTL_PARSER_FAIL"; extern const isc::log::MessageID DCTL_PID_FILE_ERROR = "DCTL_PID_FILE_ERROR"; extern const isc::log::MessageID DCTL_PROCESS_FAILED = "DCTL_PROCESS_FAILED"; extern const isc::log::MessageID DCTL_RUN_PROCESS = "DCTL_RUN_PROCESS"; -extern const isc::log::MessageID DCTL_SESSION_FAIL = "DCTL_SESSION_FAIL"; extern const isc::log::MessageID DCTL_SHUTDOWN = "DCTL_SHUTDOWN"; extern const isc::log::MessageID DCTL_SHUTDOWN_SIGNAL_RECVD = "DCTL_SHUTDOWN_SIGNAL_RECVD"; extern const isc::log::MessageID DCTL_STANDALONE = "DCTL_STANDALONE"; @@ -46,19 +40,14 @@ namespace { const char* values[] = { "DCTL_ALREADY_RUNNING", "%1 already running? %2", - "DCTL_CCSESSION_ENDING", "%1 ending control channel session", "DCTL_CFG_FILE_RELOAD_ERROR", "configuration reload failed: %1, reverting to current configuration.", "DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD", "OS signal %1 received, reloading configuration from file: %2", - "DCTL_COMMAND_RECEIVED", "%1 received command: %2, arguments: %3", "DCTL_CONFIG_CHECK_COMPLETE", "server has completed configuration check: %1, result: %2", "DCTL_CONFIG_COMPLETE", "server has completed configuration: %1", "DCTL_CONFIG_DEPRECATED", "server configuration includes a deprecated object: %1", "DCTL_CONFIG_FETCH", "Fetching configuration data from config backends.", "DCTL_CONFIG_FILE_LOAD_FAIL", "%1 reason: %2", - "DCTL_CONFIG_LOAD_FAIL", "%1 configuration failed to load: %2", "DCTL_CONFIG_START", "parsing new configuration: %1", - "DCTL_CONFIG_STUB", "%1 configuration stub handler called", - "DCTL_CONFIG_UPDATE", "%1 updated configuration received: %2", "DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED", "Failed to connect to database: %1 with error: %2", "DCTL_DEVELOPMENT_VERSION", "This software is a development branch of Kea. It is not recommended for production use.", "DCTL_INIT_PROCESS", "%1 initializing the application", @@ -69,7 +58,6 @@ const char* values[] = { "DCTL_PID_FILE_ERROR", "%1 could not create a PID file: %2", "DCTL_PROCESS_FAILED", "%1 application execution failed: %2", "DCTL_RUN_PROCESS", "%1 starting application event loop", - "DCTL_SESSION_FAIL", "%1 controller failed to establish Kea session: %1", "DCTL_SHUTDOWN", "%1 has shut down, pid: %2, version: %3", "DCTL_SHUTDOWN_SIGNAL_RECVD", "OS signal %1 received, starting shutdown", "DCTL_STANDALONE", "%1 skipping message queue, running standalone", diff --git a/src/lib/process/process_messages.h b/src/lib/process/process_messages.h index 8811e5172b..316cc7abcc 100644 --- a/src/lib/process/process_messages.h +++ b/src/lib/process/process_messages.h @@ -9,19 +9,14 @@ namespace isc { namespace process { extern const isc::log::MessageID DCTL_ALREADY_RUNNING; -extern const isc::log::MessageID DCTL_CCSESSION_ENDING; extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_ERROR; extern const isc::log::MessageID DCTL_CFG_FILE_RELOAD_SIGNAL_RECVD; -extern const isc::log::MessageID DCTL_COMMAND_RECEIVED; extern const isc::log::MessageID DCTL_CONFIG_CHECK_COMPLETE; extern const isc::log::MessageID DCTL_CONFIG_COMPLETE; extern const isc::log::MessageID DCTL_CONFIG_DEPRECATED; extern const isc::log::MessageID DCTL_CONFIG_FETCH; extern const isc::log::MessageID DCTL_CONFIG_FILE_LOAD_FAIL; -extern const isc::log::MessageID DCTL_CONFIG_LOAD_FAIL; extern const isc::log::MessageID DCTL_CONFIG_START; -extern const isc::log::MessageID DCTL_CONFIG_STUB; -extern const isc::log::MessageID DCTL_CONFIG_UPDATE; extern const isc::log::MessageID DCTL_DB_OPEN_CONNECTION_WITH_RETRY_FAILED; extern const isc::log::MessageID DCTL_DEVELOPMENT_VERSION; extern const isc::log::MessageID DCTL_INIT_PROCESS; @@ -32,7 +27,6 @@ extern const isc::log::MessageID DCTL_PARSER_FAIL; extern const isc::log::MessageID DCTL_PID_FILE_ERROR; extern const isc::log::MessageID DCTL_PROCESS_FAILED; extern const isc::log::MessageID DCTL_RUN_PROCESS; -extern const isc::log::MessageID DCTL_SESSION_FAIL; extern const isc::log::MessageID DCTL_SHUTDOWN; extern const isc::log::MessageID DCTL_SHUTDOWN_SIGNAL_RECVD; extern const isc::log::MessageID DCTL_STANDALONE; diff --git a/src/lib/tcp/tcp_messages.cc b/src/lib/tcp/tcp_messages.cc index 5dc70ea18f..3dd0b4ea7c 100644 --- a/src/lib/tcp/tcp_messages.cc +++ b/src/lib/tcp/tcp_messages.cc @@ -11,7 +11,6 @@ extern const isc::log::MessageID MT_TCP_LISTENER_MGR_STARTED = "MT_TCP_LISTENER_ extern const isc::log::MessageID MT_TCP_LISTENER_MGR_STOPPED = "MT_TCP_LISTENER_MGR_STOPPED"; extern const isc::log::MessageID MT_TCP_LISTENER_MGR_STOPPING = "MT_TCP_LISTENER_MGR_STOPPING"; extern const isc::log::MessageID TCP_CLIENT_REQUEST_RECEIVED = "TCP_CLIENT_REQUEST_RECEIVED"; -extern const isc::log::MessageID TCP_CONNECTION_CLOSE_CALLBACK_FAILED = "TCP_CONNECTION_CLOSE_CALLBACK_FAILED"; extern const isc::log::MessageID TCP_CONNECTION_REJECTED_BY_FILTER = "TCP_CONNECTION_REJECTED_BY_FILTER"; extern const isc::log::MessageID TCP_CONNECTION_SHUTDOWN = "TCP_CONNECTION_SHUTDOWN"; extern const isc::log::MessageID TCP_CONNECTION_SHUTDOWN_FAILED = "TCP_CONNECTION_SHUTDOWN_FAILED"; @@ -20,11 +19,9 @@ extern const isc::log::MessageID TCP_CONNECTION_STOP_FAILED = "TCP_CONNECTION_ST extern const isc::log::MessageID TCP_DATA_RECEIVED = "TCP_DATA_RECEIVED"; extern const isc::log::MessageID TCP_DATA_SENT = "TCP_DATA_SENT"; extern const isc::log::MessageID TCP_IDLE_CONNECTION_TIMEOUT_OCCURRED = "TCP_IDLE_CONNECTION_TIMEOUT_OCCURRED"; -extern const isc::log::MessageID TCP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED = "TCP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED"; extern const isc::log::MessageID TCP_REQUEST_RECEIVED_FAILED = "TCP_REQUEST_RECEIVED_FAILED"; extern const isc::log::MessageID TCP_REQUEST_RECEIVE_START = "TCP_REQUEST_RECEIVE_START"; extern const isc::log::MessageID TCP_SERVER_RESPONSE_SEND = "TCP_SERVER_RESPONSE_SEND"; -extern const isc::log::MessageID TCP_SERVER_RESPONSE_SEND_DETAILS = "TCP_SERVER_RESPONSE_SEND_DETAILS"; extern const isc::log::MessageID TLS_CONNECTION_HANDSHAKE_FAILED = "TLS_CONNECTION_HANDSHAKE_FAILED"; extern const isc::log::MessageID TLS_CONNECTION_HANDSHAKE_START = "TLS_CONNECTION_HANDSHAKE_START"; extern const isc::log::MessageID TLS_REQUEST_RECEIVE_START = "TLS_REQUEST_RECEIVE_START"; @@ -40,7 +37,6 @@ const char* values[] = { "MT_TCP_LISTENER_MGR_STOPPED", "MtTcpListenerMgr for %1:%2 stopped.", "MT_TCP_LISTENER_MGR_STOPPING", "Stopping MtTcpListenerMgr for %1:%2", "TCP_CLIENT_REQUEST_RECEIVED", "received TCP request from %1", - "TCP_CONNECTION_CLOSE_CALLBACK_FAILED", "Connection close callback threw an exception", "TCP_CONNECTION_REJECTED_BY_FILTER", "connection from %1 has been denied by the connection filter.", "TCP_CONNECTION_SHUTDOWN", "shutting down TCP connection from %1", "TCP_CONNECTION_SHUTDOWN_FAILED", "shutting down TCP connection failed", @@ -49,11 +45,9 @@ const char* values[] = { "TCP_DATA_RECEIVED", "received %1 bytes from %2", "TCP_DATA_SENT", "send %1 bytes to %2", "TCP_IDLE_CONNECTION_TIMEOUT_OCCURRED", "closing connection with %1 as a result of a timeout", - "TCP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED", "premature connection timeout occurred: in transaction ? %1, transid: %2, current_transid: %3", "TCP_REQUEST_RECEIVED_FAILED", "An unexpected error occurred processing a request from %1, error: %2", "TCP_REQUEST_RECEIVE_START", "start receiving request from %1 with timeout %2", "TCP_SERVER_RESPONSE_SEND", "sending TCP response to %1", - "TCP_SERVER_RESPONSE_SEND_DETAILS", "detailed information about response sent to %1:\n%2", "TLS_CONNECTION_HANDSHAKE_FAILED", "TLS handshake with %1 failed with %2", "TLS_CONNECTION_HANDSHAKE_START", "start TLS handshake with %1 with timeout %2", "TLS_REQUEST_RECEIVE_START", "start receiving request from %1 with timeout %2", diff --git a/src/lib/tcp/tcp_messages.h b/src/lib/tcp/tcp_messages.h index 7dc458cbb7..2770c58556 100644 --- a/src/lib/tcp/tcp_messages.h +++ b/src/lib/tcp/tcp_messages.h @@ -12,7 +12,6 @@ extern const isc::log::MessageID MT_TCP_LISTENER_MGR_STARTED; extern const isc::log::MessageID MT_TCP_LISTENER_MGR_STOPPED; extern const isc::log::MessageID MT_TCP_LISTENER_MGR_STOPPING; extern const isc::log::MessageID TCP_CLIENT_REQUEST_RECEIVED; -extern const isc::log::MessageID TCP_CONNECTION_CLOSE_CALLBACK_FAILED; extern const isc::log::MessageID TCP_CONNECTION_REJECTED_BY_FILTER; extern const isc::log::MessageID TCP_CONNECTION_SHUTDOWN; extern const isc::log::MessageID TCP_CONNECTION_SHUTDOWN_FAILED; @@ -21,11 +20,9 @@ extern const isc::log::MessageID TCP_CONNECTION_STOP_FAILED; extern const isc::log::MessageID TCP_DATA_RECEIVED; extern const isc::log::MessageID TCP_DATA_SENT; extern const isc::log::MessageID TCP_IDLE_CONNECTION_TIMEOUT_OCCURRED; -extern const isc::log::MessageID TCP_PREMATURE_CONNECTION_TIMEOUT_OCCURRED; extern const isc::log::MessageID TCP_REQUEST_RECEIVED_FAILED; extern const isc::log::MessageID TCP_REQUEST_RECEIVE_START; extern const isc::log::MessageID TCP_SERVER_RESPONSE_SEND; -extern const isc::log::MessageID TCP_SERVER_RESPONSE_SEND_DETAILS; extern const isc::log::MessageID TLS_CONNECTION_HANDSHAKE_FAILED; extern const isc::log::MessageID TLS_CONNECTION_HANDSHAKE_START; extern const isc::log::MessageID TLS_REQUEST_RECEIVE_START; |