feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for non-blocking read timeout.

Browse Source
This commit is contained in:
David Garske
2019-01-11 08:45:34 -08:00
parent 3f46250994
commit 6eea924a5c
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/client/client.c
View File

@ -54,6 +54,9 @@
#endif #endif
#define DEFAULT_TIMEOUT_SEC 2 #define DEFAULT_TIMEOUT_SEC 2
#ifndef MAX_NON_BLOCK_SEC
#define MAX_NON_BLOCK_SEC 10
#endif
#define OCSP_STAPLING 1 #define OCSP_STAPLING 1
#define OCSP_STAPLINGV2 2 #define OCSP_STAPLINGV2 2
@ -101,7 +104,6 @@ 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; int elapsedSec = 0;
#ifndef WOLFSSL_CALLBACKS #ifndef WOLFSSL_CALLBACKS
@ -159,7 +161,8 @@ static int NonBlockingSSL_Connect(WOLFSSL* ssl)
error = WOLFSSL_ERROR_WANT_READ; error = WOLFSSL_ERROR_WANT_READ;
elapsedSec += currTimeout; elapsedSec += currTimeout;
if (elapsedSec > maxSec) { if (elapsedSec > MAX_NON_BLOCK_SEC) {
printf("Nonblocking connect timeout\n");
error = WOLFSSL_FATAL_ERROR; error = WOLFSSL_FATAL_ERROR;
} }
} }
@ -524,7 +527,7 @@ static int ClientBenchmarkThroughput(WOLFSSL_CTX* ctx, char* host, word16 port,
} }
/* Compare TX and RX buffers */ /* Compare TX and RX buffers */
if(XMEMCMP(tx_buffer, rx_buffer, len) != 0) { if (XMEMCMP(tx_buffer, rx_buffer, len) != 0) {
free(tx_buffer); free(tx_buffer);
tx_buffer = NULL; tx_buffer = NULL;
free(rx_buffer); free(rx_buffer);
@ -721,6 +724,7 @@ static void ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead)
{ {
int ret, err; int ret, err;
char buffer[WOLFSSL_MAX_ERROR_SZ]; char buffer[WOLFSSL_MAX_ERROR_SZ];
double start = current_time(1), elapsed;
do { do {
err = 0; /* reset error */ err = 0; /* reset error */
@ -740,6 +744,15 @@ static void ClientRead(WOLFSSL* ssl, char* reply, int replyLen, int mustRead)
err_sys("SSL_read failed"); err_sys("SSL_read failed");
} }
} }
if (mustRead && err == WOLFSSL_ERROR_WANT_READ) {
elapsed = current_time(0) - start;
if (elapsed > MAX_NON_BLOCK_SEC) {
printf("Nonblocking read timeout\n");
err = WOLFSSL_FATAL_ERROR;
break;
}
}
} while ((mustRead && err == WOLFSSL_ERROR_WANT_READ) } while ((mustRead && err == WOLFSSL_ERROR_WANT_READ)
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
|| err == WC_PENDING_E || err == WC_PENDING_E