Commit 17106327 authored by Stephen Morris's avatar Stephen Morris

[trac703] Merge branch 'master' into trac703

... master being updated shortly after the last merge.
Conflicts:
	src/lib/asiodns/io_fetch.cc
	src/lib/asiodns/io_fetch.h
parents 06c4fa64 262ac6c6
...@@ -644,6 +644,8 @@ AC_CONFIG_FILES([Makefile ...@@ -644,6 +644,8 @@ AC_CONFIG_FILES([Makefile
src/lib/Makefile src/lib/Makefile
src/lib/asiolink/Makefile src/lib/asiolink/Makefile
src/lib/asiolink/tests/Makefile src/lib/asiolink/tests/Makefile
src/lib/asiodns/Makefile
src/lib/asiodns/tests/Makefile
src/lib/bench/Makefile src/lib/bench/Makefile
src/lib/bench/example/Makefile src/lib/bench/example/Makefile
src/lib/bench/tests/Makefile src/lib/bench/tests/Makefile
......
...@@ -49,6 +49,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la ...@@ -49,6 +49,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_auth_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_auth_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la b10_auth_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
......
...@@ -68,7 +68,8 @@ using namespace isc::dns::rdata; ...@@ -68,7 +68,8 @@ using namespace isc::dns::rdata;
using namespace isc::data; using namespace isc::data;
using namespace isc::config; using namespace isc::config;
using namespace isc::xfr; using namespace isc::xfr;
using namespace asiolink; using namespace isc::asiolink;
using namespace isc::asiodns;
using namespace isc::server_common::portconfig; using namespace isc::server_common::portconfig;
class AuthSrvImpl { class AuthSrvImpl {
...@@ -766,6 +767,6 @@ AuthSrv::setListenAddresses(const AddressList& addresses) { ...@@ -766,6 +767,6 @@ AuthSrv::setListenAddresses(const AddressList& addresses) {
} }
void void
AuthSrv::setDNSService(asiolink::DNSService& dnss) { AuthSrv::setDNSService(isc::asiodns::DNSService& dnss) {
dnss_ = &dnss; dnss_ = &dnss;
} }
...@@ -26,11 +26,11 @@ ...@@ -26,11 +26,11 @@
#include <dns/message.h> #include <dns/message.h>
#include <dns/buffer.h> #include <dns/buffer.h>
#include <asiodns/dns_server.h>
#include <asiodns/dns_lookup.h>
#include <asiodns/dns_answer.h>
#include <asiolink/io_message.h> #include <asiolink/io_message.h>
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <asiolink/dns_server.h>
#include <asiolink/dns_lookup.h>
#include <asiolink/dns_answer.h>
#include <asiolink/simple_callback.h> #include <asiolink/simple_callback.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
...@@ -116,10 +116,10 @@ public: ...@@ -116,10 +116,10 @@ public:
/// \param server Pointer to the \c DNSServer /// \param server Pointer to the \c DNSServer
/// ///
/// \throw isc::Unexpected Protocol type of \a message is unexpected /// \throw isc::Unexpected Protocol type of \a message is unexpected
void processMessage(const asiolink::IOMessage& io_message, void processMessage(const isc::asiolink::IOMessage& io_message,
isc::dns::MessagePtr message, isc::dns::MessagePtr message,
isc::dns::OutputBufferPtr buffer, isc::dns::OutputBufferPtr buffer,
asiolink::DNSServer* server); isc::asiodns::DNSServer* server);
/// \brief Set verbose flag /// \brief Set verbose flag
/// ///
...@@ -202,16 +202,16 @@ public: ...@@ -202,16 +202,16 @@ public:
void setConfigSession(isc::config::ModuleCCSession* config_session); void setConfigSession(isc::config::ModuleCCSession* config_session);
/// \brief Return this object's ASIO IO Service queue /// \brief Return this object's ASIO IO Service queue
asiolink::IOService& getIOService(); isc::asiolink::IOService& getIOService();
/// \brief Return pointer to the DNS Lookup callback function /// \brief Return pointer to the DNS Lookup callback function
asiolink::DNSLookup* getDNSLookupProvider() const { return (dns_lookup_); } isc::asiodns::DNSLookup* getDNSLookupProvider() const { return (dns_lookup_); }
/// \brief Return pointer to the DNS Answer callback function /// \brief Return pointer to the DNS Answer callback function
asiolink::DNSAnswer* getDNSAnswerProvider() const { return (dns_answer_); } isc::asiodns::DNSAnswer* getDNSAnswerProvider() const { return (dns_answer_); }
/// \brief Return pointer to the Checkin callback function /// \brief Return pointer to the Checkin callback function
asiolink::SimpleCallback* getCheckinProvider() const { return (checkin_); } isc::asiolink::SimpleCallback* getCheckinProvider() const { return (checkin_); }
/// \brief Set or update the size (number of slots) of hot spot cache. /// \brief Set or update the size (number of slots) of hot spot cache.
/// ///
...@@ -372,15 +372,15 @@ public: ...@@ -372,15 +372,15 @@ public:
const; const;
/// \brief Assign an ASIO DNS Service queue to this Auth object /// \brief Assign an ASIO DNS Service queue to this Auth object
void setDNSService(asiolink::DNSService& dnss); void setDNSService(isc::asiodns::DNSService& dnss);
private: private:
AuthSrvImpl* impl_; AuthSrvImpl* impl_;
asiolink::SimpleCallback* checkin_; isc::asiolink::SimpleCallback* checkin_;
asiolink::DNSLookup* dns_lookup_; isc::asiodns::DNSLookup* dns_lookup_;
asiolink::DNSAnswer* dns_answer_; isc::asiodns::DNSAnswer* dns_answer_;
asiolink::DNSService* dnss_; isc::asiodns::DNSService* dnss_;
}; };
#endif // __AUTH_SRV_H #endif // __AUTH_SRV_H
......
...@@ -22,6 +22,7 @@ query_bench_LDADD += $(top_builddir)/src/lib/cc/libcc.la ...@@ -22,6 +22,7 @@ query_bench_LDADD += $(top_builddir)/src/lib/cc/libcc.la
query_bench_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la query_bench_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
query_bench_LDADD += $(top_builddir)/src/lib/log/liblog.la query_bench_LDADD += $(top_builddir)/src/lib/log/liblog.la
query_bench_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la query_bench_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
query_bench_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la query_bench_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
query_bench_LDADD += $(SQLITE_LIBS) query_bench_LDADD += $(SQLITE_LIBS)
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <auth/auth_config.h> #include <auth/auth_config.h>
#include <auth/query.h> #include <auth/query.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
using namespace std; using namespace std;
...@@ -45,7 +46,8 @@ using namespace isc::auth; ...@@ -45,7 +46,8 @@ using namespace isc::auth;
using namespace isc::dns; using namespace isc::dns;
using namespace isc::xfr; using namespace isc::xfr;
using namespace isc::bench; using namespace isc::bench;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
namespace { namespace {
// Commonly used constant: // Commonly used constant:
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <auth/command.h> #include <auth/command.h>
#include <auth/change_user.h> #include <auth/change_user.h>
#include <auth/auth_srv.h> #include <auth/auth_srv.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <log/dummylog.h> #include <log/dummylog.h>
...@@ -52,7 +53,8 @@ using namespace isc::cc; ...@@ -52,7 +53,8 @@ using namespace isc::cc;
using namespace isc::config; using namespace isc::config;
using namespace isc::dns; using namespace isc::dns;
using namespace isc::xfr; using namespace isc::xfr;
using namespace asiolink; using namespace isc::asiolink;
using namespace isc::asiodns;
namespace { namespace {
......
...@@ -45,6 +45,7 @@ run_unittests_LDADD += $(SQLITE_LIBS) ...@@ -45,6 +45,7 @@ run_unittests_LDADD += $(SQLITE_LIBS)
run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la
run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
......
...@@ -44,7 +44,8 @@ using namespace isc::dns; ...@@ -44,7 +44,8 @@ using namespace isc::dns;
using namespace isc::dns::rdata; using namespace isc::dns::rdata;
using namespace isc::data; using namespace isc::data;
using namespace isc::xfr; using namespace isc::xfr;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
using namespace isc::testutils; using namespace isc::testutils;
using namespace isc::server_common::portconfig; using namespace isc::server_common::portconfig;
using isc::UnitTestUtil; using isc::UnitTestUtil;
......
...@@ -99,7 +99,7 @@ AuthConmmandTest::stopServer() { ...@@ -99,7 +99,7 @@ AuthConmmandTest::stopServer() {
} }
TEST_F(AuthConmmandTest, shutdown) { TEST_F(AuthConmmandTest, shutdown) {
asiolink::IntervalTimer itimer(server.getIOService()); isc::asiolink::IntervalTimer itimer(server.getIOService());
itimer.setup(boost::bind(&AuthConmmandTest::stopServer, this), 1); itimer.setup(boost::bind(&AuthConmmandTest::stopServer, this), 1);
server.getIOService().run(); server.getIOService().run();
EXPECT_EQ(0, rcode); EXPECT_EQ(0, rcode);
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
using namespace isc::dns; using namespace isc::dns;
using namespace isc::data; using namespace isc::data;
using namespace isc::datasrc; using namespace isc::datasrc;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
namespace { namespace {
class AuthConfigTest : public ::testing::Test { class AuthConfigTest : public ::testing::Test {
......
...@@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib ...@@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/cc -I$(top_builddir)/src/lib/cc AM_CPPFLAGS += -I$(top_srcdir)/src/lib/cc -I$(top_builddir)/src/lib/cc
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiodns
AM_CPPFLAGS += -I$(top_builddir)/src/lib/asiodns
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink
AM_CPPFLAGS += -I$(top_builddir)/src/lib/asiolink AM_CPPFLAGS += -I$(top_builddir)/src/lib/asiolink
AM_CPPFLAGS += $(BOOST_INCLUDES) AM_CPPFLAGS += $(BOOST_INCLUDES)
...@@ -45,6 +47,7 @@ b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libdns++.la ...@@ -45,6 +47,7 @@ b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
b10_resolver_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la b10_resolver_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libcc.la b10_resolver_LDADD += $(top_builddir)/src/lib/cc/libcc.la
b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la b10_resolver_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la b10_resolver_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la b10_resolver_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
b10_resolver_LDADD += $(top_builddir)/src/lib/log/liblog.la b10_resolver_LDADD += $(top_builddir)/src/lib/log/liblog.la
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <exceptions/exceptions.h> #include <exceptions/exceptions.h>
...@@ -58,7 +59,8 @@ using namespace isc::cc; ...@@ -58,7 +59,8 @@ using namespace isc::cc;
using namespace isc::config; using namespace isc::config;
using namespace isc::data; using namespace isc::data;
using isc::log::dlog; using isc::log::dlog;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
namespace { namespace {
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <vector> #include <vector>
#include <cassert> #include <cassert>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
...@@ -54,7 +55,8 @@ using namespace isc::dns; ...@@ -54,7 +55,8 @@ using namespace isc::dns;
using namespace isc::data; using namespace isc::data;
using namespace isc::config; using namespace isc::config;
using isc::log::dlog; using isc::log::dlog;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
using namespace isc::server_common::portconfig; using namespace isc::server_common::portconfig;
class ResolverImpl { class ResolverImpl {
...@@ -295,7 +297,7 @@ public: ...@@ -295,7 +297,7 @@ public:
edns_response->setUDPSize(Message::DEFAULT_MAX_EDNS0_UDPSIZE); edns_response->setUDPSize(Message::DEFAULT_MAX_EDNS0_UDPSIZE);
answer_message->setEDNS(edns_response); answer_message->setEDNS(edns_response);
} }
if (io_message.getSocket().getProtocol() == IPPROTO_UDP) { if (io_message.getSocket().getProtocol() == IPPROTO_UDP) {
if (edns) { if (edns) {
renderer.setLengthLimit(edns->getUDPSize()); renderer.setLengthLimit(edns->getUDPSize());
...@@ -345,7 +347,7 @@ Resolver::~Resolver() { ...@@ -345,7 +347,7 @@ Resolver::~Resolver() {
} }
void void
Resolver::setDNSService(asiolink::DNSService& dnss) { Resolver::setDNSService(isc::asiodns::DNSService& dnss) {
dnss_ = &dnss; dnss_ = &dnss;
} }
......
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
#include <dns/message.h> #include <dns/message.h>
#include <dns/buffer.h> #include <dns/buffer.h>
#include <asiodns/dns_server.h>
#include <asiodns/dns_service.h>
#include <asiodns/dns_lookup.h>
#include <asiodns/dns_answer.h>
#include <asiolink/io_message.h> #include <asiolink/io_message.h>
#include <asiolink/io_service.h> #include <asiolink/io_service.h>
#include <asiolink/dns_server.h>
#include <asiolink/dns_service.h>
#include <asiolink/dns_lookup.h>
#include <asiolink/dns_answer.h>
#include <asiolink/simple_callback.h> #include <asiolink/simple_callback.h>
#include <nsas/nameserver_address_store.h> #include <nsas/nameserver_address_store.h>
...@@ -82,11 +82,11 @@ public: ...@@ -82,11 +82,11 @@ public:
/// shall return to the client /// shall return to the client
/// \param buffer Pointer to an \c OutputBuffer for the resposne /// \param buffer Pointer to an \c OutputBuffer for the resposne
/// \param server Pointer to the \c DNSServer /// \param server Pointer to the \c DNSServer
void processMessage(const asiolink::IOMessage& io_message, void processMessage(const isc::asiolink::IOMessage& io_message,
isc::dns::MessagePtr query_message, isc::dns::MessagePtr query_message,
isc::dns::MessagePtr answer_message, isc::dns::MessagePtr answer_message,
isc::dns::OutputBufferPtr buffer, isc::dns::OutputBufferPtr buffer,
asiolink::DNSServer* server); isc::asiodns::DNSServer* server);
/// \brief Set and get the config session /// \brief Set and get the config session
isc::config::ModuleCCSession* getConfigSession() const; isc::config::ModuleCCSession* getConfigSession() const;
...@@ -96,16 +96,16 @@ public: ...@@ -96,16 +96,16 @@ public:
isc::data::ConstElementPtr updateConfig(isc::data::ConstElementPtr config); isc::data::ConstElementPtr updateConfig(isc::data::ConstElementPtr config);
/// \brief Assign an ASIO IO Service queue to this Resolver object /// \brief Assign an ASIO IO Service queue to this Resolver object
void setDNSService(asiolink::DNSService& dnss); void setDNSService(isc::asiodns::DNSService& dnss);
/// \brief Assign a NameserverAddressStore to this Resolver object /// \brief Assign a NameserverAddressStore to this Resolver object
void setNameserverAddressStore(isc::nsas::NameserverAddressStore &nsas); void setNameserverAddressStore(isc::nsas::NameserverAddressStore &nsas);
/// \brief Assign a cache to this Resolver object /// \brief Assign a cache to this Resolver object
void setCache(isc::cache::ResolverCache& cache); void setCache(isc::cache::ResolverCache& cache);
/// \brief Return this object's ASIO IO Service queue /// \brief Return this object's ASIO IO Service queue
asiolink::DNSService& getDNSService() const { return (*dnss_); } isc::asiodns::DNSService& getDNSService() const { return (*dnss_); }
/// \brief Returns this object's NSAS /// \brief Returns this object's NSAS
isc::nsas::NameserverAddressStore& getNameserverAddressStore() const { isc::nsas::NameserverAddressStore& getNameserverAddressStore() const {
...@@ -116,15 +116,15 @@ public: ...@@ -116,15 +116,15 @@ public:
isc::cache::ResolverCache& getResolverCache() const { isc::cache::ResolverCache& getResolverCache() const {
return *cache_; return *cache_;
}; };
/// \brief Return pointer to the DNS Lookup callback function /// \brief Return pointer to the DNS Lookup callback function
asiolink::DNSLookup* getDNSLookupProvider() { return (dns_lookup_); } isc::asiodns::DNSLookup* getDNSLookupProvider() { return (dns_lookup_); }
/// \brief Return pointer to the DNS Answer callback function /// \brief Return pointer to the DNS Answer callback function
asiolink::DNSAnswer* getDNSAnswerProvider() { return (dns_answer_); } isc::asiodns::DNSAnswer* getDNSAnswerProvider() { return (dns_answer_); }
/// \brief Return pointer to the Checkin callback function /// \brief Return pointer to the Checkin callback function
asiolink::SimpleCallback* getCheckinProvider() { return (checkin_); } isc::asiolink::SimpleCallback* getCheckinProvider() { return (checkin_); }
/** /**
* \brief Tell the Resolver that is has already been configured * \brief Tell the Resolver that is has already been configured
...@@ -238,10 +238,10 @@ public: ...@@ -238,10 +238,10 @@ public:
private: private:
ResolverImpl* impl_; ResolverImpl* impl_;
asiolink::DNSService* dnss_; isc::asiodns::DNSService* dnss_;
asiolink::SimpleCallback* checkin_; isc::asiolink::SimpleCallback* checkin_;
asiolink::DNSLookup* dns_lookup_; isc::asiodns::DNSLookup* dns_lookup_;
asiolink::DNSAnswer* dns_answer_; isc::asiodns::DNSAnswer* dns_answer_;
isc::nsas::NameserverAddressStore* nsas_; isc::nsas::NameserverAddressStore* nsas_;
isc::cache::ResolverCache* cache_; isc::cache::ResolverCache* cache_;
// This value is initally false, and will be set to true // This value is initally false, and will be set to true
...@@ -252,6 +252,6 @@ private: ...@@ -252,6 +252,6 @@ private:
#endif // __RESOLVER_H #endif // __RESOLVER_H
// Local Variables: // Local Variables:
// mode: c++ // mode: c++
// End: // End:
...@@ -26,7 +26,7 @@ using namespace std; ...@@ -26,7 +26,7 @@ using namespace std;
// Compare addresses etc. // Compare addresses etc.
ResponseScrubber::Category ResponseScrubber::addressCheck( ResponseScrubber::Category ResponseScrubber::addressCheck(
const asiolink::IOEndpoint& to, const asiolink::IOEndpoint& from) const isc::asiolink::IOEndpoint& to, const isc::asiolink::IOEndpoint& from)
{ {
if (from.getProtocol() == to.getProtocol()) { if (from.getProtocol() == to.getProtocol()) {
if (from.getAddress() == to.getAddress()) { if (from.getAddress() == to.getAddress()) {
......
...@@ -282,8 +282,8 @@ public: ...@@ -282,8 +282,8 @@ public:
/// ///
/// \return SUCCESS if the two endpoints match, otherwise an error status /// \return SUCCESS if the two endpoints match, otherwise an error status
/// indicating what was incorrect. /// indicating what was incorrect.
static Category addressCheck(const asiolink::IOEndpoint& to, static Category addressCheck(const isc::asiolink::IOEndpoint& to,
const asiolink::IOEndpoint& from); const isc::asiolink::IOEndpoint& from);
/// \brief Check QID /// \brief Check QID
/// ///
......
...@@ -31,6 +31,7 @@ run_unittests_LDADD += $(SQLITE_LIBS) ...@@ -31,6 +31,7 @@ run_unittests_LDADD += $(SQLITE_LIBS)
run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libtestutils.la
run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libdatasrc.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la run_unittests_LDADD += $(top_builddir)/src/lib/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <cc/data.h> #include <cc/data.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h> #include <asiolink/asiolink.h>
#include <resolver/resolver.h> #include <resolver/resolver.h>
...@@ -31,7 +32,8 @@ ...@@ -31,7 +32,8 @@
using namespace std; using namespace std;
using namespace isc::data; using namespace isc::data;
using namespace isc::testutils; using namespace isc::testutils;
using namespace asiolink; using namespace isc::asiodns;
using namespace isc::asiolink;
using isc::UnitTestUtil; using isc::UnitTestUtil;
namespace { namespace {
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
// Class for endpoint checks. The family of the endpoint is set in the // Class for endpoint checks. The family of the endpoint is set in the
// constructor; the address family by the string provided for the address. // constructor; the address family by the string provided for the address.
namespace isc {
namespace asiolink { namespace asiolink {
class GenericEndpoint : public IOEndpoint { class GenericEndpoint : public IOEndpoint {
...@@ -73,13 +74,14 @@ private: ...@@ -73,13 +74,14 @@ private:
short protocol_; // Protocol of the endpoint