mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-05 00:15:17 +00:00
Code Issues Releases Wiki Activity

[#2908] Fixed class assigned logs

Browse Source
This commit is contained in:
Francis Dupont
2023-08-01 17:58:41 +02:00
parent f3e0dde23c
commit 8deb3ba5b9
10 changed files with 87 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/dhcp4/dhcp4_srv.cc
View File

@@ -253,11 +253,9 @@ Dhcpv4Exchange::Dhcpv4Exchange(const AllocEnginePtr& alloc_engine,
evaluateClasses(query, true);
const ClientClasses& classes = query_->getClasses();
if (!classes.empty()) {
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_BASIC, DHCP4_CLASS_ASSIGNED)
.arg(query_->getLabel())
.arg(classes.toText());
}
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_BASIC, DHCP4_CLASSES_ASSIGNED)
.arg(query_->getLabel())
.arg(classes.toText());
// Check the DROP special class.
if (query_->inClass("DROP")) {
@@ -3436,6 +3434,10 @@ Dhcpv4Srv::processDiscover(Pkt4Ptr& discover, AllocEngine::ClientContext4Ptr& co
// Required classification
requiredClassify(ex);
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_BASIC, DHCP4_CLASSES_ASSIGNED)
.arg(discover->getLabel())
.arg(discover->getClasses().toText());
buildCfgOptionList(ex);
appendRequestedOptions(ex);
appendRequestedVendorOptions(ex);
@@ -3514,6 +3516,10 @@ Dhcpv4Srv::processRequest(Pkt4Ptr& request, AllocEngine::ClientContext4Ptr& cont
// Required classification
requiredClassify(ex);
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_BASIC, DHCP4_CLASSES_ASSIGNED)
.arg(request->getLabel())
.arg(request->getClasses().toText());
buildCfgOptionList(ex);
appendRequestedOptions(ex);
appendRequestedVendorOptions(ex);
@@ -3893,6 +3899,10 @@ Dhcpv4Srv::processInform(Pkt4Ptr& inform, AllocEngine::ClientContext4Ptr& contex
requiredClassify(ex);
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_BASIC, DHCP4_CLASSES_ASSIGNED)
.arg(inform->getLabel())
.arg(inform->getClasses().toText());
buildCfgOptionList(ex);
appendRequestedOptions(ex);
appendRequestedVendorOptions(ex);
@@ -4296,13 +4306,13 @@ void Dhcpv4Srv::requiredClassify(Dhcpv4Exchange& ex) {
if (status) {
LOG_INFO(dhcp4_logger, EVAL_RESULT)
.arg(*cclass)
.arg(status);
.arg("true");
// Matching: add the class
query->addClass(*cclass);
} else {
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_DETAIL, EVAL_RESULT)
.arg(*cclass)
.arg(status);
.arg("false");
}
} catch (const Exception& ex) {
LOG_ERROR(dhcp4_logger, EVAL_RESULT)