Commit 75b75c89 authored by Marcin Siodelski's avatar Marcin Siodelski

[master] Merge branch 'trac3699'

parents 18590933 18d3ee41
...@@ -170,6 +170,12 @@ ...@@ -170,6 +170,12 @@
during DHCPv4 hooks operation, i.e. anything related to user during DHCPv4 hooks operation, i.e. anything related to user
libraries will be logged using this logger.</simpara> libraries will be logged using this logger.</simpara>
</listitem> </listitem>
<listitem>
<simpara><command>kea-dhcp4.hosts</command> - this logger is used
within the libdhcpsrv and it logs messages related to the management
of the DHCPv4 host reservations, i.e. retrieval of the resevations
and adding new reservations.</simpara>
</listitem>
<listitem> <listitem>
<simpara><command>kea-dhcp6</command> - this is the root logger for <simpara><command>kea-dhcp6</command> - this is the root logger for
the DHCPv6 server. All components used by the DHCPv6 server inherit the DHCPv6 server. All components used by the DHCPv6 server inherit
...@@ -192,6 +198,12 @@ ...@@ -192,6 +198,12 @@
during DHCPv6 hooks operation, i.e. anything related to user during DHCPv6 hooks operation, i.e. anything related to user
libraries will be logged using this logger.</simpara> libraries will be logged using this logger.</simpara>
</listitem> </listitem>
<listitem>
<simpara><command>kea-dhcp6.hosts</command> - this logger is used
within the libdhcpsrv and it logs messages related to the management
of the DHCPv6 host reservations, i.e. retrieval of the resevations
and adding new reservations.</simpara>
</listitem>
<listitem> <listitem>
<simpara><command>kea-dhcp-ddns</command> - this is the root logger for <simpara><command>kea-dhcp-ddns</command> - this is the root logger for
the kea-dhcp-ddns deamon. All components used by this deamon inherit the kea-dhcp-ddns deamon. All components used by this deamon inherit
......
/dhcpsrv_messages.cc /dhcpsrv_messages.cc
/dhcpsrv_messages.h /dhcpsrv_messages.h
/hosts_messages.cc
/hosts_messages.h
/s-messages /s-messages
...@@ -35,19 +35,22 @@ EXTRA_DIST += parsers/host_reservation_parser.h ...@@ -35,19 +35,22 @@ EXTRA_DIST += parsers/host_reservation_parser.h
EXTRA_DIST += parsers/host_reservations_list_parser.h EXTRA_DIST += parsers/host_reservations_list_parser.h
# Define rule to build logging source files from message file # Define rule to build logging source files from message file
dhcpsrv_messages.h dhcpsrv_messages.cc: s-messages dhcpsrv_messages.h dhcpsrv_messages.cc hosts_messages.h hosts_messages.cc: s-messages
s-messages: dhcpsrv_messages.mes s-messages: dhcpsrv_messages.mes hosts_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes $(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes
touch $@ touch $@
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes
touch $@
# Tell Automake that the dhcpsrv_messages.{cc,h} source files are created in the # Tell Automake that the {dhcpsrv,hosts}_messages.{cc,h} source files are created
# build process, so it must create these before doing anything else. Although # in the build process, so it must create these before doing anything else.
# they are a dependency of the library (so will be created from the message file # Although they are a dependency of the library (so will be created from the message
# anyway), there is no guarantee as to exactly _when_ in the build they will be # file anyway), there is no guarantee as to exactly _when_ in the build they will be
# created. As the .h file is included in other sources file (so must be # created. As the .h file is included in other sources file (so must be
# present when they are compiled), the safest option is to create it first. # present when they are compiled), the safest option is to create it first.
BUILT_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc BUILT_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc
BUILT_SOURCES += hosts_messages.h hosts_messages.cc
# Some versions of GCC warn about some versions of Boost regarding # Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time. # missing initializer for members in its posix_time.
...@@ -56,7 +59,8 @@ BUILT_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc ...@@ -56,7 +59,8 @@ BUILT_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc
AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG) AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
# Make sure the generated files are deleted in a "clean" operation # Make sure the generated files are deleted in a "clean" operation
CLEANFILES = *.gcno *.gcda dhcpsrv_messages.h dhcpsrv_messages.cc s-messages CLEANFILES = *.gcno *.gcda dhcpsrv_messages.h dhcpsrv_messages.cc
CLEANFILES += hosts_messages.h hosts_messages.cc s-messages
# Remove CSV files created by the CSVLeaseFile6 and CSVLeaseFile4 unit tests. # Remove CSV files created by the CSVLeaseFile6 and CSVLeaseFile4 unit tests.
CLEANFILES += *.csv CLEANFILES += *.csv
...@@ -84,6 +88,7 @@ libkea_dhcpsrv_la_SOURCES += dhcpsrv_log.cc dhcpsrv_log.h ...@@ -84,6 +88,7 @@ libkea_dhcpsrv_la_SOURCES += dhcpsrv_log.cc dhcpsrv_log.h
libkea_dhcpsrv_la_SOURCES += host.cc host.h libkea_dhcpsrv_la_SOURCES += host.cc host.h
libkea_dhcpsrv_la_SOURCES += host_container.h libkea_dhcpsrv_la_SOURCES += host_container.h
libkea_dhcpsrv_la_SOURCES += host_mgr.cc host_mgr.h libkea_dhcpsrv_la_SOURCES += host_mgr.cc host_mgr.h
libkea_dhcpsrv_la_SOURCES += hosts_log.cc hosts_log.h
libkea_dhcpsrv_la_SOURCES += key_from_key.h libkea_dhcpsrv_la_SOURCES += key_from_key.h
libkea_dhcpsrv_la_SOURCES += lease.cc lease.h libkea_dhcpsrv_la_SOURCES += lease.cc lease.h
libkea_dhcpsrv_la_SOURCES += lease_file_loader.h libkea_dhcpsrv_la_SOURCES += lease_file_loader.h
...@@ -125,6 +130,7 @@ libkea_dhcpsrv_la_SOURCES += parsers/ifaces_config_parser.h ...@@ -125,6 +130,7 @@ libkea_dhcpsrv_la_SOURCES += parsers/ifaces_config_parser.h
nodist_libkea_dhcpsrv_la_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc nodist_libkea_dhcpsrv_la_SOURCES = dhcpsrv_messages.h dhcpsrv_messages.cc
nodist_libkea_dhcpsrv_la_SOURCES += hosts_messages.h hosts_messages.cc
libkea_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS) libkea_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
libkea_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES) libkea_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
...@@ -154,6 +160,7 @@ endif ...@@ -154,6 +160,7 @@ endif
# The message file should be in the distribution # The message file should be in the distribution
EXTRA_DIST += dhcpsrv_messages.mes EXTRA_DIST += dhcpsrv_messages.mes
EXTRA_DIST += hosts_messages.mes
# Distribute backend documentation # Distribute backend documentation
# Database schema creation script moved to src/bin/admin # Database schema creation script moved to src/bin/admin
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#include <dhcpsrv/cfg_hosts.h> #include <dhcpsrv/cfg_hosts.h>
#include <dhcpsrv/hosts_log.h>
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
#include <ostream> #include <ostream>
...@@ -23,6 +24,8 @@ namespace dhcp { ...@@ -23,6 +24,8 @@ namespace dhcp {
ConstHostCollection ConstHostCollection
CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) const { CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) const {
// Do not issue logging message here because it will be logged by
// the getAllInternal method.
ConstHostCollection collection; ConstHostCollection collection;
getAllInternal<ConstHostCollection>(hwaddr, duid, collection); getAllInternal<ConstHostCollection>(hwaddr, duid, collection);
return (collection); return (collection);
...@@ -30,6 +33,8 @@ CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) const { ...@@ -30,6 +33,8 @@ CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) const {
HostCollection HostCollection
CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) { CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) {
// Do not issue logging message here because it will be logged by
// the getAllInternal method.
HostCollection collection; HostCollection collection;
getAllInternal<HostCollection>(hwaddr, duid, collection); getAllInternal<HostCollection>(hwaddr, duid, collection);
return (collection); return (collection);
...@@ -37,6 +42,8 @@ CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) { ...@@ -37,6 +42,8 @@ CfgHosts::getAll(const HWAddrPtr& hwaddr, const DuidPtr& duid) {
ConstHostCollection ConstHostCollection
CfgHosts::getAll4(const IOAddress& address) const { CfgHosts::getAll4(const IOAddress& address) const {
// Do not issue logging message here because it will be logged by
// the getAllInternal4 method.
ConstHostCollection collection; ConstHostCollection collection;
getAllInternal4<ConstHostCollection>(address, collection); getAllInternal4<ConstHostCollection>(address, collection);
return (collection); return (collection);
...@@ -44,6 +51,8 @@ CfgHosts::getAll4(const IOAddress& address) const { ...@@ -44,6 +51,8 @@ CfgHosts::getAll4(const IOAddress& address) const {
HostCollection HostCollection
CfgHosts::getAll4(const IOAddress& address) { CfgHosts::getAll4(const IOAddress& address) {
// Do not issue logging message here because it will be logged by
// the getAllInternal4 method.
HostCollection collection; HostCollection collection;
getAllInternal4<HostCollection>(address, collection); getAllInternal4<HostCollection>(address, collection);
return (collection); return (collection);
...@@ -51,6 +60,8 @@ CfgHosts::getAll4(const IOAddress& address) { ...@@ -51,6 +60,8 @@ CfgHosts::getAll4(const IOAddress& address) {
ConstHostCollection ConstHostCollection
CfgHosts::getAll6(const IOAddress& address) const { CfgHosts::getAll6(const IOAddress& address) const {
// Do not issue logging message here because it will be logged by
// the getAllInternal6 method.
ConstHostCollection collection; ConstHostCollection collection;
getAllInternal6<ConstHostCollection>(address, collection); getAllInternal6<ConstHostCollection>(address, collection);
return (collection); return (collection);
...@@ -58,6 +69,8 @@ CfgHosts::getAll6(const IOAddress& address) const { ...@@ -58,6 +69,8 @@ CfgHosts::getAll6(const IOAddress& address) const {
HostCollection HostCollection
CfgHosts::getAll6(const IOAddress& address) { CfgHosts::getAll6(const IOAddress& address) {
// Do not issue logging message here because it will be logged by
// the getAllInternal6 method.
HostCollection collection; HostCollection collection;
getAllInternal6<HostCollection>(address, collection); getAllInternal6<HostCollection>(address, collection);
return (collection); return (collection);
...@@ -68,6 +81,35 @@ void ...@@ -68,6 +81,35 @@ void
CfgHosts::getAllInternal(const std::vector<uint8_t>& identifier, CfgHosts::getAllInternal(const std::vector<uint8_t>& identifier,
const Host::IdentifierType& identifier_type, const Host::IdentifierType& identifier_type,
Storage& storage) const { Storage& storage) const {
// We will need to transform the identifier into the textual format.
// Until we do it, we mark it as invalid.
std::string identifier_text = "(invalid)";
if (!identifier.empty()) {
try {
// Use Host object to find the textual form of the identifier.
// This may throw exception if the identifier is invalid.
Host host(&identifier[0], identifier.size(), identifier_type,
SubnetID(0), SubnetID(0), IOAddress::IPV4_ZERO_ADDRESS());
identifier_text = host.getIdentifierAsText();
} catch (...) {
// Suppress exception and keep using (invalid) as an
// identifier. We will log that the identifier is
// invalid and return.
}
}
// This will log that we're invoking this function with the specified
// identifier. The identifier may also be marked as (invalid) if it
// had 0 length or its type is unsupported.
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ALL_IDENTIFIER)
.arg(identifier_text);
// Do nothing if the identifier specified is invalid.
if (identifier_text == "(invalid)") {
return;
}
// Use the identifier and identifier type as a composite key. // Use the identifier and identifier type as a composite key.
const HostContainerIndex0& idx = hosts_.get<0>(); const HostContainerIndex0& idx = hosts_.get<0>();
boost::tuple<const std::vector<uint8_t>, const Host::IdentifierType> t = boost::tuple<const std::vector<uint8_t>, const Host::IdentifierType> t =
...@@ -76,14 +118,27 @@ CfgHosts::getAllInternal(const std::vector<uint8_t>& identifier, ...@@ -76,14 +118,27 @@ CfgHosts::getAllInternal(const std::vector<uint8_t>& identifier,
// Append each Host object to the storage. // Append each Host object to the storage.
for (HostContainerIndex0::iterator host = idx.lower_bound(t); host != idx.upper_bound(t); for (HostContainerIndex0::iterator host = idx.lower_bound(t); host != idx.upper_bound(t);
++host) { ++host) {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE_DETAIL_DATA,
HOSTS_CFG_GET_ALL_IDENTIFIER_HOST)
.arg(identifier_text)
.arg((*host)->toText());
storage.push_back(*host); storage.push_back(*host);
} }
// Log how many hosts have been found.
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS, HOSTS_CFG_GET_ALL_IDENTIFIER_COUNT)
.arg(identifier_text)
.arg(storage.size());
} }
template<typename Storage> template<typename Storage>
void void
CfgHosts::getAllInternal(const HWAddrPtr& hwaddr, const DuidPtr& duid, CfgHosts::getAllInternal(const HWAddrPtr& hwaddr, const DuidPtr& duid,
Storage& storage) const { Storage& storage) const {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ALL_HWADDR_DUID)
.arg(hwaddr ? hwaddr->toText() : "(no-hwaddr)")
.arg(duid ? duid->toText() : "(no-duid)");
// Get hosts using HW address. // Get hosts using HW address.
if (hwaddr) { if (hwaddr) {
getAllInternal<Storage>(hwaddr->hwaddr_, Host::IDENT_HWADDR, storage); getAllInternal<Storage>(hwaddr->hwaddr_, Host::IDENT_HWADDR, storage);
...@@ -97,6 +152,9 @@ CfgHosts::getAllInternal(const HWAddrPtr& hwaddr, const DuidPtr& duid, ...@@ -97,6 +152,9 @@ CfgHosts::getAllInternal(const HWAddrPtr& hwaddr, const DuidPtr& duid,
template<typename Storage> template<typename Storage>
void void
CfgHosts::getAllInternal4(const IOAddress& address, Storage& storage) const { CfgHosts::getAllInternal4(const IOAddress& address, Storage& storage) const {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ALL_ADDRESS4)
.arg(address.toText());
// Must not specify address other than IPv4. // Must not specify address other than IPv4.
if (!address.isV4()) { if (!address.isV4()) {
isc_throw(BadHostAddress, "must specify an IPv4 address when searching" isc_throw(BadHostAddress, "must specify an IPv4 address when searching"
...@@ -108,13 +166,24 @@ CfgHosts::getAllInternal4(const IOAddress& address, Storage& storage) const { ...@@ -108,13 +166,24 @@ CfgHosts::getAllInternal4(const IOAddress& address, Storage& storage) const {
// Append each Host object to the storage. // Append each Host object to the storage.
for (HostContainerIndex1::iterator host = r.first; host != r.second; for (HostContainerIndex1::iterator host = r.first; host != r.second;
++host) { ++host) {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE_DETAIL_DATA,
HOSTS_CFG_GET_ALL_ADDRESS4_HOST)
.arg(address.toText())
.arg((*host)->toText());
storage.push_back(*host); storage.push_back(*host);
} }
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS, HOSTS_CFG_GET_ALL_ADDRESS4_COUNT)
.arg(address.toText())
.arg(storage.size());
} }
template<typename Storage> template<typename Storage>
void void
CfgHosts::getAllInternal6(const IOAddress& address, Storage& storage) const { CfgHosts::getAllInternal6(const IOAddress& address, Storage& storage) const {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ALL_ADDRESS6)
.arg(address.toText());
// Must not specify address other than IPv6. // Must not specify address other than IPv6.
if (!address.isV6()) { if (!address.isV6()) {
isc_throw(BadHostAddress, "must specify an IPv6 address when searching" isc_throw(BadHostAddress, "must specify an IPv6 address when searching"
...@@ -126,14 +195,23 @@ CfgHosts::getAllInternal6(const IOAddress& address, Storage& storage) const { ...@@ -126,14 +195,23 @@ CfgHosts::getAllInternal6(const IOAddress& address, Storage& storage) const {
// Append each Host object to the storage. // Append each Host object to the storage.
for (HostContainerIndex1::iterator host = r.first; host != r.second; for (HostContainerIndex1::iterator host = r.first; host != r.second;
++host) { ++host) {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE_DETAIL_DATA,
HOSTS_CFG_GET_ALL_ADDRESS6_HOST)
.arg(address.toText())
.arg((*host)->toText());
storage.push_back(*host); storage.push_back(*host);
} }
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS, HOSTS_CFG_GET_ALL_ADDRESS6_COUNT)
.arg(address.toText())
.arg(storage.size());
} }
ConstHostPtr ConstHostPtr
CfgHosts::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr, CfgHosts::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr,
const DuidPtr& duid) const { const DuidPtr& duid) const {
// Do not log here because getHostInternal logs.
// The false value indicates that it is an IPv4 subnet. // The false value indicates that it is an IPv4 subnet.
return (getHostInternal(subnet_id, false, hwaddr, duid)); return (getHostInternal(subnet_id, false, hwaddr, duid));
} }
...@@ -141,19 +219,31 @@ CfgHosts::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr, ...@@ -141,19 +219,31 @@ CfgHosts::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr,
HostPtr HostPtr
CfgHosts::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr, CfgHosts::get4(const SubnetID& subnet_id, const HWAddrPtr& hwaddr,
const DuidPtr& duid) { const DuidPtr& duid) {
// Do not log here because getHostInternal logs.
// The false value indicates that it is an IPv4 subnet. // The false value indicates that it is an IPv4 subnet.
return (getHostInternal(subnet_id, false, hwaddr, duid)); return (getHostInternal(subnet_id, false, hwaddr, duid));
} }
ConstHostPtr ConstHostPtr
CfgHosts::get4(const SubnetID& subnet_id, const IOAddress& address) const { CfgHosts::get4(const SubnetID& subnet_id, const IOAddress& address) const {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4)
.arg(subnet_id).arg(address.toText());
ConstHostCollection hosts = getAll4(address); ConstHostCollection hosts = getAll4(address);
for (ConstHostCollection::const_iterator host = hosts.begin(); for (ConstHostCollection::const_iterator host = hosts.begin();
host != hosts.end(); ++host) { host != hosts.end(); ++host) {
if ((*host)->getIPv4SubnetID() == subnet_id) { if ((*host)->getIPv4SubnetID() == subnet_id) {
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS,
HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_HOST)
.arg(subnet_id)
.arg(address.toText())
.arg((*host)->toText());
return (*host); return (*host);
} }
} }
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS, HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS4_NULL)
.arg(subnet_id).arg(address.toText());
return (ConstHostPtr()); return (ConstHostPtr());
} }
...@@ -161,6 +251,7 @@ CfgHosts::get4(const SubnetID& subnet_id, const IOAddress& address) const { ...@@ -161,6 +251,7 @@ CfgHosts::get4(const SubnetID& subnet_id, const IOAddress& address) const {
ConstHostPtr ConstHostPtr
CfgHosts::get6(const SubnetID& subnet_id, const DuidPtr& duid, CfgHosts::get6(const SubnetID& subnet_id, const DuidPtr& duid,
const HWAddrPtr& hwaddr) const { const HWAddrPtr& hwaddr) const {
// Do not log here because getHostInternal logs.
// The true value indicates that it is an IPv6 subnet. // The true value indicates that it is an IPv6 subnet.
return (getHostInternal(subnet_id, true, hwaddr, duid)); return (getHostInternal(subnet_id, true, hwaddr, duid));
} }
...@@ -168,6 +259,7 @@ CfgHosts::get6(const SubnetID& subnet_id, const DuidPtr& duid, ...@@ -168,6 +259,7 @@ CfgHosts::get6(const SubnetID& subnet_id, const DuidPtr& duid,
HostPtr HostPtr
CfgHosts::get6(const SubnetID& subnet_id, const DuidPtr& duid, CfgHosts::get6(const SubnetID& subnet_id, const DuidPtr& duid,
const HWAddrPtr& hwaddr) { const HWAddrPtr& hwaddr) {
// Do not log here because getHostInternal logs.
// The true value indicates that it is an IPv6 subnet. // The true value indicates that it is an IPv6 subnet.
return (getHostInternal(subnet_id, true, hwaddr, duid)); return (getHostInternal(subnet_id, true, hwaddr, duid));
} }
...@@ -186,20 +278,49 @@ CfgHosts::get6(const IOAddress&, const uint8_t) { ...@@ -186,20 +278,49 @@ CfgHosts::get6(const IOAddress&, const uint8_t) {
ConstHostPtr ConstHostPtr
CfgHosts::get6(const SubnetID& subnet_id, CfgHosts::get6(const SubnetID& subnet_id,
const asiolink::IOAddress& address) const { const asiolink::IOAddress& address) const {
ConstHostCollection storage; // Do not log here because getHostInternal6 logs.
getAllInternal6(subnet_id, address, storage); return (getHostInternal6<ConstHostPtr, ConstHostCollection>(subnet_id, address));
}
HostPtr
CfgHosts::get6(const SubnetID& subnet_id,
const asiolink::IOAddress& address) {
// Do not log here because getHostInternal6 logs.
return (getHostInternal6<HostPtr, HostCollection>(subnet_id, address));
}
template<typename ReturnType, typename Storage>
ReturnType
CfgHosts::getHostInternal6(const SubnetID& subnet_id,
const asiolink::IOAddress& address) const {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6)
.arg(subnet_id).arg(address.toText());
Storage storage;
getAllInternal6<Storage>(subnet_id, address, storage);
switch (storage.size()) { switch (storage.size()) {
case 0: case 0:
return (ConstHostPtr()); LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS,
HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_NULL)
.arg(subnet_id)
.arg(address.toText());
return (HostPtr());
case 1: case 1:
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS,
HOSTS_CFG_GET_ONE_SUBNET_ID_ADDRESS6_HOST)
.arg(subnet_id)
.arg(address.toText())
.arg((*storage.begin())->toText());
return (*storage.begin()); return (*storage.begin());
default: default:
isc_throw(DuplicateHost, "more than one reservation found" isc_throw(DuplicateHost, "more than one reservation found"
" for the host belonging to the subnet with id '" " for the host belonging to the subnet with id '"
<< subnet_id << "' and using the address '" << subnet_id << "' and using the address '"
<< address.toText() << "'"); << address.toText() << "'");
} }
} }
template<typename Storage> template<typename Storage>
...@@ -207,6 +328,9 @@ void ...@@ -207,6 +328,9 @@ void
CfgHosts::getAllInternal6(const SubnetID& subnet_id, CfgHosts::getAllInternal6(const SubnetID& subnet_id,
const asiolink::IOAddress& address, const asiolink::IOAddress& address,
Storage& storage) const { Storage& storage) const {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6)
.arg(subnet_id).arg(address.toText());
// Must not specify address other than IPv6. // Must not specify address other than IPv6.
if (!address.isV6()) { if (!address.isV6()) {
isc_throw(BadHostAddress, "must specify an IPv6 address when searching" isc_throw(BadHostAddress, "must specify an IPv6 address when searching"
...@@ -223,30 +347,30 @@ CfgHosts::getAllInternal6(const SubnetID& subnet_id, ...@@ -223,30 +347,30 @@ CfgHosts::getAllInternal6(const SubnetID& subnet_id,
// multiple addresses reserved, but for each (address, subnet_id) there should // multiple addresses reserved, but for each (address, subnet_id) there should
// be at most one host reserving it). // be at most one host reserving it).
for(HostContainer6Index1::iterator resrv = r.first; resrv != r.second; ++resrv) { for(HostContainer6Index1::iterator resrv = r.first; resrv != r.second; ++resrv) {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE_DETAIL_DATA,
HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6_HOST)
.arg(subnet_id)
.arg(address.toText())
.arg(resrv->host_);
storage.push_back(resrv->host_); storage.push_back(resrv->host_);
} }
}
HostPtr LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS,
CfgHosts::get6(const SubnetID& subnet_id, const asiolink::IOAddress& address) { HOSTS_CFG_GET_ALL_SUBNET_ID_ADDRESS6_COUNT)
HostCollection storage; .arg(subnet_id)
getAllInternal6<HostCollection>(subnet_id, address, storage); .arg(address.toText())
switch (storage.size()) { .arg(storage.size());
case 0:
return (HostPtr());
case 1:
return (*storage.begin());
default:
isc_throw(DuplicateHost, "more than one reservation found"
" for the host belonging to the subnet with id '"
<< subnet_id << "' and using the address '"
<< address.toText() << "'");
}
} }
HostPtr HostPtr
CfgHosts::getHostInternal(const SubnetID& subnet_id, const bool subnet6, CfgHosts::getHostInternal(const SubnetID& subnet_id, const bool subnet6,
const HWAddrPtr& hwaddr, const DuidPtr& duid) const { const HWAddrPtr& hwaddr, const DuidPtr& duid) const {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_GET_ONE_SUBNET_ID_HWADDR_DUID)
.arg(subnet6 ? "IPv6" : "IPv4")
.arg(subnet_id)
.arg(hwaddr ? hwaddr->toText() : "(no-hwaddr)")
.arg(duid ? duid->toText() : "(no-duid)");
// Get all hosts for the HW address and DUID. This may return multiple hosts // Get all hosts for the HW address and DUID. This may return multiple hosts
// for different subnets, but the number of hosts returned should be low // for different subnets, but the number of hosts returned should be low
// because one host presumably doesn't show up in many subnets. // because one host presumably doesn't show up in many subnets.
...@@ -284,17 +408,38 @@ CfgHosts::getHostInternal(const SubnetID& subnet_id, const bool subnet6, ...@@ -284,17 +408,38 @@ CfgHosts::getHostInternal(const SubnetID& subnet_id, const bool subnet6,
} }
} }
} }
if (host) {
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS,
HOSTS_CFG_GET_ONE_SUBNET_ID_HWADDR_DUID)
.arg(subnet_id)
.arg(hwaddr ? hwaddr->toText() : "(no-hwaddr)")
.arg(duid ? duid->toText() : "(no-duid)")
.arg(host->toText());
} else {
LOG_DEBUG(hosts_logger, HOSTS_DBG_RESULTS,
HOSTS_CFG_GET_ONE_SUBNET_ID_HWADDR_DUID_NULL)
.arg(subnet_id)
.arg(hwaddr ? hwaddr->toText() : "(no-hwaddr)")
.arg(duid ? duid->toText() : "(no-duid)");
}
return (host); return (host);
} }
void void
CfgHosts::add(const HostPtr& host) { CfgHosts::add(const HostPtr& host) {
LOG_DEBUG(hosts_logger, HOSTS_DBG_TRACE, HOSTS_CFG_ADD_HOST)
.arg(host ? host->toText() : "(no-host)");
// Sanity check that the host is non-null. // Sanity check that the host is non-null.
if (!host) { if (!host) {
isc_throw(BadValue, "specified host object must not be NULL when it" isc_throw(BadValue, "specified host object must not be NULL when it"
" is added to the configuration"); " is added to the configuration");