From 8aa346b44dc528c6e096773df1f49aba57a8b3b3 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Wed, 25 Nov 2015 13:09:42 +0100 Subject: [PATCH] [4097a] Aligned DHCP6_CLASS_* messages --- src/bin/dhcp6/dhcp6_messages.mes | 9 ++++++--- src/bin/dhcp6/dhcp6_srv.cc | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/bin/dhcp6/dhcp6_messages.mes b/src/bin/dhcp6/dhcp6_messages.mes index e4d77488c5..964d7e24b7 100644 --- 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 03ad687cb2..3b5829a0af 100644 --- 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); } } -- 2.47.2