blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-13 11:09:12 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/backport_v4.0_fix_transport_ssl_blocking' into 'release/v4.0'

Browse Source 
transport_ssl: Fix a bug in transport_ssl (backport v4.0)

See merge request espressif/esp-idf!11277
This commit is contained in:
David Čermák 2020-11-20 17:45:03 +08:00
commit aef8a36c99
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/tcp_transport/transport_ssl.c
View File

@ -86,6 +86,7 @@ static int ssl_poll_read(esp_transport_handle_t t, int timeout_ms)
{
transport_ssl_t *ssl = esp_transport_get_context_data(t);
int ret = -1;
int remain = 0;
fd_set readset;
fd_set errset;
FD_ZERO(&readset);
@ -93,8 +94,12 @@ static int ssl_poll_read(esp_transport_handle_t t, int timeout_ms)
FD_SET(ssl->tls->sockfd, &readset);
FD_SET(ssl->tls->sockfd, &errset);
struct timeval timeout;
esp_transport_utils_ms_to_timeval(timeout_ms, &timeout);
if ((remain = esp_tls_get_bytes_avail(ssl->tls)) > 0) {
ESP_LOGD(TAG, "remain data in cache, need to read again");
return remain;
}
esp_transport_utils_ms_to_timeval(timeout_ms, &timeout);
ret = select(ssl->tls->sockfd + 1, &readset, NULL, &errset, &timeout);
if (ret > 0 && FD_ISSET(ssl->tls->sockfd, &errset)) {
int sock_errno = 0;
@ -151,10 +156,8 @@ static int ssl_read(esp_transport_handle_t t, char *buffer, int len, int timeout
int poll, ret;
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) {
return poll;
}
if ((poll = esp_transport_poll_read(t, timeout_ms)) <= 0) {
return poll;
}
ret = esp_tls_conn_read(ssl->tls, (unsigned char *)buffer, len);
if (ret < 0) {