BIND 10 trac1613, updated. 5b6f56a3edae024549cf37438ef2000347befdd6 [1613] fix indent

[BIND 10 source code commits]

The branch, trac1613 has been updated
       via  5b6f56a3edae024549cf37438ef2000347befdd6 (commit)
       via  7713d4f0d29ad4b19bcb67e2702a6c153cc115b5 (commit)
      from  fcc5fed77df391264c67db28bba28dc48aa5021b (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 5b6f56a3edae024549cf37438ef2000347befdd6
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Feb 17 16:02:52 2012 +0100

    [1613] fix indent

commit 7713d4f0d29ad4b19bcb67e2702a6c153cc115b5
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Feb 17 15:26:29 2012 +0100

    [1613] move resumeServer wrapper into Impl class

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

Summary of changes:
 src/bin/auth/auth_srv.cc      |   44 +++++++++++++++++++++++++++-------------
 src/bin/auth/auth_srv.h       |   16 --------------
 src/lib/testutils/srv_test.cc |    2 +-
 3 files changed, 31 insertions(+), 31 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index d948c67..8b62f66 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -128,6 +128,22 @@ public:
     /// Bind the ModuleSpec object in config_session_ with
     /// isc:config::ModuleSpec::validateStatistics.
     void registerStatisticsValidator();
+
+    /// \brief Resume the server
+    ///
+    /// This is a wrapper call for DNSServer::resume(done), if 'done' is true,
+    /// the Rcode set in the given Message is counted in the statistics
+    /// counter.
+    ///
+    /// This method is expected to be called by processMessage()
+    ///
+    /// \param server The DNSServer as passed to processMessage()
+    /// \param message The response as constructed by processMessage()
+    /// \param done If true, the Rcode from the given message is counted,
+    ///             this value is then passed to server->resume(bool)
+    void resumeServer(isc::asiodns::DNSServer* server,
+                      isc::dns::MessagePtr message,
+                      bool done);
 private:
     std::string db_file_;
 
@@ -409,13 +425,13 @@ AuthSrv::processMessage(const IOMessage& io_message, MessagePtr message,
         // Ignore all responses.
         if (message->getHeaderFlag(Message::HEADERFLAG_QR)) {
             LOG_DEBUG(auth_logger, DBG_AUTH_DETAIL, AUTH_RESPONSE_RECEIVED);
-            resumeServer(server, message, false);
+            impl_->resumeServer(server, message, false);
             return;
         }
     } catch (const Exception& ex) {
         LOG_DEBUG(auth_logger, DBG_AUTH_DETAIL, AUTH_HEADER_PARSE_FAIL)
                   .arg(ex.what());
-        resumeServer(server, message, false);
+        impl_->resumeServer(server, message, false);
         return;
     }
 
@@ -426,13 +442,13 @@ AuthSrv::processMessage(const IOMessage& io_message, MessagePtr message,
         LOG_DEBUG(auth_logger, DBG_AUTH_DETAIL, AUTH_PACKET_PROTOCOL_ERROR)
                   .arg(error.getRcode().toText()).arg(error.what());
         makeErrorMessage(message, buffer, error.getRcode());
-        resumeServer(server, message, true);
+        impl_->resumeServer(server, message, true);
         return;
     } catch (const Exception& ex) {
         LOG_DEBUG(auth_logger, DBG_AUTH_DETAIL, AUTH_PACKET_PARSE_ERROR)
                   .arg(ex.what());
         makeErrorMessage(message, buffer, Rcode::SERVFAIL());
-        resumeServer(server, message, true);
+        impl_->resumeServer(server, message, true);
         return;
     } // other exceptions will be handled at a higher layer.
 
@@ -459,7 +475,7 @@ AuthSrv::processMessage(const IOMessage& io_message, MessagePtr message,
 
     if (tsig_error != TSIGError::NOERROR()) {
         makeErrorMessage(message, buffer, tsig_error.toRcode(), tsig_context);
-        resumeServer(server, message, true);
+        impl_->resumeServer(server, message, true);
         return;
     }
 
@@ -492,7 +508,7 @@ AuthSrv::processMessage(const IOMessage& io_message, MessagePtr message,
         }
     }
 
-    resumeServer(server, message, send_answer);
+    impl_->resumeServer(server, message, send_answer);
 }
 
 bool
@@ -754,6 +770,14 @@ AuthSrvImpl::setDbFile(ConstElementPtr config) {
     return (answer);
 }
 
+void
+AuthSrvImpl::resumeServer(DNSServer* server, MessagePtr message, bool done) {
+    if (done) {
+        counters_.inc(message->getRcode());
+    }
+    server->resume(done);
+}
+
 ConstElementPtr
 AuthSrv::updateConfig(ConstElementPtr new_config) {
     try {
@@ -807,11 +831,3 @@ void
 AuthSrv::setTSIGKeyRing(const boost::shared_ptr<TSIGKeyRing>* keyring) {
     impl_->keyring_ = keyring;
 }
-
-void
-AuthSrv::resumeServer(DNSServer* server, MessagePtr message, bool done) {
-    if (done) {
-        impl_->counters_.inc(message->getRcode());
-    }
-    server->resume(done);
-}
diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h
index 676582a..c1a69f1 100644
--- a/src/bin/auth/auth_srv.h
+++ b/src/bin/auth/auth_srv.h
@@ -396,22 +396,6 @@ public:
                         keyring);
 
 private:
-    /// \brief Resume the server
-    ///
-    /// This is a wrapper call for DNSServer::resume(done), if 'done' is true,
-    /// the Rcode set in the given Message is counted in the statistics
-    /// counter.
-    ///
-    /// This method is expected to be called by processMessage()
-    ///
-    /// \param server The DNSServer as passed to processMessage()
-    /// \param message The response as constructed by processMessage()
-    /// \param done If true, the Rcode from the given message is counted,
-    ///             this value is then passed to server->resume(bool)
-    void resumeServer(isc::asiodns::DNSServer* server,
-                      isc::dns::MessagePtr message,
-                      bool done);
-
     AuthSrvImpl* impl_;
     isc::asiolink::SimpleCallback* checkin_;
     isc::asiodns::DNSLookup* dns_lookup_;
diff --git a/src/lib/testutils/srv_test.cc b/src/lib/testutils/srv_test.cc
index 9d38eb7..8b0053c 100644
--- a/src/lib/testutils/srv_test.cc
+++ b/src/lib/testutils/srv_test.cc
@@ -72,7 +72,7 @@ SrvTestBase::createDataFromFile(const char* const datafile,
 
 void
 SrvTestBase::createRequestPacket(Message& message,
-                                    const int protocol, TSIGContext* context)
+                                 const int protocol, TSIGContext* context)
 {
     if (context == NULL) {
         message.toWire(request_renderer);