]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[5070] Tweaked the next step check.
authorTomek Mrugalski <tomasz@isc.org>
Mon, 27 Feb 2017 11:19:18 +0000 (12:19 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 27 Feb 2017 11:19:18 +0000 (12:19 +0100)
src/lib/dhcpsrv/alloc_engine.cc

index db3c981f221f872f9d04c0b0d087688668ee476a..4b4fa7fdc9ca181124f79b68d31902d06a4943f4 100644 (file)
@@ -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;
             }
         }