wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix to timeout after 10 seconds in non-blocking mode if connect does not complete.

Browse Source
This commit is contained in:
David Garske
2019-01-10 17:12:37 -08:00
parent e1fd7b86f7
commit 3f46250994
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/client/client.c
View File

@@ -101,6 +101,8 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl)
int error; int error;
SOCKET_T sockfd; SOCKET_T sockfd;
int select_ret = 0; int select_ret = 0;
const int maxSec = 10;
int elapsedSec = 0;
#ifndef WOLFSSL_CALLBACKS #ifndef WOLFSSL_CALLBACKS
ret = wolfSSL_connect(ssl); ret = wolfSSL_connect(ssl);
@@ -151,9 +153,15 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl)
ret = wolfSSL_connect_ex(ssl, handShakeCB, timeoutCB, timeout); ret = wolfSSL_connect_ex(ssl, handShakeCB, timeoutCB, timeout);
#endif #endif
error = wolfSSL_get_error(ssl, 0); error = wolfSSL_get_error(ssl, 0);
elapsedSec = 0; /* reset elapsed */
} }
else if (select_ret == TEST_TIMEOUT && !wolfSSL_dtls(ssl)) { else if (select_ret == TEST_TIMEOUT && !wolfSSL_dtls(ssl)) {
error = WOLFSSL_ERROR_WANT_READ; error = WOLFSSL_ERROR_WANT_READ;
elapsedSec += currTimeout;
if (elapsedSec > maxSec) {
error = WOLFSSL_FATAL_ERROR;
}
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
else if (select_ret == TEST_TIMEOUT && wolfSSL_dtls(ssl) && else if (select_ret == TEST_TIMEOUT && wolfSSL_dtls(ssl) &&
@@ -861,7 +869,7 @@ static const char* client_usage_msg[][59] = {
"-N Use Non-blocking sockets\n", /* 24 */ "-N Use Non-blocking sockets\n", /* 24 */
#ifndef NO_SESSION_CACHE #ifndef NO_SESSION_CACHE
"-r Resume session\n", /* 25 */ "-r Resume session\n", /* 25 */
#endif #endif
"-w Wait for bidirectional shutdown\n", /* 26 */ "-w Wait for bidirectional shutdown\n", /* 26 */
"-M <prot> Use STARTTLS, using <prot> protocol (smtp)\n", /* 27 */ "-M <prot> Use STARTTLS, using <prot> protocol (smtp)\n", /* 27 */
#ifdef HAVE_SECURE_RENEGOTIATION #ifdef HAVE_SECURE_RENEGOTIATION
@@ -911,7 +919,7 @@ static const char* client_usage_msg[][59] = {
"-E <file> Path to load trusted peer cert\n", /* 46 */ "-E <file> Path to load trusted peer cert\n", /* 46 */
#endif #endif
#ifdef HAVE_WNR #ifdef HAVE_WNR
"-q <file> Whitewood config file, defaults\n", /* 47 */ "-q <file> Whitewood config file, defaults\n", /* 47 */
#endif #endif
"-H <arg> Internal tests" "-H <arg> Internal tests"
" [defCipherList, exitWithRet, verifyFail]\n", /* 48 */ " [defCipherList, exitWithRet, verifyFail]\n", /* 48 */
@@ -1007,7 +1015,7 @@ static const char* client_usage_msg[][59] = {
"-N ノンブロッキング・ソケットを使用する\n", /* 24 */ "-N ノンブロッキング・ソケットを使用する\n", /* 24 */
#ifndef NO_SESSION_CACHE #ifndef NO_SESSION_CACHE
"-r セッションを継続する\n", /* 25 */ "-r セッションを継続する\n", /* 25 */
#endif #endif
"-w 双方向シャットダウンを待つ\n", /* 26 */ "-w 双方向シャットダウンを待つ\n", /* 26 */
"-M <prot> STARTTLSを使用する, <prot>プロトコル(smtp)を" "-M <prot> STARTTLSを使用する, <prot>プロトコル(smtp)を"
"使用する\n", /* 27 */ "使用する\n", /* 27 */
@@ -1061,7 +1069,7 @@ static const char* client_usage_msg[][59] = {
"-E <file> 信頼出来るピアの証明書ロードの為のパス\n", /* 46 */ "-E <file> 信頼出来るピアの証明書ロードの為のパス\n", /* 46 */
#endif #endif
#ifdef HAVE_WNR #ifdef HAVE_WNR
"-q <file> Whitewood コンフィグファイル, 既定値\n", /* 47 */ "-q <file> Whitewood コンフィグファイル, 既定値\n", /* 47 */
#endif #endif
"-H <arg> 内部テスト" "-H <arg> 内部テスト"
" [defCipherList, exitWithRet, verifyFail]\n", /* 48 */ " [defCipherList, exitWithRet, verifyFail]\n", /* 48 */