Parcourir la source

[trac657] Use OS-independent error messages

The asio wraps them, so we can be portable.
Michal 'vorner' Vaner il y a 14 ans
Parent
commit
34eaa7c5e8
2 fichiers modifiés avec 7 ajouts et 10 suppressions
  1. 4 5
      src/lib/asiolink/tcp_server.cc
  2. 3 5
      src/lib/asiolink/udp_server.cc

+ 4 - 5
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;
                     }
                 }

+ 3 - 5
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;
                     }
                 }