BIND 10 trac751, updated. 95b1c90380f6b12bf29939b7164fce8d5516d443 [trac751] Move some dependency of libasiolink to libasiodns
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Apr 8 10:09:08 UTC 2011
The branch, trac751 has been updated
via 95b1c90380f6b12bf29939b7164fce8d5516d443 (commit)
from 8fc7cdd216bead2a98f1c98a6b6dc7a8a3bea4f4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 95b1c90380f6b12bf29939b7164fce8d5516d443
Author: Ocean Wang <wanghaidong at cnnic.cn>
Date: Fri Apr 8 18:06:35 2011 +0800
[trac751] Move some dependency of libasiolink to libasiodns
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/Makefile.am | 1 +
src/bin/auth/auth_srv.cc | 5 +-
src/bin/auth/auth_srv.h | 28 +++++++-------
src/bin/auth/benchmarks/Makefile.am | 1 +
src/bin/auth/benchmarks/query_bench.cc | 4 +-
src/bin/auth/main.cc | 4 +-
src/bin/auth/tests/Makefile.am | 1 +
src/bin/auth/tests/auth_srv_unittest.cc | 3 +-
src/bin/auth/tests/command_unittest.cc | 2 +-
src/bin/auth/tests/config_unittest.cc | 3 +-
src/bin/resolver/Makefile.am | 3 +
src/bin/resolver/main.cc | 4 +-
src/bin/resolver/resolver.cc | 8 ++-
src/bin/resolver/resolver.h | 40 ++++++++++----------
src/bin/resolver/response_scrubber.cc | 2 +-
src/bin/resolver/response_scrubber.h | 4 +-
src/bin/resolver/tests/Makefile.am | 1 +
src/bin/resolver/tests/resolver_config_unittest.cc | 4 +-
.../resolver/tests/response_scrubber_unittest.cc | 4 +-
src/lib/asiodns/Makefile.am | 3 -
src/lib/nsas/glue_hints.cc | 2 +-
src/lib/nsas/nameserver_entry.cc | 2 +-
src/lib/nsas/tests/address_entry_unittest.cc | 2 +-
src/lib/nsas/tests/nameserver_address_unittest.cc | 4 +-
src/lib/nsas/tests/nameserver_entry_unittest.cc | 2 +-
src/lib/nsas/tests/zone_entry_unittest.cc | 2 +-
src/lib/resolve/recursive_query.cc | 13 +++---
src/lib/resolve/recursive_query.h | 18 +++++----
src/lib/resolve/resolver_callback.h | 6 +-
src/lib/resolve/tests/Makefile.am | 1 +
src/lib/resolve/tests/recursive_query_unittest.cc | 7 ++-
.../resolve/tests/recursive_query_unittest_2.cc | 11 +++--
.../resolve/tests/resolver_callback_unittest.cc | 8 ++--
src/lib/server_common/portconfig.cc | 7 ++-
src/lib/server_common/portconfig.h | 6 ++-
src/lib/server_common/tests/Makefile.am | 3 +-
src/lib/server_common/tests/portconfig_unittest.cc | 4 +-
src/lib/testutils/mockups.h | 4 +-
src/lib/testutils/srv_test.cc | 2 +-
39 files changed, 131 insertions(+), 98 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 54dc03c..9275829 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -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/cc/libcc.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/nsas/libnsas.la
b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libxfr.la
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 9a49cc7..100e188 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -68,7 +68,8 @@ using namespace isc::dns::rdata;
using namespace isc::data;
using namespace isc::config;
using namespace isc::xfr;
-using namespace asiolink;
+using namespace isc::asiolink;
+using namespace isc::asiodns;
using namespace isc::server_common::portconfig;
class AuthSrvImpl {
@@ -766,6 +767,6 @@ AuthSrv::setListenAddresses(const AddressList& addresses) {
}
void
-AuthSrv::setDNSService(asiolink::DNSService& dnss) {
+AuthSrv::setDNSService(isc::asiodns::DNSService& dnss) {
dnss_ = &dnss;
}
diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h
index 8a6d522..24dca34 100644
--- a/src/bin/auth/auth_srv.h
+++ b/src/bin/auth/auth_srv.h
@@ -26,11 +26,11 @@
#include <dns/message.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_service.h>
-#include <asiolink/dns_server.h>
-#include <asiolink/dns_lookup.h>
-#include <asiolink/dns_answer.h>
#include <asiolink/simple_callback.h>
#include <asiolink/asiolink.h>
@@ -116,10 +116,10 @@ public:
/// \param server Pointer to the \c DNSServer
///
/// \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::OutputBufferPtr buffer,
- asiolink::DNSServer* server);
+ isc::asiodns::DNSServer* server);
/// \brief Set verbose flag
///
@@ -202,16 +202,16 @@ public:
void setConfigSession(isc::config::ModuleCCSession* config_session);
/// \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
- asiolink::DNSLookup* getDNSLookupProvider() const { return (dns_lookup_); }
+ isc::asiodns::DNSLookup* getDNSLookupProvider() const { return (dns_lookup_); }
/// \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
- 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.
///
@@ -372,15 +372,15 @@ public:
const;
/// \brief Assign an ASIO DNS Service queue to this Auth object
- void setDNSService(asiolink::DNSService& dnss);
+ void setDNSService(isc::asiodns::DNSService& dnss);
private:
AuthSrvImpl* impl_;
- asiolink::SimpleCallback* checkin_;
- asiolink::DNSLookup* dns_lookup_;
- asiolink::DNSAnswer* dns_answer_;
- asiolink::DNSService* dnss_;
+ isc::asiolink::SimpleCallback* checkin_;
+ isc::asiodns::DNSLookup* dns_lookup_;
+ isc::asiodns::DNSAnswer* dns_answer_;
+ isc::asiodns::DNSService* dnss_;
};
#endif // __AUTH_SRV_H
diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am
index c7de8d4..a569147 100644
--- a/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@ -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/log/liblog.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/server_common/libserver_common.la
query_bench_LDADD += $(SQLITE_LIBS)
diff --git a/src/bin/auth/benchmarks/query_bench.cc b/src/bin/auth/benchmarks/query_bench.cc
index 86d9813..62c9c5b 100644
--- a/src/bin/auth/benchmarks/query_bench.cc
+++ b/src/bin/auth/benchmarks/query_bench.cc
@@ -36,6 +36,7 @@
#include <auth/auth_config.h>
#include <auth/query.h>
+#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
using namespace std;
@@ -45,7 +46,8 @@ using namespace isc::auth;
using namespace isc::dns;
using namespace isc::xfr;
using namespace isc::bench;
-using namespace asiolink;
+using namespace isc::asiodns;
+using namespace isc::asiolink;
namespace {
// Commonly used constant:
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index 9743eef..b8edac8 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -43,6 +43,7 @@
#include <auth/command.h>
#include <auth/change_user.h>
#include <auth/auth_srv.h>
+#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <log/dummylog.h>
@@ -52,7 +53,8 @@ using namespace isc::cc;
using namespace isc::config;
using namespace isc::dns;
using namespace isc::xfr;
-using namespace asiolink;
+using namespace isc::asiolink;
+using namespace isc::asiodns;
namespace {
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index 8845755..3a5511b 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -39,6 +39,7 @@ run_unittests_LDADD += $(SQLITE_LIBS)
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/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/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 379342e..3f98412 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -44,7 +44,8 @@ using namespace isc::dns;
using namespace isc::dns::rdata;
using namespace isc::data;
using namespace isc::xfr;
-using namespace asiolink;
+using namespace isc::asiodns;
+using namespace isc::asiolink;
using namespace isc::testutils;
using namespace isc::server_common::portconfig;
using isc::UnitTestUtil;
diff --git a/src/bin/auth/tests/command_unittest.cc b/src/bin/auth/tests/command_unittest.cc
index dd1f6eb..3fdd086 100644
--- a/src/bin/auth/tests/command_unittest.cc
+++ b/src/bin/auth/tests/command_unittest.cc
@@ -99,7 +99,7 @@ AuthConmmandTest::stopServer() {
}
TEST_F(AuthConmmandTest, shutdown) {
- asiolink::IntervalTimer itimer(server.getIOService());
+ isc::asiolink::IntervalTimer itimer(server.getIOService());
itimer.setup(boost::bind(&AuthConmmandTest::stopServer, this), 1);
server.getIOService().run();
EXPECT_EQ(0, rcode);
diff --git a/src/bin/auth/tests/config_unittest.cc b/src/bin/auth/tests/config_unittest.cc
index 9c94e25..7658b84 100644
--- a/src/bin/auth/tests/config_unittest.cc
+++ b/src/bin/auth/tests/config_unittest.cc
@@ -35,7 +35,8 @@
using namespace isc::dns;
using namespace isc::data;
using namespace isc::datasrc;
-using namespace asiolink;
+using namespace isc::asiodns;
+using namespace isc::asiolink;
namespace {
class AuthConfigTest : public ::testing::Test {
diff --git a/src/bin/resolver/Makefile.am b/src/bin/resolver/Makefile.am
index 54e15bd..094e3ad 100644
--- a/src/bin/resolver/Makefile.am
+++ b/src/bin/resolver/Makefile.am
@@ -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/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/asiodns
+AM_CPPFLAGS += -I$(top_builddir)/src/lib/asiodns
AM_CPPFLAGS += -I$(top_srcdir)/src/lib/asiolink
AM_CPPFLAGS += -I$(top_builddir)/src/lib/asiolink
AM_CPPFLAGS += $(BOOST_INCLUDES)
@@ -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/cc/libcc.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/xfr/libxfr.la
b10_resolver_LDADD += $(top_builddir)/src/lib/log/liblog.la
diff --git a/src/bin/resolver/main.cc b/src/bin/resolver/main.cc
index 092ec54..33098a1 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -27,6 +27,7 @@
#include <boost/foreach.hpp>
+#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <exceptions/exceptions.h>
@@ -58,7 +59,8 @@ using namespace isc::cc;
using namespace isc::config;
using namespace isc::data;
using isc::log::dlog;
-using namespace asiolink;
+using namespace isc::asiodns;
+using namespace isc::asiolink;
namespace {
diff --git a/src/bin/resolver/resolver.cc b/src/bin/resolver/resolver.cc
index 2322076..4e0fe7b 100644
--- a/src/bin/resolver/resolver.cc
+++ b/src/bin/resolver/resolver.cc
@@ -20,6 +20,7 @@
#include <vector>
#include <cassert>
+#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <boost/foreach.hpp>
@@ -54,7 +55,8 @@ using namespace isc::dns;
using namespace isc::data;
using namespace isc::config;
using isc::log::dlog;
-using namespace asiolink;
+using namespace isc::asiodns;
+using namespace isc::asiolink;
using namespace isc::server_common::portconfig;
class ResolverImpl {
@@ -295,7 +297,7 @@ public:
edns_response->setUDPSize(Message::DEFAULT_MAX_EDNS0_UDPSIZE);
answer_message->setEDNS(edns_response);
}
-
+
if (io_message.getSocket().getProtocol() == IPPROTO_UDP) {
if (edns) {
renderer.setLengthLimit(edns->getUDPSize());
@@ -345,7 +347,7 @@ Resolver::~Resolver() {
}
void
-Resolver::setDNSService(asiolink::DNSService& dnss) {
+Resolver::setDNSService(isc::asiodns::DNSService& dnss) {
dnss_ = &dnss;
}
diff --git a/src/bin/resolver/resolver.h b/src/bin/resolver/resolver.h
index 8f07ff7..ca2ecd3 100644
--- a/src/bin/resolver/resolver.h
+++ b/src/bin/resolver/resolver.h
@@ -24,12 +24,12 @@
#include <dns/message.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_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 <nsas/nameserver_address_store.h>
@@ -82,11 +82,11 @@ public:
/// shall return to the client
/// \param buffer Pointer to an \c OutputBuffer for the resposne
/// \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 answer_message,
isc::dns::OutputBufferPtr buffer,
- asiolink::DNSServer* server);
+ isc::asiodns::DNSServer* server);
/// \brief Set and get the config session
isc::config::ModuleCCSession* getConfigSession() const;
@@ -96,16 +96,16 @@ public:
isc::data::ConstElementPtr updateConfig(isc::data::ConstElementPtr config);
/// \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
void setNameserverAddressStore(isc::nsas::NameserverAddressStore &nsas);
-
+
/// \brief Assign a cache to this Resolver object
void setCache(isc::cache::ResolverCache& cache);
/// \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
isc::nsas::NameserverAddressStore& getNameserverAddressStore() const {
@@ -116,15 +116,15 @@ public:
isc::cache::ResolverCache& getResolverCache() const {
return *cache_;
};
-
+
/// \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
- asiolink::DNSAnswer* getDNSAnswerProvider() { return (dns_answer_); }
+ isc::asiodns::DNSAnswer* getDNSAnswerProvider() { return (dns_answer_); }
/// \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
@@ -238,10 +238,10 @@ public:
private:
ResolverImpl* impl_;
- asiolink::DNSService* dnss_;
- asiolink::SimpleCallback* checkin_;
- asiolink::DNSLookup* dns_lookup_;
- asiolink::DNSAnswer* dns_answer_;
+ isc::asiodns::DNSService* dnss_;
+ isc::asiolink::SimpleCallback* checkin_;
+ isc::asiodns::DNSLookup* dns_lookup_;
+ isc::asiodns::DNSAnswer* dns_answer_;
isc::nsas::NameserverAddressStore* nsas_;
isc::cache::ResolverCache* cache_;
// This value is initally false, and will be set to true
@@ -252,6 +252,6 @@ private:
#endif // __RESOLVER_H
-// Local Variables:
+// Local Variables:
// mode: c++
-// End:
+// End:
diff --git a/src/bin/resolver/response_scrubber.cc b/src/bin/resolver/response_scrubber.cc
index 060a8b1..93bd808 100644
--- a/src/bin/resolver/response_scrubber.cc
+++ b/src/bin/resolver/response_scrubber.cc
@@ -26,7 +26,7 @@ using namespace std;
// Compare addresses etc.
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.getAddress() == to.getAddress()) {
diff --git a/src/bin/resolver/response_scrubber.h b/src/bin/resolver/response_scrubber.h
index 680aa5a..c59ac15 100644
--- a/src/bin/resolver/response_scrubber.h
+++ b/src/bin/resolver/response_scrubber.h
@@ -282,8 +282,8 @@ public:
///
/// \return SUCCESS if the two endpoints match, otherwise an error status
/// indicating what was incorrect.
- static Category addressCheck(const asiolink::IOEndpoint& to,
- const asiolink::IOEndpoint& from);
+ static Category addressCheck(const isc::asiolink::IOEndpoint& to,
+ const isc::asiolink::IOEndpoint& from);
/// \brief Check QID
///
diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index b85c223..444358b 100644
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -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/datasrc/libdatasrc.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/config/libcfgclient.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
diff --git a/src/bin/resolver/tests/resolver_config_unittest.cc b/src/bin/resolver/tests/resolver_config_unittest.cc
index c1ff853..70e856d 100644
--- a/src/bin/resolver/tests/resolver_config_unittest.cc
+++ b/src/bin/resolver/tests/resolver_config_unittest.cc
@@ -20,6 +20,7 @@
#include <cc/data.h>
+#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <resolver/resolver.h>
@@ -31,7 +32,8 @@
using namespace std;
using namespace isc::data;
using namespace isc::testutils;
-using namespace asiolink;
+using namespace isc::asiodns;
+using namespace isc::asiolink;
using isc::UnitTestUtil;
namespace {
diff --git a/src/bin/resolver/tests/response_scrubber_unittest.cc b/src/bin/resolver/tests/response_scrubber_unittest.cc
index 1dc6639..eff5598 100644
--- a/src/bin/resolver/tests/response_scrubber_unittest.cc
+++ b/src/bin/resolver/tests/response_scrubber_unittest.cc
@@ -41,6 +41,7 @@
// Class for endpoint checks. The family of the endpoint is set in the
// constructor; the address family by the string provided for the address.
+namespace isc {
namespace asiolink {
class GenericEndpoint : public IOEndpoint {
@@ -73,13 +74,14 @@ private:
short protocol_; // Protocol of the endpoint
};
}
+}
using namespace asio::ip;
using namespace isc::dns;
using namespace rdata;
using namespace isc::dns::rdata::generic;
using namespace isc::dns::rdata::in;
-using namespace asiolink;
+using namespace isc::asiolink;
// Test class
diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am
index ef0c32c..04f190e 100644
--- a/src/lib/asiodns/Makefile.am
+++ b/src/lib/asiodns/Makefile.am
@@ -9,9 +9,6 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
CLEANFILES = *.gcno *.gcda
-# This is a wrapper library solely used for b10-auth. The ASIO header files
-# have some code fragments that would hit gcc's unused-parameter warning,
-# which would make the build fail with -Werror (our default setting).
lib_LTLIBRARIES = libasiodns.la
libasiodns_la_SOURCES = dns_answer.h
libasiodns_la_SOURCES += dns_lookup.h
diff --git a/src/lib/nsas/glue_hints.cc b/src/lib/nsas/glue_hints.cc
index d4c653a..02c27ee 100644
--- a/src/lib/nsas/glue_hints.cc
+++ b/src/lib/nsas/glue_hints.cc
@@ -58,7 +58,7 @@ namespace {
const std::string ns_name = rrset->getName().toText();
RdataIteratorPtr rdi = rrset->getRdataIterator();
while (!rdi->isLast()) {
- AddressEntry entry(asiolink::IOAddress(rdi->getCurrent().toText()));
+ AddressEntry entry(isc::asiolink::IOAddress(rdi->getCurrent().toText()));
boost::shared_ptr<NameserverEntry> ns_entry(new NameserverEntry(ns_name, rrset->getClass()));
NameserverAddress ns_address(ns_entry, entry, V4_ONLY);
addresses.push_back(ns_address);
diff --git a/src/lib/nsas/nameserver_entry.cc b/src/lib/nsas/nameserver_entry.cc
index 40d5cd7..bdda4e2 100644
--- a/src/lib/nsas/nameserver_entry.cc
+++ b/src/lib/nsas/nameserver_entry.cc
@@ -41,7 +41,7 @@
#include "nameserver_address.h"
#include "nameserver_entry.h"
-using namespace asiolink;
+using namespace isc::asiolink;
using namespace isc::nsas;
using namespace isc::dns;
using namespace std;
diff --git a/src/lib/nsas/tests/address_entry_unittest.cc b/src/lib/nsas/tests/address_entry_unittest.cc
index 02fef51..60aa3cc 100644
--- a/src/lib/nsas/tests/address_entry_unittest.cc
+++ b/src/lib/nsas/tests/address_entry_unittest.cc
@@ -32,7 +32,7 @@ static std::string V4B_TEXT("5.6.7.8");
static std::string V6A_TEXT("2001:dead:beef::");
static std::string V6B_TEXT("1984:1985::1986:1987");
-using namespace asiolink;
+using namespace isc::asiolink;
using namespace std;
using namespace isc::nsas;
diff --git a/src/lib/nsas/tests/nameserver_address_unittest.cc b/src/lib/nsas/tests/nameserver_address_unittest.cc
index 457e61c..e3bc5de 100644
--- a/src/lib/nsas/tests/nameserver_address_unittest.cc
+++ b/src/lib/nsas/tests/nameserver_address_unittest.cc
@@ -58,7 +58,7 @@ public:
boost::shared_ptr<NameserverEntry>& getNameserverEntry() { return ns_; }
// Return the IOAddress corresponding to the index in rrv4_
- asiolink::IOAddress getAddressAtIndex(uint32_t index) {
+ isc::asiolink::IOAddress getAddressAtIndex(uint32_t index) {
return ns_.get()->getAddressAtIndex(index, V4_ONLY);
}
@@ -107,7 +107,7 @@ TEST_F(NameserverAddressTest, Address) {
boost::shared_ptr<NameserverEntry> empty_ne((NameserverEntry*)NULL);
// It will throw an NullNameserverEntryPointer exception with the empty NameserverEntry shared pointer
ASSERT_THROW({NameserverAddress empty_ns_address(empty_ne,
- asiolink::IOAddress("127.0.0.1"), V4_ONLY);},
+ isc::asiolink::IOAddress("127.0.0.1"), V4_ONLY);},
NullNameserverEntryPointer);
}
diff --git a/src/lib/nsas/tests/nameserver_entry_unittest.cc b/src/lib/nsas/tests/nameserver_entry_unittest.cc
index 4225e87..d489cbc 100644
--- a/src/lib/nsas/tests/nameserver_entry_unittest.cc
+++ b/src/lib/nsas/tests/nameserver_entry_unittest.cc
@@ -39,7 +39,7 @@
#include "nsas_test.h"
using namespace isc::nsas;
-using namespace asiolink;
+using namespace isc::asiolink;
using namespace std;
using namespace isc::dns;
using namespace rdata;
diff --git a/src/lib/nsas/tests/zone_entry_unittest.cc b/src/lib/nsas/tests/zone_entry_unittest.cc
index 34f995c..f131b71 100644
--- a/src/lib/nsas/tests/zone_entry_unittest.cc
+++ b/src/lib/nsas/tests/zone_entry_unittest.cc
@@ -33,7 +33,7 @@
#include "nsas_test.h"
using namespace isc::nsas;
-using namespace asiolink;
+using namespace isc::asiolink;
using namespace std;
using namespace isc::dns;
diff --git a/src/lib/resolve/recursive_query.cc b/src/lib/resolve/recursive_query.cc
index 0ee5813..fedfc71 100644
--- a/src/lib/resolve/recursive_query.cc
+++ b/src/lib/resolve/recursive_query.cc
@@ -35,15 +35,17 @@
#include <nsas/nameserver_address.h>
#include <asio.hpp>
-#include <asiolink/dns_service.h>
-#include <asiolink/io_fetch.h>
+#include <asiodns/dns_service.h>
+#include <asiodns/io_fetch.h>
#include <asiolink/io_service.h>
#include <resolve/recursive_query.h>
using isc::log::dlog;
using namespace isc::dns;
+using namespace isc::asiolink;
-namespace asiolink {
+namespace isc {
+namespace asiodns {
typedef std::vector<std::pair<std::string, uint16_t> > AddressVector;
@@ -797,6 +799,5 @@ RecursiveQuery::resolve(const Question& question,
}
}
-
-
-} // namespace asiolink
+} // namespace asiodns
+} // namespace isc
diff --git a/src/lib/resolve/recursive_query.h b/src/lib/resolve/recursive_query.h
index 1180d55..acbb081 100644
--- a/src/lib/resolve/recursive_query.h
+++ b/src/lib/resolve/recursive_query.h
@@ -15,13 +15,14 @@
#ifndef __RECURSIVE_QUERY_H
#define __RECURSIVE_QUERY_H 1
-#include <asiolink/dns_service.h>
-#include <asiolink/dns_server.h>
+#include <asiodns/dns_service.h>
+#include <asiodns/dns_server.h>
#include <dns/buffer.h>
#include <nsas/nameserver_address_store.h>
#include <cache/resolver_cache.h>
-namespace asiolink {
+namespace isc {
+namespace asiodns {
/// \brief The \c RecursiveQuery class provides a layer of abstraction around
/// the ASIO code that carries out an upstream query.
///
@@ -56,9 +57,9 @@ public:
isc::nsas::NameserverAddressStore& nsas,
isc::cache::ResolverCache& cache,
const std::vector<std::pair<std::string, uint16_t> >&
- upstream,
+ upstream,
const std::vector<std::pair<std::string, uint16_t> >&
- upstream_root,
+ upstream_root,
int query_timeout = 2000,
int client_timeout = 4000,
int lookup_timeout = 30000,
@@ -66,7 +67,7 @@ public:
//@}
/// \brief Initiate resolving
- ///
+ ///
/// When sendQuery() is called, a (set of) message(s) is sent
/// asynchronously. If upstream servers are set, one is chosen
/// and the response (if any) from that server will be returned.
@@ -113,7 +114,7 @@ public:
/// \param address IP address of the test server.
/// \param port Port number of the test server
void setTestServer(const std::string& address, uint16_t port);
-
+
private:
DNSService& dns_service_;
isc::nsas::NameserverAddressStore& nsas_;
@@ -129,5 +130,6 @@ private:
unsigned retries_;
};
-} // namespace asiolink
+} // namespace asiodns
+} // namespace isc
#endif // __RECURSIVE_QUERY_H
diff --git a/src/lib/resolve/resolver_callback.h b/src/lib/resolve/resolver_callback.h
index 4244f19..79138e8 100644
--- a/src/lib/resolve/resolver_callback.h
+++ b/src/lib/resolve/resolver_callback.h
@@ -15,7 +15,7 @@
#ifndef _ISC_RESOLVER_CALLBACK_H
#define _ISC_RESOLVER_CALLBACK_H 1
-#include <asiolink/dns_server.h>
+#include <asiodns/dns_server.h>
#include <dns/message.h>
#include <resolve/resolver_interface.h>
@@ -33,7 +33,7 @@ namespace resolve {
/// as the server itself should also have a reference.
class ResolverCallbackServer : public ResolverInterface::Callback {
public:
- ResolverCallbackServer(asiolink::DNSServer* server) :
+ ResolverCallbackServer(asiodns::DNSServer* server) :
server_(server->clone()) {}
~ResolverCallbackServer() { delete server_; };
@@ -41,7 +41,7 @@ public:
void failure();
private:
- asiolink::DNSServer* server_;
+ asiodns::DNSServer* server_;
};
} //namespace resolve
diff --git a/src/lib/resolve/tests/Makefile.am b/src/lib/resolve/tests/Makefile.am
index a403272..edea7cd 100644
--- a/src/lib/resolve/tests/Makefile.am
+++ b/src/lib/resolve/tests/Makefile.am
@@ -27,6 +27,7 @@ run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libnsas.la
run_unittests_LDADD += $(top_builddir)/src/lib/cache/libcache.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/resolve/libresolve.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
diff --git a/src/lib/resolve/tests/recursive_query_unittest.cc b/src/lib/resolve/tests/recursive_query_unittest.cc
index ab1ffa3..5a3536b 100644
--- a/src/lib/resolve/tests/recursive_query_unittest.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest.cc
@@ -45,16 +45,17 @@
// If we need to test something at the level of underlying ASIO and need
// their definition, that test should go to asiolink/internal/tests.
#include <resolve/recursive_query.h>
+#include <asiodns/dns_lookup.h>
#include <asiolink/io_socket.h>
#include <asiolink/io_service.h>
#include <asiolink/io_message.h>
#include <asiolink/io_error.h>
-#include <asiolink/dns_lookup.h>
#include <asiolink/simple_callback.h>
using isc::UnitTestUtil;
using namespace std;
-using namespace asiolink;
+using namespace isc::asiodns;
+using namespace isc::asiolink;
using namespace isc::dns;
namespace {
@@ -316,7 +317,7 @@ protected:
private:
// Currently unused; these will be used for testing
// asynchronous lookup calls via the asyncLookup() method
- boost::shared_ptr<asiolink::IOMessage> io_message_;
+ boost::shared_ptr<isc::asiolink::IOMessage> io_message_;
isc::dns::MessagePtr message_;
isc::dns::MessagePtr answer_message_;
isc::dns::OutputBufferPtr respbuf_;
diff --git a/src/lib/resolve/tests/recursive_query_unittest_2.cc b/src/lib/resolve/tests/recursive_query_unittest_2.cc
index 643c5a3..76e3704 100644
--- a/src/lib/resolve/tests/recursive_query_unittest_2.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest_2.cc
@@ -36,16 +36,17 @@
#include <dns/rdata.h>
#include <asiolink/asiolink_utilities.h>
-#include <asiolink/dns_service.h>
+#include <asiodns/dns_service.h>
+#include <asiodns/io_fetch.h>
#include <asiolink/io_address.h>
#include <asiolink/io_endpoint.h>
-#include <asiolink/io_fetch.h>
#include <asiolink/io_service.h>
#include <resolve/recursive_query.h>
#include <resolve/resolver_interface.h>
using namespace asio;
using namespace asio::ip;
+using namespace isc::asiolink;
using namespace isc::dns;
using namespace isc::dns::rdata;
using namespace isc::resolve;
@@ -71,7 +72,8 @@ using namespace std;
/// directed to one or other of the "servers" in the RecursiveQueryTest2 class,
/// regardless of the glue returned in referrals.
-namespace asiolink {
+namespace isc {
+namespace asiodns {
const std::string TEST_ADDRESS = "127.0.0.1"; ///< Servers are on this address
const uint16_t TEST_PORT = 5301; ///< ... and this port
@@ -674,4 +676,5 @@ TEST_F(RecursiveQueryTest2, Resolve) {
EXPECT_TRUE(rc->getStatus());
}
-} // namespace asiolink
+} // namespace asiodns
+} // namespace isc
diff --git a/src/lib/resolve/tests/resolver_callback_unittest.cc b/src/lib/resolve/tests/resolver_callback_unittest.cc
index 666b853..e94f13d 100644
--- a/src/lib/resolve/tests/resolver_callback_unittest.cc
+++ b/src/lib/resolve/tests/resolver_callback_unittest.cc
@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <gtest/gtest.h>
-#include <asiolink/dns_server.h>
+#include <asiodns/dns_server.h>
#include <resolve/resolver_callback.h>
using namespace isc::resolve;
@@ -22,7 +22,7 @@ using namespace isc::resolve;
// We want to check if resume is called
// Since the server will get cloned(), we want the clones to share
// our bools for whether resume got called and with what value
-class DummyServer : public asiolink::DNSServer {
+class DummyServer : public isc::asiodns::DNSServer {
public:
DummyServer(DummyServer* orig) {
resume_called_ = orig->getResumeCalled();
@@ -31,10 +31,10 @@ public:
DummyServer(bool* resume_called, bool* resume_value) :
resume_called_(resume_called), resume_value_(resume_value)
{}
-
+
bool* getResumeCalled() { return resume_called_; }
bool* getResumeValue() { return resume_value_; }
-
+
DNSServer* clone() {
DummyServer* n = new DummyServer(this);
return n;
diff --git a/src/lib/server_common/portconfig.cc b/src/lib/server_common/portconfig.cc
index 3765f52..941644e 100644
--- a/src/lib/server_common/portconfig.cc
+++ b/src/lib/server_common/portconfig.cc
@@ -15,7 +15,7 @@
#include <server_common/portconfig.h>
#include <asiolink/io_address.h>
-#include <asiolink/dns_service.h>
+#include <asiodns/dns_service.h>
#include <log/dummylog.h>
#include <boost/foreach.hpp>
@@ -23,7 +23,8 @@
using namespace std;
using namespace isc::data;
-using namespace asiolink;
+using namespace isc::asiolink;
+using namespace isc::asiodns;
using isc::log::dlog;
namespace isc {
@@ -82,7 +83,7 @@ setAddresses(DNSService& service, const AddressList& addresses) {
void
installListenAddresses(const AddressList& newAddresses,
AddressList& addressStore,
- asiolink::DNSService& service)
+ isc::asiodns::DNSService& service)
{
try {
dlog("Setting listen addresses:");
diff --git a/src/lib/server_common/portconfig.h b/src/lib/server_common/portconfig.h
index bcb8528..e4e7bf6 100644
--- a/src/lib/server_common/portconfig.h
+++ b/src/lib/server_common/portconfig.h
@@ -25,9 +25,11 @@
/*
* Some forward declarations.
*/
-namespace asiolink {
+namespace isc {
+namespace asiodns {
class DNSService;
}
+}
namespace isc {
namespace server_common {
@@ -112,7 +114,7 @@ parseAddresses(isc::data::ConstElementPtr addresses,
void
installListenAddresses(const AddressList& newAddresses,
AddressList& addressStore,
- asiolink::DNSService& dnsService);
+ asiodns::DNSService& dnsService);
}
}
diff --git a/src/lib/server_common/tests/Makefile.am b/src/lib/server_common/tests/Makefile.am
index 55ccc85..a04a884 100644
--- a/src/lib/server_common/tests/Makefile.am
+++ b/src/lib/server_common/tests/Makefile.am
@@ -12,7 +12,7 @@ endif
# Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time.
# https://svn.boost.org/trac/boost/ticket/3477
-# But older GCC compilers don't have the flag.
+# But older GCC compilers don't have the flag.
AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
if USE_CLANGPP
@@ -35,6 +35,7 @@ run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libserver_common.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
+run_unittests_LDADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.la
run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
endif
diff --git a/src/lib/server_common/tests/portconfig_unittest.cc b/src/lib/server_common/tests/portconfig_unittest.cc
index fabdfa2..5262565 100644
--- a/src/lib/server_common/tests/portconfig_unittest.cc
+++ b/src/lib/server_common/tests/portconfig_unittest.cc
@@ -17,6 +17,7 @@
#include <cc/data.h>
#include <exceptions/exceptions.h>
#include <asiolink/asiolink.h>
+#include <asiodns/asiodns.h>
#include <gtest/gtest.h>
#include <string>
@@ -25,7 +26,8 @@ using namespace isc::server_common::portconfig;
using namespace isc::data;
using namespace isc;
using namespace std;
-using namespace asiolink;
+using namespace isc::asiolink;
+using namespace isc::asiodns;
namespace {
diff --git a/src/lib/testutils/mockups.h b/src/lib/testutils/mockups.h
index 4bec83d..2441ad7 100644
--- a/src/lib/testutils/mockups.h
+++ b/src/lib/testutils/mockups.h
@@ -19,7 +19,7 @@
#include <xfr/xfrout_client.h>
-#include <asiolink/asiolink.h>
+#include <asiodns/asiodns.h>
// A minimal mock configuration session. Most the methods are
// stubbed out, except for a very basic group_sendmsg() and
@@ -94,7 +94,7 @@ private:
};
// A nonoperative DNSServer object to be used in calls to processMessage().
-class MockServer : public asiolink::DNSServer {
+class MockServer : public isc::asiodns::DNSServer {
public:
MockServer() : done_(false) {}
void operator()(asio::error_code, size_t) {}
diff --git a/src/lib/testutils/srv_test.cc b/src/lib/testutils/srv_test.cc
index d5da8a0..f851a2e 100644
--- a/src/lib/testutils/srv_test.cc
+++ b/src/lib/testutils/srv_test.cc
@@ -27,7 +27,7 @@
#include <testutils/srv_test.h>
using namespace isc::dns;
-using namespace asiolink;
+using namespace isc::asiolink;
namespace isc {
namespace testutils {
More information about the bind10-changes
mailing list