trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject trafficserver git commit: Pass the SSL VC down to log SSL errors
Date Sat, 15 Nov 2014 05:22:55 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master bbd53a8db -> 5c79cb924


Pass the SSL VC down to log SSL errors


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

Branch: refs/heads/master
Commit: 5c79cb924c7e63fe6160724e2b8799bcfb120774
Parents: bbd53a8
Author: James Peach <jpeach@apache.org>
Authored: Fri Nov 14 21:21:51 2014 -0800
Committer: James Peach <jpeach@apache.org>
Committed: Fri Nov 14 21:21:51 2014 -0800

----------------------------------------------------------------------
 iocore/net/P_SSLUtils.h         | 8 ++++----
 iocore/net/SSLNetVConnection.cc | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5c79cb92/iocore/net/P_SSLUtils.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLUtils.h b/iocore/net/P_SSLUtils.h
index 3b77e7d..14aba27 100644
--- a/iocore/net/P_SSLUtils.h
+++ b/iocore/net/P_SSLUtils.h
@@ -130,14 +130,14 @@ ssl_error_t SSLConnect(SSL * ssl);
 
 // Log an SSL error.
 #define SSLError(fmt, ...) SSLDiagnostic(DiagsMakeLocation(), false, NULL, fmt, ##__VA_ARGS__)
-#define SSLErrorVC(vc,fmt, ...) SSLDiagnostic(DiagsMakeLocation(), false, vc, fmt, ##__VA_ARGS__)
+#define SSLErrorVC(vc,fmt, ...) SSLDiagnostic(DiagsMakeLocation(), false, (vc), fmt, ##__VA_ARGS__)
 // Log a SSL diagnostic using the "ssl" diagnostic tag.
 #define SSLDebug(fmt, ...) SSLDiagnostic(DiagsMakeLocation(), true, NULL, fmt, ##__VA_ARGS__)
-#define SSLDebugVC(vc,fmt, ...) SSLDiagnostic(DiagsMakeLocation(), true, vc, fmt, ##__VA_ARGS__)
+#define SSLDebugVC(vc, fmt, ...) SSLDiagnostic(DiagsMakeLocation(), true, (vc), fmt, ##__VA_ARGS__)
 
-#define SSL_CLR_ERR_INCR_DYN_STAT(x, fmt, ...) \
+#define SSL_CLR_ERR_INCR_DYN_STAT(vc, x, fmt, ...) \
   do { \
-    SSLDiagnostic(DiagsMakeLocation(), true, NULL, fmt, ##__VA_ARGS__); \
+    SSLDebugVC((vc), fmt, ##__VA_ARGS__); \
     RecIncrRawStat(ssl_rsb, NULL, (int) x, 1); \
   } while (0)
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5c79cb92/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 9291726..4a9ec29 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -253,7 +253,7 @@ ssl_read_from_net(SSLNetVConnection * sslvc, EThread * lthread, int64_t
&ret)
       default:
         event = SSL_READ_ERROR;
         ret = errno;
-        SSL_CLR_ERR_INCR_DYN_STAT(ssl_error_ssl, "[SSL_NetVConnection::ssl_read_from_net]:
errno=%d", errno);
+        SSL_CLR_ERR_INCR_DYN_STAT(sslvc, ssl_error_ssl, "[SSL_NetVConnection::ssl_read_from_net]:
errno=%d", errno);
         break;
       }                         // switch
       break;
@@ -754,7 +754,7 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted,
i
     case SSL_ERROR_SSL:
     default:
       r = -errno;
-      SSL_CLR_ERR_INCR_DYN_STAT(ssl_error_ssl, "SSL_write-SSL_ERROR_SSL errno=%d", errno);
+      SSL_CLR_ERR_INCR_DYN_STAT(this, ssl_error_ssl, "SSL_write-SSL_ERROR_SSL errno=%d",
errno);
       break;
     }
     return (r);
@@ -1051,7 +1051,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
     return EVENT_CONT;
 
   case SSL_ERROR_SSL:
-    SSL_CLR_ERR_INCR_DYN_STAT(ssl_error_ssl, "SSLNetVConnection::sslServerHandShakeEvent,
SSL_ERROR_SSL errno=%d", errno);
+    SSL_CLR_ERR_INCR_DYN_STAT(this, ssl_error_ssl, "SSLNetVConnection::sslServerHandShakeEvent,
SSL_ERROR_SSL errno=%d", errno);
     // fall through
   case SSL_ERROR_ZERO_RETURN:
   case SSL_ERROR_SYSCALL:
@@ -1133,7 +1133,7 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
   case SSL_ERROR_SSL:
   default:
     err = errno;
-    SSL_CLR_ERR_INCR_DYN_STAT(ssl_error_ssl, "SSLNetVConnection::sslClientHandShakeEvent,
SSL_ERROR_SSL errno=%d", errno);
+    SSL_CLR_ERR_INCR_DYN_STAT(this, ssl_error_ssl, "SSLNetVConnection::sslClientHandShakeEvent,
SSL_ERROR_SSL errno=%d", errno);
     return EVENT_ERROR;
     break;
 


Mime
View raw message