BIND 10 trac2935, updated. 434edbb7276472a4ac31ccb63257fda00698baab [2935] Cleanup checkin callback from b10-resolver
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Jul 30 03:23:53 UTC 2013
The branch, trac2935 has been updated
via 434edbb7276472a4ac31ccb63257fda00698baab (commit)
via 9b71351b47386012f178803b56b71f90a972e9b2 (commit)
via c46e16711aa802046edb5557dfe89afb04be229e (commit)
from 2d47b144b1a760c4338f534848b9b801fd709964 (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 434edbb7276472a4ac31ccb63257fda00698baab
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jul 30 08:53:33 2013 +0530
[2935] Cleanup checkin callback from b10-resolver
commit 9b71351b47386012f178803b56b71f90a972e9b2
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jul 30 08:53:22 2013 +0530
[2935] Cleanup checkin callback from b10-auth
commit c46e16711aa802046edb5557dfe89afb04be229e
Author: Mukund Sivaraman <muks at isc.org>
Date: Tue Jul 30 08:53:01 2013 +0530
[2935] Remove use of checkin callback in libb10-resolve
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/auth_srv.cc | 2 --
src/bin/auth/auth_srv.h | 4 ----
src/bin/auth/main.cc | 3 +--
src/bin/resolver/main.cc | 3 +--
src/bin/resolver/resolver.cc | 3 ---
src/bin/resolver/resolver.h | 4 ----
src/lib/resolve/tests/recursive_query_unittest.cc | 10 +++++-----
.../resolve/tests/recursive_query_unittest_2.cc | 2 +-
.../resolve/tests/recursive_query_unittest_3.cc | 2 +-
9 files changed, 9 insertions(+), 24 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 27779a9..682886e 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -393,7 +393,6 @@ AuthSrv::AuthSrv(isc::xfr::AbstractXfroutClient& xfrout_client,
dnss_(NULL)
{
impl_ = new AuthSrvImpl(xfrout_client, ddns_forwarder);
- checkin_ = new ConfigChecker(this);
dns_lookup_ = new MessageLookup(this);
dns_answer_ = new MessageAnswer(this);
}
@@ -405,7 +404,6 @@ AuthSrv::stop() {
AuthSrv::~AuthSrv() {
delete impl_;
- delete checkin_;
delete dns_lookup_;
delete dns_answer_;
}
diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h
index 8ad72be..3759f43 100644
--- a/src/bin/auth/auth_srv.h
+++ b/src/bin/auth/auth_srv.h
@@ -190,9 +190,6 @@ public:
/// \brief Return pointer to the DNS Answer callback function
isc::asiodns::DNSAnswer* getDNSAnswerProvider() const { return (dns_answer_); }
- /// \brief Return pointer to the Checkin callback function
- isc::asiolink::SimpleCallback* getCheckinProvider() const { return (checkin_); }
-
/// \brief Return data source clients manager.
///
/// \throw None
@@ -275,7 +272,6 @@ public:
private:
AuthSrvImpl* impl_;
- isc::asiolink::SimpleCallback* checkin_;
isc::asiodns::DNSLookup* dns_lookup_;
isc::asiodns::DNSAnswer* dns_answer_;
isc::asiodns::DNSServiceBase* dnss_;
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index dc03be2..b095608 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -173,12 +173,11 @@ main(int argc, char* argv[]) {
auth_server = auth_server_.get();
LOG_INFO(auth_logger, AUTH_SERVER_CREATED);
- SimpleCallback* checkin = auth_server->getCheckinProvider();
IOService& io_service = auth_server->getIOService();
DNSLookup* lookup = auth_server->getDNSLookupProvider();
DNSAnswer* answer = auth_server->getDNSAnswerProvider();
- DNSService dns_service(io_service, checkin, lookup, answer);
+ DNSService dns_service(io_service, lookup, answer);
auth_server->setDNSService(dns_service);
LOG_DEBUG(auth_logger, DBG_AUTH_START, AUTH_DNS_SERVICES_CREATED);
diff --git a/src/bin/resolver/main.cc b/src/bin/resolver/main.cc
index 457f285..9149ebb 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -168,7 +168,6 @@ main(int argc, char* argv[]) {
resolver = boost::shared_ptr<Resolver>(new Resolver());
LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_CREATED);
- SimpleCallback* checkin = resolver->getCheckinProvider();
DNSLookup* lookup = resolver->getDNSLookupProvider();
DNSAnswer* answer = resolver->getDNSAnswerProvider();
@@ -217,7 +216,7 @@ main(int argc, char* argv[]) {
cache.update(root_a_rrset);
cache.update(root_aaaa_rrset);
- DNSService dns_service(io_service, checkin, lookup, answer);
+ DNSService dns_service(io_service, lookup, answer);
resolver->setDNSService(dns_service);
LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_SERVICE_CREATED);
diff --git a/src/bin/resolver/resolver.cc b/src/bin/resolver/resolver.cc
index 41ed7af..46f9e61 100644
--- a/src/bin/resolver/resolver.cc
+++ b/src/bin/resolver/resolver.cc
@@ -356,7 +356,6 @@ private:
Resolver::Resolver() :
impl_(new ResolverImpl()),
dnss_(NULL),
- checkin_(NULL),
dns_lookup_(NULL),
dns_answer_(new MessageAnswer),
nsas_(NULL),
@@ -365,13 +364,11 @@ Resolver::Resolver() :
// Operations referring to "this" must be done in the constructor body
// (some compilers will issue warnings if "this" is referred to in the
// initialization list).
- checkin_ = new ConfigCheck(this);
dns_lookup_ = new MessageLookup(this);
}
Resolver::~Resolver() {
delete impl_;
- delete checkin_;
delete dns_lookup_;
delete dns_answer_;
}
diff --git a/src/bin/resolver/resolver.h b/src/bin/resolver/resolver.h
index 725aa85..b1608c1 100644
--- a/src/bin/resolver/resolver.h
+++ b/src/bin/resolver/resolver.h
@@ -131,9 +131,6 @@ public:
/// \brief Return pointer to the DNS Answer callback function
isc::asiodns::DNSAnswer* getDNSAnswerProvider() { return (dns_answer_); }
- /// \brief Return pointer to the Checkin callback function
- isc::asiolink::SimpleCallback* getCheckinProvider() { return (checkin_); }
-
/**
* \brief Specify the list of upstream servers.
*
@@ -259,7 +256,6 @@ public:
private:
ResolverImpl* impl_;
isc::asiodns::DNSServiceBase* dnss_;
- isc::asiolink::SimpleCallback* checkin_;
isc::asiodns::DNSLookup* dns_lookup_;
isc::asiodns::DNSAnswer* dns_answer_;
isc::nsas::NameserverAddressStore* nsas_;
diff --git a/src/lib/resolve/tests/recursive_query_unittest.cc b/src/lib/resolve/tests/recursive_query_unittest.cc
index acbbb03..48e5a31 100644
--- a/src/lib/resolve/tests/recursive_query_unittest.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest.cc
@@ -56,7 +56,6 @@
#include <asiolink/io_service.h>
#include <asiolink/io_message.h>
#include <asiolink/io_error.h>
-#include <asiolink/simple_callback.h>
using isc::UnitTestUtil;
using namespace std;
@@ -333,8 +332,7 @@ protected:
// Set up empty DNS Service
// Set up an IO Service queue without any addresses
void setDNSService() {
- dns_service_.reset(new DNSService(io_service_, callback_.get(), NULL,
- NULL));
+ dns_service_.reset(new DNSService(io_service_, callback_.get(), NULL));
}
// Run a simple server test, on either IPv4 or IPv6, and over either
@@ -478,10 +476,12 @@ protected:
};
private:
- class ASIOCallBack : public SimpleCallback {
+ class ASIOCallBack : public DNSLookup {
public:
ASIOCallBack(RecursiveQueryTest* test_obj) : test_obj_(test_obj) {}
- void operator()(const IOMessage& io_message) const {
+ void operator()(const IOMessage& io_message,
+ isc::dns::MessagePtr, isc::dns::MessagePtr,
+ isc::util::OutputBufferPtr, DNSServer*) const {
test_obj_->callBack(io_message);
}
private:
diff --git a/src/lib/resolve/tests/recursive_query_unittest_2.cc b/src/lib/resolve/tests/recursive_query_unittest_2.cc
index 0b38c59..d6019d0 100644
--- a/src/lib/resolve/tests/recursive_query_unittest_2.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest_2.cc
@@ -159,7 +159,7 @@ public:
RecursiveQueryTest2() :
debug_(DEBUG_PRINT),
service_(),
- dns_service_(service_, NULL, NULL, NULL),
+ dns_service_(service_, NULL, NULL),
question_(new Question(Name("www.example.org"), RRClass::IN(), RRType::A())),
last_(NONE),
expected_(NONE),
diff --git a/src/lib/resolve/tests/recursive_query_unittest_3.cc b/src/lib/resolve/tests/recursive_query_unittest_3.cc
index 92ec589..df48740 100644
--- a/src/lib/resolve/tests/recursive_query_unittest_3.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest_3.cc
@@ -141,7 +141,7 @@ public:
/// \brief Constructor
RecursiveQueryTest3() :
service_(),
- dns_service_(service_, NULL, NULL, NULL),
+ dns_service_(service_, NULL, NULL),
question_(new Question(Name("ednsfallback"),
RRClass::IN(), RRType::A())),
last_(NONE),
More information about the bind10-changes
mailing list