[#2820] small fixes

diff --git a/src/bin/dhcp6/dhcp6_messages.cc b/src/bin/dhcp6/dhcp6_messages.cc
index 0e3ff87abbc1b895872c17ccbf0e6e54fcd699da..ddf14c7f442c153c90a1e9a591a47b45b4681cbf 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.cc
+++ b/src/bin/dhcp6/dhcp6_messages.cc
@@ -188,9 +188,9 @@ const char* values[] = {
     "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",
-    "DHCP6_BUFFER_RECEIVED", "received buffer from %1:%2 to %3:%4 over interface %5",
+    "DHCP6_BUFFER_RECEIVED", "%1: received buffer from %2:%3 to %4:%5 over interface %6",
     "DHCP6_BUFFER_UNPACK", "%1: parsing buffer received from %2 to %3 over interface %4",
-    "DHCP6_BUFFER_WAIT_SIGNAL", "signal received while waiting for next packet",
+    "DHCP6_BUFFER_WAIT_SIGNAL", "%1: signal received while waiting for next packet",
     "DHCP6_CB_ON_DEMAND_FETCH_UPDATES_FAIL", "error on demand attempt to fetch configuration updates from the configuration backend(s): %1",
     "DHCP6_CB_PERIODIC_FETCH_UPDATES_FAIL", "error on periodic attempt to fetch configuration updates from the configuration backend(s): %1",
     "DHCP6_CB_PERIODIC_FETCH_UPDATES_RETRIES_EXHAUSTED", "maximum number of configuration fetch attempts: 10, has been exhausted without success",
@@ -235,15 +235,15 @@ const char* values[] = {
     "DHCP6_DECLINE_PROCESS_IA", "Processing of IA (IAID: %1) from client %2 started.",
     "DHCP6_DEPRECATED", "The following mechanism is now deprecated and will be removed in the future: %1",
     "DHCP6_DEVELOPMENT_VERSION", "This software is a development branch of Kea. It is not recommended for production use.",
-    "DHCP6_DHCP4O6_PACKET_RECEIVED", "received DHCPv4o6 packet from DHCPv4 server (type %1) for %2 port %3 on interface %4",
-    "DHCP6_DHCP4O6_RECEIVE_FAIL", "failed to receive DHCPv4o6: %1",
+    "DHCP6_DHCP4O6_PACKET_RECEIVED", "%1: received DHCPv4o6 packet from DHCPv4 server (type %2) for %3 port %4 on interface %5",
+    "DHCP6_DHCP4O6_RECEIVE_FAIL", "%1: failed to receive DHCPv4o6: %2",
     "DHCP6_DHCP4O6_RECEIVING", "receiving DHCPv4o6 packet from DHCPv4 server",
     "DHCP6_DHCP4O6_RESPONSE_DATA", "%1: responding with packet %2 (type %3), packet details: %4",
-    "DHCP6_DHCP4O6_SEND_FAIL", "failed to send DHCPv4o6 packet: %1",
+    "DHCP6_DHCP4O6_SEND_FAIL", "%1: failed to send DHCPv4o6 packet: %2",
     "DHCP6_DYNAMIC_RECONFIGURATION", "initiate server reconfiguration using file: %1, after receiving SIGHUP signal or config-reload command",
     "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", "flexible identifier generated for incoming packet: %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_HOOKS_LIBS_RELOAD_FAIL", "reload of hooks libraries failed",
     "DHCP6_HOOK_BUFFER_RCVD_DROP", "received buffer from %1 to %2 over interface %3 was dropped because a callout set the drop flag",
@@ -290,14 +290,14 @@ const char* values[] = {
     "DHCP6_PACKET_DROP_SERVERID_MISMATCH", "%1: dropping packet with server identifier: %2, server is using: %3",
     "DHCP6_PACKET_DROP_UNICAST", "%1: dropping unicast %2 packet as this packet should be sent to multicast",
     "DHCP6_PACKET_OPTIONS_SKIPPED", "%1: An error unpacking an option, caused subsequent options to be skipped: %2",
-    "DHCP6_PACKET_PROCESS_EXCEPTION", "exception occurred during packet processing",
+    "DHCP6_PACKET_PROCESS_EXCEPTION", "%1: exception occurred during packet processing",
     "DHCP6_PACKET_PROCESS_FAIL", "%1: processing of %2 message received from %3 failed: %4",
-    "DHCP6_PACKET_PROCESS_STD_EXCEPTION", "exception occurred during packet processing: %1",
+    "DHCP6_PACKET_PROCESS_STD_EXCEPTION", "%1: exception occurred during packet processing: %2",
     "DHCP6_PACKET_QUEUE_FULL", "multi-threading packet queue is full",
     "DHCP6_PACKET_RECEIVED", "%1: %2 (type %3) received from %4 to %5 on interface %6",
-    "DHCP6_PACKET_RECEIVE_FAIL", "error on attempt to receive packet: %1",
+    "DHCP6_PACKET_RECEIVE_FAIL", "%1: error on attempt to receive packet: %2",
     "DHCP6_PACKET_SEND", "%1: trying to send packet %2 (type %3) from [%4]:%5 to [%6]:%7 on interface %8",
-    "DHCP6_PACKET_SEND_FAIL", "failed to send DHCPv6 packet: %1",
+    "DHCP6_PACKET_SEND_FAIL", "%1: failed to send DHCPv6 packet: %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",

diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 38d47d93126799cb34b74ef2dee40f9a637385e1..b5486c0e06189e97321a1a9579381a1bce20887a 100644 (file)
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -1506,7 +1506,7 @@ AllocEngine::removeNonmatchingReservedLeases6(ClientContext6& ctx,
                         .arg(hosts.front()->getIdentifierAsText());
                 } else {
                     LOG_INFO(alloc_engine_logger, ALLOC_ENGINE_V6_REVOKED_PREFIX_LEASE)
-                        .arg(ctx.query_->toText())
+                        .arg(ctx.query_->getLabel())
                         .arg(candidate->addr_.toText())
                         .arg(static_cast<int>(candidate->prefixlen_))
                         .arg(ctx.duid_->toText())