jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common: use select for SSL_ERROR_WANT_READ, SSL_ERROR_WANT_WRITE tls errors

Browse Source
This commit is contained in:
Jay Sorg 2017-02-23 12:02:48 -08:00 committed by jsorg71
parent dccd95ee93
commit 657f6f3756
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/ssl_calls.c
View File

@ -34,6 +34,7 @@
#include "ssl_calls.h" #include "ssl_calls.h"
#include "trans.h" #include "trans.h"
#define SSL_WANT_READ_WRITE_TIMEOUT 100
#if OPENSSL_VERSION_NUMBER < 0x10100000L #if OPENSSL_VERSION_NUMBER < 0x10100000L
static inline HMAC_CTX * static inline HMAC_CTX *
@ -726,13 +727,16 @@ ssl_tls_read(struct ssl_tls *tls, char *data, int length)
break_flag = 1; break_flag = 1;
break; break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
/** /**
* retry when SSL_get_error returns: * retry when SSL_get_error returns:
* SSL_ERROR_WANT_READ * SSL_ERROR_WANT_READ
* SSL_ERROR_WANT_WRITE * SSL_ERROR_WANT_WRITE
*/ */
case SSL_ERROR_WANT_READ:
g_sck_can_recv(tls->trans->sck, SSL_WANT_READ_WRITE_TIMEOUT);
continue;
case SSL_ERROR_WANT_WRITE:
g_sck_can_send(tls->trans->sck, SSL_WANT_READ_WRITE_TIMEOUT);
continue; continue;
default: default:
@ -772,13 +776,16 @@ ssl_tls_write(struct ssl_tls *tls, const char *data, int length)
break_flag = 1; break_flag = 1;
break; break;
case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE:
/** /**
* retry when SSL_get_error returns: * retry when SSL_get_error returns:
* SSL_ERROR_WANT_READ * SSL_ERROR_WANT_READ
* SSL_ERROR_WANT_WRITE * SSL_ERROR_WANT_WRITE
*/ */
case SSL_ERROR_WANT_READ:
g_sck_can_recv(tls->trans->sck, SSL_WANT_READ_WRITE_TIMEOUT);
continue;
case SSL_ERROR_WANT_WRITE:
g_sck_can_send(tls->trans->sck, SSL_WANT_READ_WRITE_TIMEOUT);
continue; continue;
default: default: