Commit 9cb76e21 authored by Francis Dupont's avatar Francis Dupont
Browse files

[4110a] Removed spurious indexes for registered hook points

parent 4a903024
...@@ -335,8 +335,7 @@ const std::string Dhcpv4Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_"); ...@@ -335,8 +335,7 @@ const std::string Dhcpv4Srv::VENDOR_CLASS_PREFIX("VENDOR_CLASS_");
Dhcpv4Srv::Dhcpv4Srv(uint16_t port, const bool use_bcast, Dhcpv4Srv::Dhcpv4Srv(uint16_t port, const bool use_bcast,
const bool direct_response_desired) const bool direct_response_desired)
: shutdown_(true), alloc_engine_(), port_(port), : shutdown_(true), alloc_engine_(), port_(port),
use_bcast_(use_bcast), hook_index_pkt4_receive_(-1), use_bcast_(use_bcast) {
hook_index_subnet4_select_(-1), hook_index_pkt4_send_(-1) {
LOG_DEBUG(dhcp4_logger, DBG_DHCP4_START, DHCP4_OPEN_SOCKET).arg(port); LOG_DEBUG(dhcp4_logger, DBG_DHCP4_START, DHCP4_OPEN_SOCKET).arg(port);
try { try {
...@@ -360,11 +359,6 @@ Dhcpv4Srv::Dhcpv4Srv(uint16_t port, const bool use_bcast, ...@@ -360,11 +359,6 @@ Dhcpv4Srv::Dhcpv4Srv(uint16_t port, const bool use_bcast,
alloc_engine_.reset(new AllocEngine(AllocEngine::ALLOC_ITERATIVE, 0, alloc_engine_.reset(new AllocEngine(AllocEngine::ALLOC_ITERATIVE, 0,
false /* false = IPv4 */)); false /* false = IPv4 */));
// Register hook points
hook_index_pkt4_receive_ = Hooks.hook_index_pkt4_receive_;
hook_index_subnet4_select_ = Hooks.hook_index_subnet4_select_;
hook_index_pkt4_send_ = Hooks.hook_index_pkt4_send_;
/// @todo call loadLibraries() when handling configuration changes /// @todo call loadLibraries() when handling configuration changes
} catch (const std::exception &e) { } catch (const std::exception &e) {
......
...@@ -791,11 +791,6 @@ private: ...@@ -791,11 +791,6 @@ private:
uint16_t port_; ///< UDP port number on which server listens. uint16_t port_; ///< UDP port number on which server listens.
bool use_bcast_; ///< Should broadcast be enabled on sockets (if true). bool use_bcast_; ///< Should broadcast be enabled on sockets (if true).
/// Indexes for registered hook points
int hook_index_pkt4_receive_;
int hook_index_subnet4_select_;
int hook_index_pkt4_send_;
public: public:
/// Class methods for DHCPv4-over-DHCPv6 handler /// Class methods for DHCPv4-over-DHCPv6 handler
......
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