Browse code

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).

Andrei Pelinescu-Onciul authored on 27/05/2010 17:48:02
Showing 2 changed files
... ...
@@ -172,7 +172,6 @@ tls_domain_t cli_defaults = {
172 172
 static str tls_method = STR_STATIC_INIT("TLSv1");
173 173
 
174 174
 
175
-int tls_handshake_timeout = 30;
176 175
 int tls_send_timeout = 30;
177 176
 int tls_con_lifetime = 600; /* this value will be adjusted to ticks later */
178 177
 int tls_log = 3;
... ...
@@ -239,8 +238,6 @@ static param_export_t params[] = {
239 238
 	{"ca_list",             PARAM_STR,    &mod_params.ca_file     },
240 239
 	{"certificate",         PARAM_STR,    &mod_params.cert_file   },
241 240
 	{"cipher_list",         PARAM_STR,    &mod_params.cipher_list },
242
-	{"handshake_timeout",   PARAM_INT,    &tls_handshake_timeout  },
243
-	{"send_timeout",        PARAM_INT,    &tls_send_timeout       },
244 241
 	{"connection_timeout",  PARAM_INT,    &tls_con_lifetime       },
245 242
 	{"tls_log",             PARAM_INT,    &tls_log                },
246 243
 	{"session_cache",       PARAM_INT,    &tls_session_cache      },
... ...
@@ -43,8 +43,6 @@
43 43
 #include "../../locking.h"
44 44
 #include "tls_domain.h"
45 45
 
46
-extern int tls_handshake_timeout;
47
-extern int tls_send_timeout;
48 46
 extern int tls_con_lifetime;
49 47
 extern int tls_log;
50 48
 extern int tls_session_cache;