[sr-dev] git:andrei/tcp_tls_changes: tls: removed handshake_timeout and send_timeout

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 3def48dce7f30f0fea37a4515922699b88c981b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3def48d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 19:48:02 2010 +0200 tls: removed handshake_timeout and send_timeout Removed the handshake_timeout and send_timeout parameters. The values from tcp are used instead (tcp_connect_timeout and tcp_send_timeout). --- modules/tls/tls_mod.c | 3 --- modules/tls/tls_mod.h | 2 -- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index d545b31..7595684 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -172,7 +172,6 @@ tls_domain_t cli_defaults = { static str tls_method = STR_STATIC_INIT("TLSv1"); -int tls_handshake_timeout = 30; int tls_send_timeout = 30; int tls_con_lifetime = 600; /* this value will be adjusted to ticks later */ int tls_log = 3; @@ -239,8 +238,6 @@ static param_export_t params[] = { {"ca_list", PARAM_STR, &mod_params.ca_file }, {"certificate", PARAM_STR, &mod_params.cert_file }, {"cipher_list", PARAM_STR, &mod_params.cipher_list }, - {"handshake_timeout", PARAM_INT, &tls_handshake_timeout }, - {"send_timeout", PARAM_INT, &tls_send_timeout }, {"connection_timeout", PARAM_INT, &tls_con_lifetime }, {"tls_log", PARAM_INT, &tls_log }, {"session_cache", PARAM_INT, &tls_session_cache }, diff --git a/modules/tls/tls_mod.h b/modules/tls/tls_mod.h index ccadae0..19366ba 100644 --- a/modules/tls/tls_mod.h +++ b/modules/tls/tls_mod.h @@ -43,8 +43,6 @@ #include "../../locking.h" #include "tls_domain.h" -extern int tls_handshake_timeout; -extern int tls_send_timeout; extern int tls_con_lifetime; extern int tls_log; extern int tls_session_cache;