From f3b087a6d1c1fb8e6281671f91c910835bfeec26 Mon Sep 17 00:00:00 2001 From: xutao Date: Wed, 18 Nov 2020 16:58:08 +0800 Subject: [PATCH] In SSL mode, if esp_transport_poll_read function is used, the cache data in mebdtls will be blocked --- components/tcp_transport/transport_ssl.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/components/tcp_transport/transport_ssl.c b/components/tcp_transport/transport_ssl.c index dcbe694099..2c09f74ed6 100644 --- a/components/tcp_transport/transport_ssl.c +++ b/components/tcp_transport/transport_ssl.c @@ -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) {