From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 17 Jan 2012 17:47:05 +0000 (-0800)
Subject: [1546] swapped comments about deferring asynchronous listening to cc messages.
X-Git-Tag: trac2351_base~296^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=354bb735d31ec83aba2eb0afe3a0e05aa8f254d5;p=thirdparty%2Fkea.git

[1546] swapped comments about deferring asynchronous listening to cc messages.
the detailed version of comments were intended to be for auth, but placed
in the wrong place (resolver/main).
---

diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index 6fdd255b36..f6458829ed 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -163,7 +163,12 @@ main(int argc, char* argv[]) {
         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.
+        // go into the main loop to avoid confusion due to mixture of
+        // synchronous and asynchronous operations (this would happen in
+        // 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 af187316c8..2026e4e405 100644
--- a/src/bin/resolver/main.cc
+++ b/src/bin/resolver/main.cc
@@ -211,11 +211,7 @@ main(int argc, char* argv[]) {
         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
-        // initial communication with the boss that takes place in
-        // updateConfig() for listen_on).  Until then all operations on the CC
-        // session will take place synchronously.
+        // 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, false);