From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 19 Oct 2012 22:17:52 +0000 (-0700)
Subject: [2211] added trivial getter for data source clients manager.
X-Git-Tag: trac2402_base~3^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a4c6f4bbfd10a372fa4c4d40a6cb5ec64047cb6;p=thirdparty%2Fkea.git

[2211] added trivial getter for data source clients manager.
---

diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 10861c13a0..f90b116028 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -272,6 +272,8 @@ public:
     /// The data source client list
     DataSrcClientListsPtr datasrc_client_lists_;
 
+    auth::DataSrcClientsMgr datasrc_clients_mgr_;
+
     shared_ptr<ConfigurableClientList> getDataSrcClientList(
         const RRClass& rrclass)
     {
@@ -329,8 +331,6 @@ private:
     bool validateStatistics(isc::data::ConstElementPtr data) const;
 
     auth::Query query_;
-
-    auth::DataSrcClientsMgr datasrc_clients_mgr_;
 };
 
 AuthSrvImpl::AuthSrvImpl(AbstractXfroutClient& xfrout_client,
@@ -491,6 +491,11 @@ AuthSrv::getIOService() {
     return (impl_->io_service_);
 }
 
+isc::auth::DataSrcClientsMgr&
+AuthSrv::getDataSrcClientsMgr() {
+    return (impl_->datasrc_clients_mgr_);
+}
+
 void
 AuthSrv::setXfrinSession(AbstractSession* xfrin_session) {
     impl_->xfrin_session_ = xfrin_session;
diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h
index a70d51c105..763a822378 100644
--- a/src/bin/auth/auth_srv.h
+++ b/src/bin/auth/auth_srv.h
@@ -35,7 +35,9 @@
 
 #include <asiolink/asiolink.h>
 #include <server_common/portconfig.h>
+
 #include <auth/statistics.h>
+#include <auth/datasrc_clients_mgr.h>
 
 #include <boost/shared_ptr.hpp>
 
@@ -194,6 +196,11 @@ public:
     /// \brief Return pointer to the Checkin callback function
     isc::asiolink::SimpleCallback* getCheckinProvider() const { return (checkin_); }
 
+    /// \brief Return data source clients manager.
+    ///
+    /// \throw None
+    isc::auth::DataSrcClientsMgr& getDataSrcClientsMgr();
+
     /// \brief Set the communication session with a separate process for
     /// outgoing zone transfers.
     ///
diff --git a/src/bin/auth/datasrc_clients_mgr.h b/src/bin/auth/datasrc_clients_mgr.h
index c81b50e09a..84749527b4 100644
--- a/src/bin/auth/datasrc_clients_mgr.h
+++ b/src/bin/auth/datasrc_clients_mgr.h
@@ -27,6 +27,7 @@
 #include <dns/rrclass.h>
 
 #include <auth/auth_log.h>
+#include <auth/datasrc_config.h>
 
 #include <boost/array.hpp>
 #include <boost/bind.hpp>
diff --git a/src/bin/auth/datasrc_config.h b/src/bin/auth/datasrc_config.h
index 68c7358e71..694a0395a0 100644
--- a/src/bin/auth/datasrc_config.h
+++ b/src/bin/auth/datasrc_config.h
@@ -15,8 +15,6 @@
 #ifndef DATASRC_CONFIG_H
 #define DATASRC_CONFIG_H
 
-#include "auth_srv.h"
-
 #include <cc/data.h>
 #include <datasrc/client_list.h>
 
diff --git a/src/bin/auth/tests/command_unittest.cc b/src/bin/auth/tests/command_unittest.cc
index 764ab116bf..92b5211ef0 100644
--- a/src/bin/auth/tests/command_unittest.cc
+++ b/src/bin/auth/tests/command_unittest.cc
@@ -18,6 +18,7 @@
 
 #include <util/threads/sync.h>
 
+#include <auth/auth_srv.h>
 #include <auth/command.h>
 #include <auth/datasrc_config.h>