trafficserver-commits mailing list archives

Repository: trafficserver
Updated Branches:
  refs/heads/master a008a0a80 -> 5fcd9d74f


TS-3452: Better debug messages for SSL_ERROR_SSL: incorporate changes suggested by sudheer
to peek.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5fcd9d74
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5fcd9d74
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5fcd9d74

Branch: refs/heads/master
Commit: 5fcd9d74f20f8b9b3aa8dd361fa4d037676b00ef
Parents: a008a0a
Author: Brian Geffon <briang@apache.org>
Authored: Tue Mar 17 15:02:32 2015 -0700
Committer: Brian Geffon <briang@apache.org>
Committed: Tue Mar 17 15:02:32 2015 -0700

----------------------------------------------------------------------
 iocore/net/SSLUtils.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5fcd9d74/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 93d04f3..0ced75c 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -2057,9 +2057,9 @@ SSLWriteBuffer(SSL * ssl, const void * buf, int64_t nbytes, int64_t&
nwritten)
   int ssl_error = SSL_get_error(ssl, ret);
   if (ssl_error == SSL_ERROR_SSL) {
     char buf[512];
-    unsigned long e = ERR_get_error();
+    unsigned long e = ERR_peek_last_error();
     ERR_error_string_n(e, buf, sizeof(buf));
-    Debug("ssl.error.write", "SSL write returned %d, ssl_error=%d, ERR_get_error=%d (%s)",
ret, ssl_error, e, buf);
+    Debug("ssl.error.write", "SSL write returned %d, ssl_error=%d, ERR_get_error=%ld (%s)",
ret, ssl_error, e, buf);
   }
   return ssl_error;
 }
@@ -2081,9 +2081,9 @@ SSLReadBuffer(SSL * ssl, void * buf, int64_t nbytes, int64_t& nread)
   int ssl_error = SSL_get_error(ssl, ret);
   if (ssl_error == SSL_ERROR_SSL) {
     char buf[512];
-    unsigned long e = ERR_get_error();
+    unsigned long e = ERR_peek_last_error();
     ERR_error_string_n(e, buf, sizeof(buf));
-    Debug("ssl.error.read", "SSL read returned %d, ssl_error=%d, ERR_get_error=%d (%s)",
ret, ssl_error, e, buf);
+    Debug("ssl.error.read", "SSL read returned %d, ssl_error=%d, ERR_get_error=%ld (%s)",
ret, ssl_error, e, buf);
   }
 
   return ssl_error;
@@ -2100,9 +2100,9 @@ SSLAccept(SSL * ssl)
   int ssl_error = SSL_get_error(ssl, ret);
   if (ssl_error == SSL_ERROR_SSL) {
     char buf[512];
-    unsigned long e = ERR_get_error();
+    unsigned long e = ERR_peek_last_error();
     ERR_error_string_n(e, buf, sizeof(buf));
-    Debug("ssl.error.accept", "SSL accept returned %d, ssl_error=%d, ERR_get_error=%d (%s)",
ret, ssl_error, e, buf);
+    Debug("ssl.error.accept", "SSL accept returned %d, ssl_error=%d, ERR_get_error=%ld (%s)",
ret, ssl_error, e, buf);
   }
 
   return ssl_error;
@@ -2119,9 +2119,9 @@ SSLConnect(SSL * ssl)
   int ssl_error = SSL_get_error(ssl, ret);
    if (ssl_error == SSL_ERROR_SSL) {
      char buf[512];
-     unsigned long e = ERR_get_error();
+     unsigned long e = ERR_peek_last_error();
      ERR_error_string_n(e, buf, sizeof(buf));
-     Debug("ssl.error.connect", "SSL connect returned %d, ssl_error=%d, ERR_get_error=%d
(%s)", ret, ssl_error, e, buf);
+     Debug("ssl.error.connect", "SSL connect returned %d, ssl_error=%d, ERR_get_error=%ld
(%s)", ret, ssl_error, e, buf);
    }
 
    return ssl_error;