BIND 10 trac657, updated. 9287cc8f31d6ed03cdcd95f6ca59b58ed6d695b6 Merge remote-tracking branch 'origin/trac657' into work/busyloop

[BIND 10 source code commits]

The branch, trac657 has been updated
       via  9287cc8f31d6ed03cdcd95f6ca59b58ed6d695b6 (commit)
       via  34eaa7c5e831bb170f0fe8792e40df88f66ed8b9 (commit)
      from  b9d341ecd382b44d72888899e3559d7d41baa203 (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 9287cc8f31d6ed03cdcd95f6ca59b58ed6d695b6
Merge: 34eaa7c5e831bb170f0fe8792e40df88f66ed8b9 b9d341ecd382b44d72888899e3559d7d41baa203
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Mar 8 21:19:41 2011 +0100

    Merge remote-tracking branch 'origin/trac657' into work/busyloop

commit 34eaa7c5e831bb170f0fe8792e40df88f66ed8b9
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Mar 8 21:17:34 2011 +0100

    [trac657] Use OS-independent error messages
    
    The asio wraps them, so we can be portable.

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

Summary of changes:
 src/lib/asiolink/tcp_server.cc |    9 ++++-----
 src/lib/asiolink/udp_server.cc |    8 +++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/tcp_server.cc b/src/lib/asiolink/tcp_server.cc
index 8f3fa0d..a6468ce 100644
--- a/src/lib/asiolink/tcp_server.cc
+++ b/src/lib/asiolink/tcp_server.cc
@@ -91,11 +91,10 @@ TCPServer::operator()(error_code ec, size_t length) {
                 // Abort on fatal errors
                 // TODO: Log error?
                 if (ec) {
-                    if (ec.category() != error::system_category) {
-                        return;
-                    }
-                    if (ec.value() != EWOULDBLOCK && ec.value() != EAGAIN &&
-                        ec.value() != ECONNABORTED && ec.value() != EINTR) {
+                    using namespace asio::error;
+                    if (ec.value() != would_block && ec.value() != try_again &&
+                        ec.value() != connection_aborted &&
+                        ec.value() != interrupted) {
                         return;
                     }
                 }
diff --git a/src/lib/asiolink/udp_server.cc b/src/lib/asiolink/udp_server.cc
index 7f58b00..ee58d24 100644
--- a/src/lib/asiolink/udp_server.cc
+++ b/src/lib/asiolink/udp_server.cc
@@ -198,11 +198,9 @@ UDPServer::operator()(error_code ec, size_t length) {
                     *this);
                 // Abort on fatal errors
                 if (ec) {
-                    if (ec.category() != error::system_category) {
-                        return;
-                    }
-                    if (ec.value() != EWOULDBLOCK && ec.value() != EAGAIN &&
-                        ec.value() != EINTR) {
+                    using namespace asio::error;
+                    if (ec.value() != would_block && ec.value() != try_again &&
+                        ec.value() != interrupted) {
                         return;
                     }
                 }