BIND 10 trac2862, updated. f1c0d7070d9a3968ff900663bffcba20e53851b0 [2862] Unify command names with other modules

[BIND 10 source code commits]

The branch, trac2862 has been updated
       via  f1c0d7070d9a3968ff900663bffcba20e53851b0 (commit)
       via  feebb25811b38ebfee97c2a11a1470f7aaaf6696 (commit)
       via  b05bfd741c5b4ec90ada47017af8a299f8a8b4d6 (commit)
      from  0d8bee5c0cc3cf65a0a14890d7ff76de328e4316 (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 f1c0d7070d9a3968ff900663bffcba20e53851b0
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jul 23 09:12:27 2013 +0200

    [2862] Unify command names with other modules
    
    Use segment_info_update(|_ack) instead of sgmtinfo-update(|-ack). It
    seems the design documents were not consistent about that, so,
    obviously, different parts of code used different things.

commit feebb25811b38ebfee97c2a11a1470f7aaaf6696
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jul 23 09:10:17 2013 +0200

    [2862] Handle only mapped segments
    
    Instead of generically any segment that is not local.

commit b05bfd741c5b4ec90ada47017af8a299f8a8b4d6
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Jul 23 09:08:29 2013 +0200

    [2862] Minor: rename variable
    
    Rename readers_subscribed_ to readers_group_subscribed_.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/auth_srv.cc |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 9f14ac1..bc160fd 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -307,7 +307,7 @@ public:
                       const bool done);
 
     /// Are we currently subscribed to the SegmentReader group?
-    bool readers_subscribed_;
+    bool readers_group_subscribed_;
 private:
     bool xfrout_connected_;
     AbstractXfroutClient& xfrout_client_;
@@ -324,7 +324,7 @@ AuthSrvImpl::AuthSrvImpl(AbstractXfroutClient& xfrout_client,
     datasrc_clients_mgr_(io_service_),
     ddns_base_forwarder_(ddns_forwarder),
     ddns_forwarder_(NULL),
-    readers_subscribed_(false),
+    readers_group_subscribed_(false),
     xfrout_connected_(false),
     xfrout_client_(xfrout_client)
 {}
@@ -946,7 +946,7 @@ AuthSrv::setTCPRecvTimeout(size_t timeout) {
 namespace {
 
 bool
-hasRemoteSegment(auth::DataSrcClientsMgr& mgr) {
+hasMappedSegment(auth::DataSrcClientsMgr& mgr) {
     auth::DataSrcClientsMgr::Holder holder(mgr);
     const std::vector<dns::RRClass>& classes(holder.getClasses());
     BOOST_FOREACH(const dns::RRClass& rrclass, classes) {
@@ -955,7 +955,7 @@ hasRemoteSegment(auth::DataSrcClientsMgr& mgr) {
         const std::vector<DataSourceStatus>& states(list->getStatus());
         BOOST_FOREACH(const datasrc::DataSourceStatus& status, states) {
             if (status.getSegmentState() != datasrc::SEGMENT_UNUSED &&
-                status.getSegmentType() != "local")
+                status.getSegmentType() == "mapped")
                 // We use some segment and it's not a local one, so it
                 // must be remote.
                 return true;
@@ -969,19 +969,19 @@ hasRemoteSegment(auth::DataSrcClientsMgr& mgr) {
 
 void
 AuthSrv::listsReconfigured() {
-    const bool has_remote = hasRemoteSegment(impl_->datasrc_clients_mgr_);
-    if (has_remote && !impl_->readers_subscribed_) {
+    const bool has_remote = hasMappedSegment(impl_->datasrc_clients_mgr_);
+    if (has_remote && !impl_->readers_group_subscribed_) {
         impl_->config_session_->subscribe("SegmentReader");
         impl_->config_session_->
             setUnhandledCallback(boost::bind(&AuthSrv::foreignCommand, this,
                                              _1, _2, _3));
-        impl_->readers_subscribed_ = true;
-    } else if (!has_remote && impl_->readers_subscribed_) {
+        impl_->readers_group_subscribed_ = true;
+    } else if (!has_remote && impl_->readers_group_subscribed_) {
         impl_->config_session_->unsubscribe("SegmentReader");
         impl_->config_session_->
             setUnhandledCallback(isc::config::ModuleCCSession::
                                  UnhandledCallback());
-        impl_->readers_subscribed_ = false;
+        impl_->readers_group_subscribed_ = false;
     }
 }
 
@@ -989,7 +989,7 @@ void
 AuthSrv::reconfigureDone(ConstElementPtr params) {
     // ACK the segment
     impl_->config_session_->
-        groupSendMsg(isc::config::createCommand("sgmtinfo-update-ack",
+        groupSendMsg(isc::config::createCommand("segment_info_update_ack",
                                                 params), "MemMgr");
 }
 
@@ -997,7 +997,7 @@ void
 AuthSrv::foreignCommand(const std::string& command, const std::string&,
                         const ConstElementPtr& params)
 {
-    if (command == "sgmtinfo-update") {
+    if (command == "segment_info_update") {
         impl_->datasrc_clients_mgr_.
             segmentInfoUpdate(params, boost::bind(&AuthSrv::reconfigureDone,
                                                   this, params));