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 2010/11/23 18:17:11 UTC
svn commit: r1038211 - in /trafficserver/traffic/trunk/iocore/net:
P_SSLNetProcessor.h P_UnixNetProcessor.h SSLUnixNet.cc UnixNetProcessor.cc
Author: zwoop
Date: Tue Nov 23 17:17:10 2010
New Revision: 1038211
URL: http://svn.apache.org/viewvc?rev=1038211&view=rev
Log:
TS-554 More cleanup for the Stat pages
Modified:
trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h
trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h
trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc
trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
Modified: trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h?rev=1038211&r1=1038210&r2=1038211&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_SSLNetProcessor.h Tue Nov 23 17:17:10 2010
@@ -67,24 +67,15 @@ public:
int initSSLServerCTX(SslConfigParams * param,
SSL_CTX * ctx, char *serverCertPtr, char *serverKeyPtr, bool defaultEnabled);
- SSL_CTX *getSSL_CTX(void)
- {
- return (ctx);
- }
- SSL_CTX *getClientSSL_CTX(void)
- {
- return (client_ctx);
- }
- int getAcceptPort()
- {
- return (accept_port_number);
- }
+ SSL_CTX *getSSL_CTX(void) const {return (ctx); }
+ SSL_CTX *getClientSSL_CTX(void) const { return (client_ctx); }
+ int getAcceptPort() { return (accept_port_number); }
static void logSSLError(const char *errStr = "", int critical = 1);
-SSLNetProcessor():UnixNetProcessor(), verify_depth(0), ctx(NULL), client_ctx(NULL), sslMutexArray(NULL),
- accept_port_number(-1) {
- };
- virtual ~ SSLNetProcessor();
+ SSLNetProcessor()
+ : verify_depth(0), ctx(NULL), client_ctx(NULL), sslMutexArray(NULL), accept_port_number(-1)
+ { };
+ virtual ~SSLNetProcessor();
int verify_depth;
SSL_CTX *ctx;
@@ -97,8 +88,9 @@ SSLNetProcessor():UnixNetProcessor(), ve
#if !defined (_IOCORE_WIN32_WINNT)
// Virtual function allows etype
- // to be set to ET_SSL for SSLNetProcessor.
- virtual void setEtype(EventType & etype);
+ // to be upgraded to ET_SSL for SSLNetProcessor.
+ virtual void upgradeEtype(EventType &etype);
+
// Functions all THREAD_FREE and THREAD_ALLOC to be performed
// for both SSL and regular NetVConnection transparent to
// netProcessor connect functions.
Modified: trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h?rev=1038211&r1=1038210&r2=1038211&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_UnixNetProcessor.h Tue Nov 23 17:17:10 2010
@@ -36,7 +36,6 @@ class UnixNetVConnection;
struct UnixNetProcessor:public NetProcessor
{
public:
-
virtual Action * accept_internal(Continuation * cont,
int fd,
sockaddr * bound_sockaddr = NULL,
@@ -48,20 +47,13 @@ public:
);
- Action *connect_re_internal(Continuation * cont,
- unsigned int ip, int port, NetVCOptions * options = NULL);
-
- Action *connect(Continuation * cont,
- UnixNetVConnection ** vc,
- unsigned int ip, int port, NetVCOptions * opt = NULL);
+ Action *connect_re_internal(Continuation * cont, unsigned int ip, int port, NetVCOptions * options = NULL);
+ Action *connect(Continuation * cont, UnixNetVConnection ** vc, unsigned int ip, int port, NetVCOptions * opt = NULL);
- // Virtual function allows etype
- // to be set to ET_SSL for SSLNetProcessor. Does
+ // Virtual function allows etype to be upgraded to ET_SSL for SSLNetProcessor. Does
// nothing for NetProcessor
- virtual void setEtype(EventType & etype)
- {
- (void) etype;
- };
+ virtual void upgradeEtype(EventType & etype) { NOWARN_UNUSED(etype); };
+
// Functions all THREAD_FREE and THREAD_ALLOC to be performed
// for both SSL and regular NetVConnection transparent to
// netProcessor connect functions.
Modified: trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc?rev=1038211&r1=1038210&r2=1038211&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc Tue Nov 23 17:17:10 2010
@@ -71,11 +71,10 @@ SSLNetProcessor::createNetAccept()
return ((NetAccept *) NEW(new SSLNetAccept));
}
-// Virtual function allows etype
-// to be set to ET_SSL for SSLNetProcessor. Does
+// Virtual function allows etype to be upgraded to ET_SSL for SSLNetProcessor. Does
// nothing for NetProcessor
void
-SSLNetProcessor::setEtype(EventType & etype)
+SSLNetProcessor::upgradeEtype(EventType & etype)
{
if (etype == ET_NET) {
etype = ET_SSL;
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc?rev=1038211&r1=1038210&r2=1038211&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetProcessor.cc Tue Nov 23 17:17:10 2010
@@ -133,11 +133,13 @@ UnixNetProcessor::accept_internal(Contin
)
{
EventType et = opt.etype; // setEtype requires non-const ref.
- setEtype(et);
NetAccept *na = createNetAccept();
-
EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
+
+ // Potentially upgrade to SSL.
+ upgradeEtype(et);
+
NET_INCREMENT_DYN_STAT(net_accepts_currently_open_stat);
na->port = opt.port;
na->accept_fn = fn;
@@ -204,9 +206,8 @@ UnixNetProcessor::connect_re_internal(Co
else
opt = &vc->options;
- // virtual function used to set etype to ET_SSL
- // for SSLNetProcessor. Does nothing if not overwritten.
- setEtype(opt->etype);
+ // virtual function used to upgrade etype to ET_SSL for SSLNetProcessor.
+ upgradeEtype(opt->etype);
#ifndef INK_NO_SOCKS
bool using_socks = (socks_conf_stuff->socks_needed && opt->socks_support != NO_SOCKS
@@ -408,13 +409,14 @@ int
UnixNetProcessor::start(int)
{
EventType etype = ET_NET;
+
netHandler_offset = eventProcessor.allocate(sizeof(NetHandler));
pollCont_offset = eventProcessor.allocate(sizeof(PollCont));
- // customize the threads for net
- setEtype(etype);
// etype is ET_NET for netProcessor
// and ET_SSL for sslNetProcessor
+ upgradeEtype(etype);
+
n_netthreads = eventProcessor.n_threads_for_type[etype];
netthreads = eventProcessor.eventthread[etype];
for (int i = 0; i < n_netthreads; i++) {
@@ -458,7 +460,8 @@ UnixNetProcessor::start(int)
*/
#ifdef NON_MODULAR
extern Action *register_ShowNet(Continuation * c, HTTPHdr * h);
- statPagesManager.register_http("net", register_ShowNet);
+ if (etype == ET_NET)
+ statPagesManager.register_http("net", register_ShowNet);
#endif
return 1;
}