You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/02/20 22:02:22 UTC
git commit: TS-841 Cleanup of some old SSL crud
Updated Branches:
refs/heads/master af7e88d81 -> ea9799496
TS-841 Cleanup of some old SSL crud
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ea979949
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ea979949
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ea979949
Branch: refs/heads/master
Commit: ea9799496f150eeb871374224ceefe5ca7fc481c
Parents: af7e88d
Author: Leif Hedstrom <zw...@apache.org>
Authored: Mon Feb 20 14:01:54 2012 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Feb 20 14:01:54 2012 -0700
----------------------------------------------------------------------
iocore/net/P_SSLNetVConnection.h | 25 -------------
iocore/net/SSLNetVConnection.cc | 63 ---------------------------------
2 files changed, 0 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ea979949/iocore/net/P_SSLNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index 00247d6..4375fb7 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -56,31 +56,6 @@ class SSLNetVConnection:public UnixNetVConnection
#endif
{
public:
- int connect_calls;
- int connect_want_write;
- int connect_want_read;
- int connect_want_connect;
- int connect_want_ssl;
- int connect_want_syscal;
- int connect_want_accept;
- int connect_want_x509;
- int connect_error_zero;
- int accept_calls;
- int read_calls;
- int read_want_write;
- int read_want_read;
- int read_want_ssl;
- int read_want_syscal;
- int read_want_x509;
- int read_error_zero;
- int write_calls;
- int write_want_write;
- int write_want_read;
- int write_want_ssl;
- int write_want_syscal;
- int write_want_x509;
- int write_error_zero;
-
virtual int sslStartHandShake(int event, int &err);
virtual void free(EThread * t);
virtual void enableRead()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ea979949/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index ab05a43..76f6564 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -94,7 +94,6 @@ ssl_read_from_net(NetHandler * nh, UnixNetVConnection * vc, EThread * lthread, i
int64_t offset = 0;
// while can be replaced with if - need to test what works faster with openssl
while (block_write_avail > 0) {
- sslvc->read_calls++;
int rres = SSL_read(sslvc->ssl, b->end() + offset, (int)block_write_avail);
Debug("ssl", "[SSL_NetVConnection::ssl_read_from_net] rres=%d", rres);
@@ -348,7 +347,6 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, i
total_wrote += l;
Debug("ssl", "SSLNetVConnection::loadBufferAndCallWrite, before do_SSL_write, l=%"PRId64", towrite=%"PRId64", b=%p",
l, towrite, b);
- write_calls++;
r = do_SSL_write(ssl, b->start() + offset, (int)l);
if (r == l) {
wattempted = total_wrote;
@@ -401,30 +399,6 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, i
}
SSLNetVConnection::SSLNetVConnection():
- connect_calls(0),
- connect_want_write(0),
- connect_want_read(0),
- connect_want_connect(0),
- connect_want_ssl(0),
- connect_want_syscal(0),
- connect_want_accept(0),
- connect_want_x509(0),
- connect_error_zero(0),
- accept_calls(0),
- read_calls(0),
- read_want_write(0),
- read_want_read(0),
- read_want_ssl(0),
- read_want_syscal(0),
- read_want_x509(0),
- read_error_zero(0),
- write_calls(0),
- write_want_write(0),
- write_want_read(0),
- write_want_ssl(0),
- write_want_syscal(0),
- write_want_x509(0),
- write_error_zero(0),
sslHandShakeComplete(false),
sslClientConnection(false),
npnSet(NULL),
@@ -449,30 +423,6 @@ SSLNetVConnection::free(EThread * t) {
options.reset();
closed = 0;
ink_assert(con.fd == NO_FD);
- read_calls = 0;
- write_calls = 0;
- connect_calls = 0;
- accept_calls = 0;
- connect_want_write = 0;
- connect_want_read = 0;
- connect_want_connect = 0;
- connect_want_ssl = 0;
- connect_want_syscal = 0;
- connect_want_accept = 0;
- connect_want_x509 = 0;
- connect_error_zero = 0;
- read_want_write = 0;
- read_want_read = 0;
- read_want_ssl = 0;
- read_want_syscal = 0;
- read_want_x509 = 0;
- read_error_zero = 0;
- write_want_write = 0;
- write_want_read = 0;
- write_want_ssl = 0;
- write_want_syscal = 0;
- write_want_x509 = 0;
- write_error_zero = 0;
if (ssl != NULL) {
/*if (sslHandShakeComplete)
SSL_set_shutdown(ssl, SSL_SENT_SHUTDOWN|SSL_RECEIVED_SHUTDOWN); */
@@ -534,10 +484,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
{
int ret;
- accept_calls++;
- //printf("calling SSL_accept for fd %d\n",con.fd);
ret = SSL_accept(ssl);
-
switch (SSL_get_error(ssl, ret)) {
case SSL_ERROR_NONE:
Debug("ssl", "SSLNetVConnection::sslServerHandShakeEvent, handshake completed successfully");
@@ -618,8 +565,6 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
{
int ret;
- connect_calls++;
- //printf("calling connect for fd %d\n",con.fd);
ret = SSL_connect(ssl);
switch (SSL_get_error(ssl, ret)) {
case SSL_ERROR_NONE:
@@ -643,33 +588,26 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
return EVENT_DONE;
case SSL_ERROR_WANT_WRITE:
- connect_want_write++;
return SSL_HANDSHAKE_WANT_WRITE;
case SSL_ERROR_WANT_READ:
- connect_want_read++;
return SSL_HANDSHAKE_WANT_READ;
case SSL_ERROR_WANT_X509_LOOKUP:
- connect_want_x509++;
Debug("ssl", "SSLNetVConnection::sslClientHandShakeEvent, would block on read or write");
break;
case SSL_ERROR_WANT_ACCEPT:
- connect_want_accept++;
return SSL_HANDSHAKE_WANT_ACCEPT;
case SSL_ERROR_WANT_CONNECT:
- connect_want_connect++;
break;
case SSL_ERROR_ZERO_RETURN:
- connect_error_zero++;
Debug("ssl", "SSLNetVConnection::sslClientHandShakeEvent, EOS");
return EVENT_ERROR;
case SSL_ERROR_SYSCALL:
- connect_want_syscal++;
err = errno;
Debug("ssl", "SSLNetVConnection::sslClientHandShakeEvent, syscall");
return EVENT_ERROR;
@@ -678,7 +616,6 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
case SSL_ERROR_SSL:
default:
- connect_want_ssl++;
err = errno;
SSLNetProcessor::logSSLError("sslClientHandShakeEvent");
return EVENT_ERROR;