diff options
| author | Gordon Sim <gsim@apache.org> | 2010-04-28 15:27:36 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2010-04-28 15:27:36 +0000 |
| commit | 7bbfd9565918d0fa2d537d4fca68aab371f3f9cf (patch) | |
| tree | 68561e0e1b3e84806e90573460e61d3ea8b3494c /cpp/src/qpid/sys/ssl/SslIo.cpp | |
| parent | 00c88b4252f083441c3a95a7ec6da0f1bc5b2d36 (diff) | |
| download | qpid-python-7bbfd9565918d0fa2d537d4fca68aab371f3f9cf.tar.gz | |
QPID-2083: Some improvements to error handling for NSS based SSL implementation.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@938992 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/ssl/SslIo.cpp')
| -rw-r--r-- | cpp/src/qpid/sys/ssl/SslIo.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/qpid/sys/ssl/SslIo.cpp b/cpp/src/qpid/sys/ssl/SslIo.cpp index a57123c182..a58a137473 100644 --- a/cpp/src/qpid/sys/ssl/SslIo.cpp +++ b/cpp/src/qpid/sys/ssl/SslIo.cpp @@ -21,6 +21,7 @@ #include "qpid/sys/ssl/SslIo.h" #include "qpid/sys/ssl/SslSocket.h" +#include "qpid/sys/ssl/check.h" #include "qpid/sys/Time.h" #include "qpid/sys/posix/check.h" @@ -312,7 +313,7 @@ void SslIO::readable(DispatchHandle& h) { break; } else { // Report error then just treat as a socket disconnect - QPID_LOG(error, "Error reading socket: " << qpid::sys::strError(rc) << "(" << rc << ")" ); + QPID_LOG(error, "Error reading socket: " << getErrorString(PR_GetError())); eofCallback(*this); h.unwatchRead(); break; @@ -383,7 +384,9 @@ void SslIO::writeable(DispatchHandle& h) { // we can carry on watching for writes break; } else { - QPID_POSIX_CHECK(rc); + QPID_LOG(error, "Error writing to socket: " << getErrorString(PR_GetError())); + h.unwatchWrite(); + break; } } } else { |