diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index 557c538398..d0955d4fa5 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -180,7 +180,7 @@ public: parameters); /// @brief Destructor. - ~MySqlConfigBackendDHCPv4Impl(); + ~MySqlConfigBackendDHCPv4Impl() = default; /// @brief Sends query to retrieve global parameter. /// @@ -3645,7 +3645,7 @@ TaggedStatementArray tagged_statements = { { } }; -}; // end anonymous namespace +} // end anonymous namespace MySqlConfigBackendDHCPv4Impl::MySqlConfigBackendDHCPv4Impl(const DatabaseConnection::ParameterMap& parameters) : MySqlConfigBackendImpl(parameters, &MySqlConfigBackendDHCPv4Impl::dbReconnect) { @@ -3665,9 +3665,6 @@ MySqlConfigBackendDHCPv4Impl::MySqlConfigBackendDHCPv4Impl(const DatabaseConnect conn_.makeReconnectCtl(timer_name_); } -MySqlConfigBackendDHCPv4Impl::~MySqlConfigBackendDHCPv4Impl() { -} - MySqlConfigBackendDHCPv4::MySqlConfigBackendDHCPv4(const DatabaseConnection::ParameterMap& parameters) : impl_(new MySqlConfigBackendDHCPv4Impl(parameters)), base_impl_(impl_) { } @@ -3677,6 +3674,11 @@ MySqlConfigBackendDHCPv4::isUnusable() { return (impl_->conn_.isUnusable()); } +DatabaseConnection::ParameterMap +MySqlConfigBackendDHCPv4::getParameters() const { + return impl_->getParameters(); +} + Subnet4Ptr MySqlConfigBackendDHCPv4::getSubnet4(const ServerSelector& server_selector, const std::string& subnet_prefix) const { diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h index e4a0bcf503..1c7dc168da 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.h @@ -604,6 +604,13 @@ public: /// otherwise virtual bool isUnusable(); + /// @brief Return backend parameters + /// + /// Returns the backend parameters + /// + /// @return Parameters of the backend. + isc::db::DatabaseConnection::ParameterMap getParameters() const; + protected: /// @brief Pointer to the implementation of the @c MySqlConfigBackendDHCPv4 diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index 5244047c65..48668e9b66 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -188,7 +188,7 @@ public: parameters); /// @brief Destructor. - ~MySqlConfigBackendDHCPv6Impl(); + ~MySqlConfigBackendDHCPv6Impl() = default; /// @brief Sends query to retrieve global parameter. /// @@ -4110,7 +4110,7 @@ TaggedStatementArray tagged_statements = { { } }; -}; // end anonymous namespace +} // end anonymous namespace MySqlConfigBackendDHCPv6Impl::MySqlConfigBackendDHCPv6Impl(const DatabaseConnection::ParameterMap& parameters) : MySqlConfigBackendImpl(parameters, &MySqlConfigBackendDHCPv6Impl::dbReconnect) { @@ -4130,9 +4130,6 @@ MySqlConfigBackendDHCPv6Impl::MySqlConfigBackendDHCPv6Impl(const DatabaseConnect conn_.makeReconnectCtl(timer_name_); } -MySqlConfigBackendDHCPv6Impl::~MySqlConfigBackendDHCPv6Impl() { -} - MySqlConfigBackendDHCPv6::MySqlConfigBackendDHCPv6(const DatabaseConnection::ParameterMap& parameters) : impl_(new MySqlConfigBackendDHCPv6Impl(parameters)), base_impl_(impl_) { } @@ -4142,6 +4139,11 @@ MySqlConfigBackendDHCPv6::isUnusable() { return (impl_->conn_.isUnusable()); } +DatabaseConnection::ParameterMap +MySqlConfigBackendDHCPv6::getParameters() const { + return impl_->getParameters(); +} + Subnet6Ptr MySqlConfigBackendDHCPv6::getSubnet6(const ServerSelector& server_selector, const std::string& subnet_prefix) const { diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h index 4ab608c9f4..6af6553927 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.h @@ -636,6 +636,13 @@ public: /// otherwise virtual bool isUnusable(); + /// @brief Return backend parameters + /// + /// Returns the backend parameters + /// + /// @return Parameters of the backend. + isc::db::DatabaseConnection::ParameterMap getParameters() const; + protected: /// @brief Pointer to the implementation of the @c MySqlConfigBackendDHCPv6