From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 27 Feb 2017 11:19:18 +0000 (+0100)
Subject: [5070] Tweaked the next step check.
X-Git-Tag: trac5137_base~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49228d7caa958a67476d269785a784f687a35848;p=thirdparty%2Fkea.git

[5070] Tweaked the next step check.
---

diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index db3c981f22..4b4fa7fdc9 100644
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -711,8 +711,8 @@ AllocEngine::allocateUnreservedLeases6(ClientContext6& ctx) {
                 leases.push_back(lease);
                 return (leases);
             } else if (ctx.callout_handle_ &&
-                       (ctx.callout_handle_->getStatus() ==
-                        CalloutHandle::NEXT_STEP_SKIP)) {
+                       (ctx.callout_handle_->getStatus() !=
+                        CalloutHandle::NEXT_STEP_CONTINUE)) {
                 // Don't retry when the callout status is next step skip.
                 break;
             }
@@ -2847,9 +2847,10 @@ AllocEngine::allocateUnreservedLease4(ClientContext4& ctx) {
             if (new_lease) {
                 return (new_lease);
             } else if (ctx.callout_handle_ &&
-                       (ctx.callout_handle_->getStatus() ==
-                        CalloutHandle::NEXT_STEP_SKIP)) {
-                // Don't retry when the callout status is next step skip.
+                       (ctx.callout_handle_->getStatus() !=
+                        CalloutHandle::NEXT_STEP_CONTINUE)) {
+                // Don't retry when the callout status is next step skip
+                // or next step drop.
                 break;
             }
         }