Commit f86883c8 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3694] Swap in-pool checks with the host reservation checks in alloc engine.

parent 1dfb8b31
...@@ -1384,8 +1384,8 @@ AllocEngine::discoverLease4(AllocEngine::ClientContext4& ctx) { ...@@ -1384,8 +1384,8 @@ AllocEngine::discoverLease4(AllocEngine::ClientContext4& ctx) {
// reserved for another client, and must be in the range of the // reserved for another client, and must be in the range of the
// dynamic pool. // dynamic pool.
if (!new_lease && !ctx.requested_address_.isV4Zero() && if (!new_lease && !ctx.requested_address_.isV4Zero() &&
!addressReserved(ctx.requested_address_, ctx) && ctx.subnet_->inPool(Lease::TYPE_V4, ctx.requested_address_) &&
ctx.subnet_->inPool(Lease::TYPE_V4, ctx.requested_address_)) { !addressReserved(ctx.requested_address_, ctx)) {
new_lease = allocateOrReuseLease4(ctx.requested_address_, ctx); new_lease = allocateOrReuseLease4(ctx.requested_address_, ctx);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment