mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

[#1139] Host based classes used in allocation

Browse Source 
The DHCPv4 server now takes into account client classes specified in
gobal reservations to select a subnet and/or pool for allocation within
a shared network.
This commit is contained in:
Marcin Siodelski
2020-03-06 17:33:16 +01:00
parent e5c189505e
commit 2b705d9172
2 changed files with 192 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,6 +186,17 @@ Dhcpv4Exchange::Dhcpv4Exchange(const AllocEnginePtr& alloc_engine,
}
}
// Global host reservations are independent of a selected subnet. If the
// global reservations contain client classes we should use them in case
// they are meant to affect pool selection.
auto global_host = context_->globalHost();
if (global_host && !global_host->getClientClasses4().empty()) {
// Previously evaluated classes must be ignored because having new
// classes fetched from the hosts db may eliminate some of them.
query->classes_.clear();
setReservedClientClasses();
}
// Set KNOWN builtin class if something was found, UNKNOWN if not.
if (!context_->hosts_.empty()) {
query->addClass("KNOWN");
@@ -2784,8 +2795,12 @@ Dhcpv4Srv::processDiscover(Pkt4Ptr& discover) {
// Adding any other options makes sense only when we got the lease.
if (!ex.getResponse()->getYiaddr().isV4Zero()) {
// Assign reserved classes.
ex.setReservedClientClasses();
// If this is global reservation we have already fetched it and
// evaluated the classes.
if (!ex.getContext()->globalHost()) {
// Assign reserved classes.
ex.setReservedClientClasses();
}
// Required classification
requiredClassify(ex);
@@ -2852,8 +2867,12 @@ Dhcpv4Srv::processRequest(Pkt4Ptr& request, AllocEngine::ClientContext4Ptr& cont
// Adding any other options makes sense only when we got the lease.
if (!response->getYiaddr().isV4Zero()) {
// Assign reserved classes.
ex.setReservedClientClasses();
// If this is global reservation we have already fetched it and
// evaluated the classes.
if (!ex.getContext()->globalHost()) {
// Assign reserved classes.
ex.setReservedClientClasses();
}
// Required classification
requiredClassify(ex);
@@ -3166,7 +3185,11 @@ Dhcpv4Srv::processInform(Pkt4Ptr& inform) {
Pkt4Ptr ack = ex.getResponse();
ex.setReservedClientClasses();
// If this is global reservation we have already fetched it and
// evaluated the classes.
if (!ex.getContext()->globalHost()) {
ex.setReservedClientClasses();
}
requiredClassify(ex);
buildCfgOptionList(ex);