svn commit: r1148398 - in /trafficserver/traffic/trunk/iocore/net: I_NetConfig.h NetConfig.cc

[ig...@apache.org]

Author: igalic
Date: Tue Jul 19 15:32:07 2011
New Revision: 1148398

URL: http://svn.apache.org/viewvc?rev=1148398&view=rev
Log:
[TS-884] cleanup unused variables from iocore/net/
We're down to one variable referenced in these files: net_config_poll_timeout
To me this means that we need to give this file new meaning, or throw it out.

Modified:
    trafficserver/traffic/trunk/iocore/net/I_NetConfig.h
    trafficserver/traffic/trunk/iocore/net/NetConfig.cc

Modified: trafficserver/traffic/trunk/iocore/net/I_NetConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_NetConfig.h?rev=1148398&r1=1148397&r2=1148398&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_NetConfig.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_NetConfig.h Tue Jul 19 15:32:07 2011
@@ -36,29 +36,5 @@
 #endif
 
 extern int net_config_poll_timeout;
-extern int net_config_fds_throttle;
-extern int net_config_listen_backlog;
 
-// SSL config
-extern int net_config_ssl_mode;
-extern int net_config_sslAccelerator;
-extern int net_config_ssl_accept_port_number;
-extern int net_config_clientCertLevel;
-extern const char *net_config_atallaAccelLibPath;
-extern const char *net_config_ncipherAccelLibPath;
-extern const char *net_config_cswiftAccelLibPath;
-extern const char *net_config_serverCertFilename;
-extern const char *net_config_serverCertRelativePath;
-extern const char *net_config_multicert_config_file;
-extern char *net_config_ssl_server_private_key_filename;
-extern char *net_config_ssl_server_private_key_path;
-extern char *net_config_CACertFilename;
-extern char *net_config_CACertRelativePath;
-extern int net_config_clientVerify;
-extern char *net_config_ssl_client_cert_filename;
-extern const char *net_config_ssl_client_cert_path;
-extern char *net_config_ssl_client_private_key_filename;
-extern char *net_config_ssl_client_private_key_path;
-extern char *net_config_clientCACertFilename;
-extern char *net_config_clientCACertRelativePath;
 #endif

Modified: trafficserver/traffic/trunk/iocore/net/NetConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/NetConfig.cc?rev=1148398&r1=1148397&r2=1148398&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/NetConfig.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/NetConfig.cc Tue Jul 19 15:32:07 2011
@@ -26,80 +26,3 @@
 #define NULL 0
 
 int net_config_poll_timeout = DEFAULT_POLL_TIMEOUT;
-int net_config_fds_throttle = 8000;
-int net_config_listen_backlog = 1024;
-
-
-// SSL config
-// # proxy.config.ssl.enabled should be:
-// #   0 - none
-// #   1 - SSL enabled
-int net_config_ssl_mode = 1;
-
-// #   proxy.config.ssl.accelerator.type should be:
-// #   0 - none (software algorithms)
-// #   1 - NCipher Nfast accelerator card
-// #   2 - Rainbow Crypto Swift accelerator card
-// #   3 - Compaq Atalla accelerator card
-int net_config_sslAccelerator = 0;
-
-//    # the following accelerator library paths only need
-//    # to be changed if the default path was not used
-//    # while installing the accelerator card.
-const char *net_config_atallaAccelLibPath = "/opt/atalla/lib";
-const char *net_config_ncipherAccelLibPath = "/opt/nfast/toolkits/hwcrhk";
-const char *net_config_cswiftAccelLibPath = "/usr/lib";
-
-
-int net_config_ssl_accept_port_number = 8443;
-
-//    # Client certification level should be:
-//    # 0 no client certificates
-//    # 1 client certificates optional
-//    # 2 client certificates required
-int net_config_clientCertLevel = 0;
-
-//    # Server cert filename is the name of the cert file
-//    # for a single cert system and the default cert name
-//    # for a multiple cert system.
-const char *net_config_serverCertFilename = "server.pem";
-
-//    # This is the path that will be used for both single and
-//    # multi cert systems.
-const char *net_config_serverCertRelativePath = "etc/trafficserver";
-
-//    # Fill in private key file and path only if the server's
-//    # private key is not contained in the server certificate file.
-//    # For multiple cert systems, if any private key is not contained
-//    # in the cert file, you must fill in the private key path.
-char *net_config_ssl_server_private_key_filename = NULL;
-char *net_config_ssl_server_private_key_path = NULL;
-
-//    # The CA file name and path are the
-//    # certificate authority certificate that
-//    # client certificates will be verified against.
-char *net_config_CACertFilename = NULL;
-char *net_config_CACertRelativePath = NULL;
-
-
-//    ################################
-//    # client related configuration #
-//    ################################
-
-int net_config_clientVerify = 0;
-char *net_config_ssl_client_cert_filename = NULL;
-const char *net_config_ssl_client_cert_path = "etc/trafficserver";
-
-//    # Fill in private key file and path only if the client's
-//    # private key is not contained in the client certificate file.
-char *net_config_ssl_client_private_key_filename = NULL;
-char *net_config_ssl_client_private_key_path = NULL;
-
-//    # The CA file name and path are the
-//    # certificate authority certificate that
-//    # server certificates will be verified against.
-char *net_config_clientCACertFilename = NULL;
-char *net_config_clientCACertRelativePath = NULL;
-
-
-const char *net_config_multicert_config_file = "ssl_multicert.config";