mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 22:15:23 +00:00
Code Issues Releases Wiki Activity

[#1333] Added match expr check

Browse Source
This commit is contained in:
Francis Dupont
2020-07-22 18:11:43 +02:00
parent 3cc8483ddd
commit 5e69b754cd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -221,7 +221,9 @@ Dhcpv4Exchange::Dhcpv4Exchange(const AllocEnginePtr& alloc_engine,
CfgMgr::instance().getCurrentCfg()->getClientClassDictionary(); CfgMgr::instance().getCurrentCfg()->getClientClassDictionary();
const ClientClassDefListPtr& defs_ptr = dict->getClasses(); const ClientClassDefListPtr& defs_ptr = dict->getClasses();
for (auto def : *defs_ptr) { for (auto def : *defs_ptr) {
context_->query_->classes_.erase(def->getName()); if (def->getMatchExpr()) {
context_->query_->classes_.erase(def->getName());
}
} }
setReservedClientClasses(context_); setReservedClientClasses(context_);
evaluateClasses(context_->query_, false); evaluateClasses(context_->query_, false);

4
src/bin/dhcp6/dhcp6_srv.cc
View File

@@ -471,7 +471,9 @@ Dhcpv6Srv::initContext(const Pkt6Ptr& pkt,
CfgMgr::instance().getCurrentCfg()->getClientClassDictionary(); CfgMgr::instance().getCurrentCfg()->getClientClassDictionary();
const ClientClassDefListPtr& defs_ptr = dict->getClasses(); const ClientClassDefListPtr& defs_ptr = dict->getClasses();
for (auto def : *defs_ptr) { for (auto def : *defs_ptr) {
ctx.query_->classes_.erase(def->getName()); if (def->getMatchExpr()) {
ctx.query_->classes_.erase(def->getName());
}
} }
setReservedClientClasses(pkt, ctx); setReservedClientClasses(pkt, ctx);
evaluateClasses(pkt, false); evaluateClasses(pkt, false);