BIND 10 master, updated. 5589ea8da0a906e66eed1d85b26da4e75e3902a2 [master] Merge branch 'trac1546'

[BIND 10 source code commits]

The branch, master has been updated
       via  5589ea8da0a906e66eed1d85b26da4e75e3902a2 (commit)
       via  354bb735d31ec83aba2eb0afe3a0e05aa8f254d5 (commit)
       via  109c7a70bc0fb293e717e1bbe653ce9d01d1a737 (commit)
       via  98ec643b85ed681f32dfbcb29cc8e6bd51b290c4 (commit)
       via  5279c2e13084fd954021cd667caa99dc982594c2 (commit)
       via  be7b75528c3bd4ae882136cdac6ecf925ac9f621 (commit)
      from  73d2c507ffae1519e72f6b2e372f75aa5ad536c1 (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 5589ea8da0a906e66eed1d85b26da4e75e3902a2
Merge: 73d2c50 354bb73
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Jan 17 09:50:48 2012 -0800

    [master] Merge branch 'trac1546'

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

Summary of changes:
 src/bin/auth/main.cc                               |    8 +++++---
 src/bin/resolver/main.cc                           |   10 ++++++++--
 src/lib/server_common/socket_request.cc            |    2 +-
 src/lib/server_common/socket_request.h             |    2 +-
 .../server_common/tests/socket_requestor_test.cc   |    2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index ee3a95d..4a425e5 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -154,13 +154,15 @@ main(int argc, char* argv[]) {
         cc_session = new Session(io_service.get_io_service());
         LOG_DEBUG(auth_logger, DBG_AUTH_START, AUTH_CONFIG_CHANNEL_CREATED);
         // Initialize the Socket Requestor
-        isc::server_common::initSocketReqeustor(*cc_session);
+        isc::server_common::initSocketRequestor(*cc_session);
 
         // We delay starting listening to new commands/config just before we
         // go into the main loop to avoid confusion due to mixture of
         // synchronous and asynchronous operations (this would happen in
-        // initializing TSIG keys below).  Until then all operations on the
-        // CC session will take place synchronously.
+        // initial communication with the boss that takes place in
+        // updateConfig() for listen_on and in initializing TSIG keys below).
+        // Until then all operations on the CC session will take place
+        // synchronously.
         config_session = new ModuleCCSession(specfile, *cc_session,
                                              my_config_handler,
                                              my_command_handler, false);
diff --git a/src/bin/resolver/main.cc b/src/bin/resolver/main.cc
index 4834458..bfcad67 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -202,10 +202,13 @@ main(int argc, char* argv[]) {
         LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_SERVICE_CREATED);
 
         cc_session = new Session(io_service.get_io_service());
-        isc::server_common::initSocketReqeustor(*cc_session);
+        isc::server_common::initSocketRequestor(*cc_session);
+
+        // We delay starting listening to new commands/config just before we
+        // go into the main loop.   See auth/main.cc for the rationale.
         config_session = new ModuleCCSession(specfile, *cc_session,
                                              my_config_handler,
-                                             my_command_handler);
+                                             my_command_handler, false);
         LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_CONFIG_CHANNEL);
 
         resolver->setConfigSession(config_session);
@@ -218,6 +221,9 @@ main(int argc, char* argv[]) {
         resolver->updateConfig(config_session->getFullConfig(), true);
         LOG_DEBUG(resolver_logger, RESOLVER_DBG_INIT, RESOLVER_CONFIG_LOADED);
 
+        // Now start asynchronous read.
+        config_session->start();
+
         LOG_INFO(resolver_logger, RESOLVER_STARTED);
         io_service.run();
     } catch (const std::exception& ex) {
diff --git a/src/lib/server_common/socket_request.cc b/src/lib/server_common/socket_request.cc
index e7695c7..5b71ab2 100644
--- a/src/lib/server_common/socket_request.cc
+++ b/src/lib/server_common/socket_request.cc
@@ -380,7 +380,7 @@ socketRequestor() {
 }
 
 void
-initSocketReqeustor(cc::AbstractSession& session) {
+initSocketRequestor(cc::AbstractSession& session) {
     if (requestor != NULL) {
         isc_throw(InvalidOperation,
                   "The socket requestor was already initialized");
diff --git a/src/lib/server_common/socket_request.h b/src/lib/server_common/socket_request.h
index 2983275..b67c66a 100644
--- a/src/lib/server_common/socket_request.h
+++ b/src/lib/server_common/socket_request.h
@@ -168,7 +168,7 @@ SocketRequestor& socketRequestor();
 /// \param session the CC session that'll be used to talk to the
 ///                socket creator.
 /// \throw InvalidOperation when it is called more than once
-void initSocketReqeustor(cc::AbstractSession& session);
+void initSocketRequestor(cc::AbstractSession& session);
 
 /// \brief Initialization for tests
 ///
diff --git a/src/lib/server_common/tests/socket_requestor_test.cc b/src/lib/server_common/tests/socket_requestor_test.cc
index 4cc4f5e..fc5b303 100644
--- a/src/lib/server_common/tests/socket_requestor_test.cc
+++ b/src/lib/server_common/tests/socket_requestor_test.cc
@@ -83,7 +83,7 @@ public:
                                     ElementPtr(new ListElement),
                                     ElementPtr(new ListElement))
     {
-        initSocketReqeustor(session);
+        initSocketRequestor(session);
     }
 
     ~SocketRequestorTest() {