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

[5549a] Rebased/Updated code - toto unit tests to port

Browse Source
This commit is contained in:
Francis Dupont
2018-05-18 23:59:32 +02:00
parent a6c4644775
commit fcbe15be47
10 changed files with 221 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,15 @@ Dhcpv4Exchange::Dhcpv4Exchange(const AllocEnginePtr& alloc_engine,
// Check for static reservations.
alloc_engine->findReservation(*context_);
// Set known builtin class if something was found.
if (!context_->hosts_.empty()) {
query->addClass("KNOWN");
}
}
// Perform second pass of classification.
Dhcpv4Srv::evaluateClasses(query, true);
}
const ClientClasses& classes = query_->getClasses();
@@ -3186,10 +3194,14 @@ void Dhcpv4Srv::classifyPacket(const Pkt4Ptr& pkt) {
// All packets belongs to ALL.
pkt->addClass("ALL");
// First phase: built-in vendor class processing
// First: built-in vendor class processing.
classifyByVendor(pkt);
// Run match expressions
// Run match expressions on classes not depending on KNOWN.
evaluateClasses(pkt, false);
}
void Dhcpv4Srv::evaluateClasses(const Pkt4Ptr& pkt, bool depend_on_known) {
// Note getClientClassDictionary() cannot be null
const ClientClassDictionaryPtr& dict =
CfgMgr::instance().getCurrentCfg()->getClientClassDictionary();
@@ -3206,6 +3218,10 @@ void Dhcpv4Srv::classifyPacket(const Pkt4Ptr& pkt) {
if ((*it)->getRequired()) {
continue;
}
// Not the right pass.
if ((*it)->getDependOnKnown() != depend_on_known) {
continue;
}
// Evaluate the expression which can return false (no match),
// true (match) or raise an exception (error)
try {