generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnutls->handshake: improved timeout handling

Browse Source 
When no timeout is set, we call the socket_ready function with a timeout
value of 0 during handshake, which makes it loop too much/fast in this
function. It also made this function return CURLE_OPERATION_TIMEDOUT
wrongly on a slow handshake.

However, the particular bug report that highlighted this problem is not
solved by this fix, as this fix only makes the more proper error get
reported instead.

Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594150
Reported by: Johannes Ernst
This commit is contained in:
Daniel Stenberg 2010-11-14 12:42:29 +01:00
parent add5766dd4
commit cbf4961bf3
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/gtls.c
View File

@ -216,19 +216,18 @@ static CURLcode handshake(struct connectdata *conn,
connssl->connecting_state?sockfd:CURL_SOCKET_BAD; connssl->connecting_state?sockfd:CURL_SOCKET_BAD;
what = Curl_socket_ready(readfd, writefd, what = Curl_socket_ready(readfd, writefd,
nonblocking?0:(int)timeout_ms); nonblocking?0:(int)timeout_ms?1000:timeout_ms);
if(what < 0) { if(what < 0) {
/* fatal error */ /* fatal error */
failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO); failf(data, "select/poll on SSL socket, errno: %d", SOCKERRNO);
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} }
else if(0 == what) { else if(0 == what) {
if(nonblocking) { if(nonblocking)
return CURLE_OK; return CURLE_OK;
} else if(timeout_ms) {
else {
/* timeout */ /* timeout */
failf(data, "SSL connection timeout"); failf(data, "SSL connection timeout at %ld", timeout_ms);
return CURLE_OPERATION_TIMEDOUT; return CURLE_OPERATION_TIMEDOUT;
} }
} }
@ -241,12 +240,14 @@ static CURLcode handshake(struct connectdata *conn,
connssl->connecting_state = connssl->connecting_state =
gnutls_record_get_direction(session)? gnutls_record_get_direction(session)?
ssl_connect_2_writing:ssl_connect_2_reading; ssl_connect_2_writing:ssl_connect_2_reading;
if(nonblocking) { if(nonblocking)
return CURLE_OK; return CURLE_OK;
} }
} else if (rc < 0) { else if (rc < 0) {
failf(data, "gnutls_handshake() failed: %s", gnutls_strerror(rc)); failf(data, "gnutls_handshake() failed: %s", gnutls_strerror(rc));
} else { return CURLE_SSL_CONNECT_ERROR;
}
else {
/* Reset our connect state machine */ /* Reset our connect state machine */
connssl->connecting_state = ssl_connect_1; connssl->connecting_state = ssl_connect_1;
return CURLE_OK; return CURLE_OK;