[4097a] Aligned DHCP6_CLASS_* messages

diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes
index e4d77488c543bb0ea8c5bd97d41388c538e44948..964d7e24b72930c8823d2f0478d29b9699ac85af 100644 (file)
--- a/src/bin/dhcp6/dhcp6_messages.mes
+++ b/src/bin/dhcp6/dhcp6_messages.mes
@@ -84,11 +84,14 @@ successfully established a session with the Kea control channel.
 This debug message is issued just before the IPv6 DHCP server attempts
 to establish a session with the Kea control channel.
 
-% DHCP6_CLASS_ASSIGNED client packet has been assigned to the following class(es): %1
+% DHCP6_CLASS_ASSIGNED %1: client packet has been assigned to the following class(es): %2
 This debug message informs that incoming packet has been assigned to specified
-class or classes.
+class or classes. This is a normal behavior and indicates successful operation.
+The first argument specifies the client and transaction identification
+information. The second argument includes all classes to which the
+packet has been assigned.
 
-% DHCP6_CLASS_UNCONFIGURED client packet belongs to an unconfigured class: %1
+% DHCP6_CLASS_UNCONFIGURED %1: client packet belongs to an unconfigured class: %1
 This debug message informs that incoming packet belongs to a class
 which cannot be found in the configuration. Either a hook written
 before the classification was added to Kea is used, or class naming is

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 03ad687cb2343dc5ef36e4dd7bc09e5b8f50c360..3b5829a0af0e37d3aef3ecf7b2c916ec284dadea 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -912,6 +912,7 @@ Dhcpv6Srv::buildCfgOptionList(const Pkt6Ptr& question,
                 ((*cclass).compare(0, VENDOR_CLASS_PREFIX.size(), VENDOR_CLASS_PREFIX) != 0)) {
                 // Not a VENDOR_CLASS_* so should be configured
                 LOG_DEBUG(dhcp6_logger, DBG_DHCP6_BASIC, DHCP6_CLASS_UNCONFIGURED)
+                    .arg(question->getLabel())
                     .arg(*cclass);
             }
             // Skip it
@@ -3015,6 +3016,7 @@ void Dhcpv6Srv::classifyPacket(const Pkt6Ptr& pkt) {
 
     if (!classes.empty()) {
         LOG_DEBUG(dhcp6_logger, DBG_DHCP6_BASIC, DHCP6_CLASS_ASSIGNED)
+            .arg(pkt->getLabel())
             .arg(classes);
     }
 }