diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc index 6aab20bb55b259698a3ea810e5d49d40ec2ac42e..684b17edc440ee07c5617f60b19377c33c057b39 100644 --- a/src/bin/dhcp4/dhcp4_srv.cc +++ b/src/bin/dhcp4/dhcp4_srv.cc @@ -240,7 +240,7 @@ Dhcpv4Srv::shutdown() { } isc::dhcp::Subnet4Ptr -Dhcpv4Srv::selectSubnet(const Pkt4Ptr& query, const bool run_hooks) const { +Dhcpv4Srv::selectSubnet(const Pkt4Ptr& query) const { Subnet4Ptr subnet; @@ -256,7 +256,7 @@ Dhcpv4Srv::selectSubnet(const Pkt4Ptr& query, const bool run_hooks) const { subnet = cfgmgr.getCurrentCfg()->getCfgSubnets4()->selectSubnet(selector); // Let's execute all callouts registered for subnet4_select - if (run_hooks && HooksManager::calloutsPresent(hook_index_subnet4_select_)) { + if (HooksManager::calloutsPresent(hook_index_subnet4_select_)) { CalloutHandlePtr callout_handle = getCalloutHandle(query); // We're reusing callout_handle from previous calls @@ -1805,7 +1805,7 @@ Dhcpv4Srv::acceptDirectRequest(const Pkt4Ptr& pkt) const { return (false); } return ((pkt->getLocalAddr() != IOAddress::IPV4_BCAST_ADDRESS() - || selectSubnet(pkt, false))); + || selectSubnet(pkt))); } bool diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h index 10824043e25dc1e5011ade64828612575c08c13e..f0b9e4da7cacd99e8adbaeb206bd25b8b432b9d4 100644 --- a/src/bin/dhcp4/dhcp4_srv.h +++ b/src/bin/dhcp4/dhcp4_srv.h @@ -687,19 +687,9 @@ protected: /// @brief Selects a subnet for a given client's packet. /// - /// The @c run_hooks parameters controls whether the method should run - /// installed hooks for subnet selection. Disabling it is useful in - /// cases when the server should sanity check the client's packet before - /// the actual processing. If the sanity check fails, the packet can - /// be discarded. - /// /// @param query client's message - /// @param run_hooks A boolean value which specifies if the method should - /// run installed hooks after selecting the subnet (if true). The default - /// value is true. /// @return selected subnet (or NULL if no suitable subnet was found) - isc::dhcp::Subnet4Ptr selectSubnet(const Pkt4Ptr& query, - const bool run_hooks = true) const; + isc::dhcp::Subnet4Ptr selectSubnet(const Pkt4Ptr& query) const; /// indicates if shutdown is in progress. Setting it to true will /// initiate server shutdown procedure.