Browse Source

[4097a] Aligned DHCP6_CLASS_* messages

Francis Dupont 9 years ago
parent
commit
8aa346b44d
2 changed files with 8 additions and 3 deletions
  1. 6 3
      src/bin/dhcp6/dhcp6_messages.mes
  2. 2 0
      src/bin/dhcp6/dhcp6_srv.cc

+ 6 - 3
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
 This debug message is issued just before the IPv6 DHCP server attempts
 to establish a session with the Kea control channel.
 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
 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
 This debug message informs that incoming packet belongs to a class
 which cannot be found in the configuration. Either a hook written
 which cannot be found in the configuration. Either a hook written
 before the classification was added to Kea is used, or class naming is
 before the classification was added to Kea is used, or class naming is

+ 2 - 0
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)) {
                 ((*cclass).compare(0, VENDOR_CLASS_PREFIX.size(), VENDOR_CLASS_PREFIX) != 0)) {
                 // Not a VENDOR_CLASS_* so should be configured
                 // Not a VENDOR_CLASS_* so should be configured
                 LOG_DEBUG(dhcp6_logger, DBG_DHCP6_BASIC, DHCP6_CLASS_UNCONFIGURED)
                 LOG_DEBUG(dhcp6_logger, DBG_DHCP6_BASIC, DHCP6_CLASS_UNCONFIGURED)
+                    .arg(question->getLabel())
                     .arg(*cclass);
                     .arg(*cclass);
             }
             }
             // Skip it
             // Skip it
@@ -3015,6 +3016,7 @@ void Dhcpv6Srv::classifyPacket(const Pkt6Ptr& pkt) {
 
 
     if (!classes.empty()) {
     if (!classes.empty()) {
         LOG_DEBUG(dhcp6_logger, DBG_DHCP6_BASIC, DHCP6_CLASS_ASSIGNED)
         LOG_DEBUG(dhcp6_logger, DBG_DHCP6_BASIC, DHCP6_CLASS_ASSIGNED)
+            .arg(pkt->getLabel())
             .arg(classes);
             .arg(classes);
     }
     }
 }
 }