feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_transport_ssl_blocking_v3.3' into 'release/v3.3'

Browse Source 
transport_ssl: Fix a bug in transport_ssl (backport v3.3)

See merge request espressif/esp-idf!11294
This commit is contained in:
David Čermák
2020-11-20 17:43:41 +08:00
parent 2c6eb0bd74 85d63af301
commit a19f58355a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/tcp_transport/transport_ssl.c
View File

@ -82,12 +82,18 @@ static int ssl_poll_read(esp_transport_handle_t t, int timeout_ms)
{ {
transport_ssl_t *ssl = esp_transport_get_context_data(t); transport_ssl_t *ssl = esp_transport_get_context_data(t);
int ret = -1; int ret = -1;
int remain = 0;
fd_set readset; fd_set readset;
fd_set errset; fd_set errset;
FD_ZERO(&readset); FD_ZERO(&readset);
FD_ZERO(&errset); FD_ZERO(&errset);
FD_SET(ssl->tls->sockfd, &readset); FD_SET(ssl->tls->sockfd, &readset);
FD_SET(ssl->tls->sockfd, &errset); FD_SET(ssl->tls->sockfd, &errset);
if ((remain = esp_tls_get_bytes_avail(ssl->tls)) > 0) {
ESP_LOGD(TAG, "remain data in cache, need to read again");
return remain;
}
struct timeval timeout; struct timeval timeout;
esp_transport_utils_ms_to_timeval(timeout_ms, &timeout); esp_transport_utils_ms_to_timeval(timeout_ms, &timeout);
@ -146,10 +152,8 @@ static int ssl_read(esp_transport_handle_t t, char *buffer, int len, int timeout
int poll, ret; int poll, ret;
transport_ssl_t *ssl = esp_transport_get_context_data(t); transport_ssl_t *ssl = esp_transport_get_context_data(t);
if (esp_tls_get_bytes_avail(ssl->tls) <= 0) { if ((poll = esp_transport_poll_read(t, timeout_ms)) <= 0) {
if ((poll = esp_transport_poll_read(t, timeout_ms)) <= 0) { return poll;
return poll;
}
} }
ret = esp_tls_conn_read(ssl->tls, (unsigned char *)buffer, len); ret = esp_tls_conn_read(ssl->tls, (unsigned char *)buffer, len);
if (ret < 0) { if (ret < 0) {