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

[#1405] clean up code

Browse Source
This commit is contained in:
Razvan Becheriu
2020-10-30 10:45:22 +02:00
parent ce79c85507
commit ab564dd25b
1 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/lib/dhcpsrv/alloc_engine.cc
View File

@@ -535,25 +535,14 @@ isAllocated(const asiolink::IOAddress& prefix, const uint8_t prefix_len) const {
ConstHostPtr ConstHostPtr
AllocEngine::ClientContext6::currentHost() const { AllocEngine::ClientContext6::currentHost() const {
Subnet6Ptr subnet = host_subnet_ ? host_subnet_ : subnet_; Subnet6Ptr subnet = host_subnet_ ? host_subnet_ : subnet_;
if (subnet) { if (subnet && (subnet_->getHostReservationMode() & Network::HR_IN_SUBNET_FLAG)) {
SubnetID id = subnet->getID(); auto host = hosts_.find(subnet->getID());
// if reservation mode is explicitly set to global search only by
// SUBNET_ID_GLOBAL.
if (subnet_->getHostReservationMode() == Network::HR_GLOBAL) {
id = SUBNET_ID_GLOBAL;
}
auto host = hosts_.find(id);
if (host != hosts_.cend()) { if (host != hosts_.cend()) {
return (host->second); return (host->second);
} else if (id != SUBNET_ID_GLOBAL) {
// nothing found for specific subnet ID leads to search for
// SUBNET_ID_GLOBAL if HR_GLOBAL_FLAG is set.
return (globalHost());
} }
} }
return (ConstHostPtr()); return (globalHost());
} }
ConstHostPtr ConstHostPtr
@@ -593,7 +582,8 @@ AllocEngine::ClientContext6::getDdnsParams() {
return (DdnsParamsPtr(new DdnsParams())); return (DdnsParamsPtr(new DdnsParams()));
} }
void AllocEngine::findReservation(ClientContext6& ctx) { void
AllocEngine::findReservation(ClientContext6& ctx) {
ctx.hosts_.clear(); ctx.hosts_.clear();
// If there is no subnet, there is nothing to do. // If there is no subnet, there is nothing to do.
@@ -2992,8 +2982,10 @@ addressReserved(const IOAddress& address, const AllocEngine::ClientContext4& ctx
if (!ctx.subnet_) { if (!ctx.subnet_) {
return false; return false;
} }
bool in_subnet = (ctx.subnet_->getHostReservationMode() & Network::HR_IN_SUBNET_FLAG); // Check which host reservation mode is supported in this subnet.
bool out_of_pool = (ctx.subnet_->getHostReservationMode() & Network::HR_OUT_OF_POOL_FLAG); Network::HRMode hr_mode = ctx.subnet_->getHostReservationMode();
bool in_subnet = (hr_mode & Network::HR_IN_SUBNET_FLAG);
bool out_of_pool = (hr_mode & Network::HR_OUT_OF_POOL_FLAG);
// The HR_OUT_OF_POOL_FLAG indicates that no client should be assigned reservations // The HR_OUT_OF_POOL_FLAG indicates that no client should be assigned reservations
// from within the dynamic pool, and for that reason we only look at reservations that // from within the dynamic pool, and for that reason we only look at reservations that
// are outside the pools, hence the inPool check. // are outside the pools, hence the inPool check.
@@ -3076,8 +3068,10 @@ hasAddressReservation(AllocEngine::ClientContext4& ctx) {
} }
auto host = ctx.hosts_.find(subnet->getID()); auto host = ctx.hosts_.find(subnet->getID());
bool in_subnet = (subnet->getHostReservationMode() & Network::HR_IN_SUBNET_FLAG); // Check which host reservation mode is supported in this subnet.
bool out_of_pool = (subnet->getHostReservationMode() & Network::HR_OUT_OF_POOL_FLAG); Network::HRMode hr_mode = subnet->getHostReservationMode();
bool in_subnet = (hr_mode & Network::HR_IN_SUBNET_FLAG);
bool out_of_pool = (hr_mode & Network::HR_OUT_OF_POOL_FLAG);
// The HR_OUT_OF_POOL_FLAG indicates that no client should be assigned reservations // The HR_OUT_OF_POOL_FLAG indicates that no client should be assigned reservations
// from within the dynamic pool, and for that reason we only look at reservations that // from within the dynamic pool, and for that reason we only look at reservations that
// are outside the pools, hence the inPool check. // are outside the pools, hence the inPool check.
@@ -3262,24 +3256,14 @@ AllocEngine::ClientContext4::ClientContext4(const Subnet4Ptr& subnet,
ConstHostPtr ConstHostPtr
AllocEngine::ClientContext4::currentHost() const { AllocEngine::ClientContext4::currentHost() const {
if (subnet_) { if (subnet_ && (subnet_->getHostReservationMode() & Network::HR_IN_SUBNET_FLAG)) {
SubnetID id = subnet_->getID(); auto host = hosts_.find(subnet_->getID());
// if reservation mode is explicitly set to global search only by
// SUBNET_ID_GLOBAL.
if (subnet_->getHostReservationMode() == Network::HR_GLOBAL) {
id = SUBNET_ID_GLOBAL;
}
auto host = hosts_.find(id);
if (host != hosts_.cend()) { if (host != hosts_.cend()) {
return (host->second); return (host->second);
} else if (id != SUBNET_ID_GLOBAL) {
// nothing found for specific subnet ID leads to search for
// SUBNET_ID_GLOBAL if HR_GLOBAL_FLAG is set.
return (globalHost());
} }
} }
return (ConstHostPtr());
return (globalHost());
} }
ConstHostPtr ConstHostPtr