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

[#3084] Use callout argument instead of status

Browse Source 
src/bin/dhcp4/dhcp4_messages.mes
    DHCP4_HOOK_LEASE4_OFFER_ARGUMENT_MISSING - new message

src/bin/dhcp4/dhcp4_srv.cc
    Dhcpv4Srv::processDhcp4Query() - look for offer-address-in-use
    argument in lease4_offer unpark lambda
This commit is contained in:
Thomas Markwalder
2023-11-09 14:58:33 -05:00
parent 2d998a28be
commit e662234173
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1502,6 +1502,7 @@ Dhcpv4Srv::processDhcp4Query(Pkt4Ptr& query, Pkt4Ptr& rsp,
static_cast<int64_t>(1));
rsp.reset();
return;
}
}
@@ -1513,8 +1514,17 @@ Dhcpv4Srv::processDhcp4Query(Pkt4Ptr& query, Pkt4Ptr& rsp,
hook_label, query,
[this, callout_handle, query, rsp, callout_handle_state, hook_idx, ctx]() mutable {
if (hook_idx == Hooks.hook_index_lease4_offer_) {
auto status = callout_handle->getStatus();
if (status == CalloutHandle::NEXT_STEP_DROP) {
bool offer_address_in_use = false;
try {
callout_handle->getArgument("offer-address-in-use", offer_address_in_use);
} catch (const NoSuchArgument& ex) {
/// @todo consider logging this
LOG_DEBUG(hooks_logger, DBG_DHCP4_HOOKS,
DHCP4_HOOK_LEASE4_OFFER_ARGUMENT_MISSING)
.arg(query->getLabel());
}
if (offer_address_in_use) {
Lease4Ptr lease = ctx->new_lease_;
bool lease_exists = (ctx->offer_lft_ > 0);
if (MultiThreadingMgr::instance().getMode()) {