BIND 10 jreed-doxygen, updated. ce374384070155e16216b2624bd89f184993df0d [jreed-doxygen]Merge branch 'master' into jreed-doxygen

[BIND 10 source code commits]

The branch, jreed-doxygen has been updated
       via  ce374384070155e16216b2624bd89f184993df0d (commit)
       via  0ec520e6070de64a0462e3239e1be48aa8635ffd (commit)
       via  36208de9b48fdf61061554819f72a72258589f84 (commit)
       via  1d88daaa24e8b1ab27f28be876f40a144241e93b (commit)
       via  41ef6df597d8831d080d4dfc7c582f06e7f92511 (commit)
       via  bf57a576ff80578d47471569a48f0fbfd1fb6e2e (commit)
      from  ba9ed9d67285288e425e9fe9ebddf99bcda69d8a (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 ce374384070155e16216b2624bd89f184993df0d
Merge: ba9ed9d67285288e425e9fe9ebddf99bcda69d8a 0ec520e6070de64a0462e3239e1be48aa8635ffd
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Mar 14 10:50:32 2011 -0500

    [jreed-doxygen]Merge branch 'master' into jreed-doxygen
    
    Handled conflict.
    Also removed spaces on a blank line.

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

Summary of changes:
 ChangeLog                      |    4 ++++
 src/lib/asiolink/dns_lookup.h  |    3 ++-
 src/lib/asiolink/tcp_server.cc |   10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 4294904..cc87bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+  200.  [bug]           Jelte
+	Fixed a bug where incoming TCP connections were not closed.
+	(Trac #589, git 1d88daaa24e8b1ab27f28be876f40a144241e93b)
+
   199.  [func]           ocean
 	Cache negative responses (NXDOMAIN/NODATA) from authoritative
 	server for recursive resolver.
diff --git a/src/lib/asiolink/dns_lookup.h b/src/lib/asiolink/dns_lookup.h
index 39b3709..a79976f 100644
--- a/src/lib/asiolink/dns_lookup.h
+++ b/src/lib/asiolink/dns_lookup.h
@@ -63,7 +63,8 @@ public:
     ///
     /// \param io_message The event message to handle
     /// \param message The DNS MessagePtr that needs handling
-    /// \param answer_message The DNS MessagePtr TODO
+    /// \param answer_message The final answer will be constructed in
+    ///                       this MessagePtr
     /// \param buffer The final answer is put here
     /// \param server DNSServer object to use
     virtual void operator()(const IOMessage& io_message,
diff --git a/src/lib/asiolink/tcp_server.cc b/src/lib/asiolink/tcp_server.cc
index 3e0cdb4..0bc56d8 100644
--- a/src/lib/asiolink/tcp_server.cc
+++ b/src/lib/asiolink/tcp_server.cc
@@ -115,6 +115,7 @@ TCPServer::operator()(error_code ec, size_t length) {
         CORO_YIELD async_read(*socket_, asio::buffer(data_.get(),
                               TCP_MESSAGE_LENGTHSIZE), *this);
         if (ec) {
+            socket_->close();
             CORO_YIELD return;
         }
 
@@ -127,6 +128,7 @@ TCPServer::operator()(error_code ec, size_t length) {
         }
 
         if (ec) {
+            socket_->close();
             CORO_YIELD return;
         }
 
@@ -160,6 +162,7 @@ TCPServer::operator()(error_code ec, size_t length) {
         // If we don't have a DNS Lookup provider, there's no point in
         // continuing; we exit the coroutine permanently.
         if (lookup_callback_ == NULL) {
+            socket_->close();
             CORO_YIELD return;
         }
 
@@ -177,6 +180,9 @@ TCPServer::operator()(error_code ec, size_t length) {
         // The 'done_' flag indicates whether we have an answer
         // to send back.  If not, exit the coroutine permanently.
         if (!done_) {
+            // TODO: should we keep the connection open for a short time
+            // to see if new requests come in?
+            socket_->close();
             CORO_YIELD return;
         }
 
@@ -195,6 +201,10 @@ TCPServer::operator()(error_code ec, size_t length) {
         // (though we have nothing further to do, so the coroutine
         // will simply exit at that time).
         CORO_YIELD async_write(*socket_, bufs, *this);
+
+        // TODO: should we keep the connection open for a short time
+        // to see if new requests come in?
+        socket_->close();
     }
 }