fix(transport): Fix a bug of the connection whether be active or not by timeout optio...

diff --git a/components/esp-tls/esp_tls.c b/components/esp-tls/esp_tls.c
index fc5e76754b0853eb79b9f4991e4c15c05aafda3f..a0c916a6608d1a6423a09b0512db619fdb271e7d 100644 (file)
--- a/components/esp-tls/esp_tls.c
+++ b/components/esp-tls/esp_tls.c
@@ -131,6 +131,7 @@ static esp_err_t esp_tcp_connect(const char *host, int hostlen, int port, int *s
             struct timeval tv;
             ms_to_timeval(cfg->timeout_ms, &tv);
             setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+            setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
         }
         if (cfg->non_block) {
             int flags = fcntl(fd, F_GETFL, 0);

diff --git a/components/tcp_transport/transport_ssl.c b/components/tcp_transport/transport_ssl.c
index d5b13490ac0f874fffc8a92eaae7d11b09de45db..b92c21157c6055b4dd516b9344224d5512572cfa 100644 (file)
--- a/components/tcp_transport/transport_ssl.c
+++ b/components/tcp_transport/transport_ssl.c
@@ -78,30 +78,55 @@ static int ssl_connect(esp_transport_handle_t t, const char *host, int port, int
         ssl->tls = NULL;
         return -1;
     }
+
     return 0;
 }
 
 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;
     fd_set readset;
+    fd_set errset;
     FD_ZERO(&readset);
+    FD_ZERO(&errset);
     FD_SET(ssl->tls->sockfd, &readset);
+    FD_SET(ssl->tls->sockfd, &errset);
     struct timeval timeout;
     esp_transport_utils_ms_to_timeval(timeout_ms, &timeout);
 
-    return select(ssl->tls->sockfd + 1, &readset, NULL, NULL, &timeout);
+    ret = select(ssl->tls->sockfd + 1, &readset, NULL, &errset, &timeout);
+    if (ret > 0 && FD_ISSET(ssl->tls->sockfd, &errset)) {
+        int sock_errno = 0;
+        uint32_t optlen = sizeof(sock_errno);
+        getsockopt(ssl->tls->sockfd, SOL_SOCKET, SO_ERROR, &sock_errno, &optlen);
+        ESP_LOGE(TAG, "ssl_poll_read select error %d, errno = %s, fd = %d", sock_errno, strerror(sock_errno), ssl->tls->sockfd);
+        ret = -1;
+    }
+    return ret;
 }
 
 static int ssl_poll_write(esp_transport_handle_t t, int timeout_ms)
 {
     transport_ssl_t *ssl = esp_transport_get_context_data(t);
+    int ret = -1;
     fd_set writeset;
+    fd_set errset;
     FD_ZERO(&writeset);
+    FD_ZERO(&errset);
     FD_SET(ssl->tls->sockfd, &writeset);
+    FD_SET(ssl->tls->sockfd, &errset);
     struct timeval timeout;
     esp_transport_utils_ms_to_timeval(timeout_ms, &timeout);
-    return select(ssl->tls->sockfd + 1, NULL, &writeset, NULL, &timeout);
+    ret = select(ssl->tls->sockfd + 1, NULL, &writeset, &errset, &timeout);
+    if (ret > 0 && FD_ISSET(ssl->tls->sockfd, &errset)) {
+        int sock_errno = 0;
+        uint32_t optlen = sizeof(sock_errno);
+        getsockopt(ssl->tls->sockfd, SOL_SOCKET, SO_ERROR, &sock_errno, &optlen);
+        ESP_LOGE(TAG, "ssl_poll_write select error %d, errno = %s, fd = %d", sock_errno, strerror(sock_errno), ssl->tls->sockfd);
+        ret = -1;
+    }
+    return ret;
 }
 
 static int ssl_write(esp_transport_handle_t t, const char *buffer, int len, int timeout_ms)

diff --git a/components/tcp_transport/transport_tcp.c b/components/tcp_transport/transport_tcp.c
index 6de1d2237907532c10b45581432400983a103a43..3fba399a05dbfb7887df3700ddcc87b2a5ebc738 100644 (file)
--- a/components/tcp_transport/transport_tcp.c
+++ b/components/tcp_transport/transport_tcp.c
@@ -77,6 +77,7 @@ static int tcp_connect(esp_transport_handle_t t, const char *host, int port, int
     esp_transport_utils_ms_to_timeval(timeout_ms, &tv);
 
     setsockopt(tcp->sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+    setsockopt(tcp->sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
 
     ESP_LOGD(TAG, "[sock=%d],connecting to server IP:%s,Port:%d...",
              tcp->sock, ipaddr_ntoa((const ip_addr_t*)&remote_ip.sin_addr.s_addr), port);
@@ -115,23 +116,47 @@ static int tcp_read(esp_transport_handle_t t, char *buffer, int len, int timeout
 static int tcp_poll_read(esp_transport_handle_t t, int timeout_ms)
 {
     transport_tcp_t *tcp = esp_transport_get_context_data(t);
+    int ret = -1;
     fd_set readset;
+    fd_set errset;
     FD_ZERO(&readset);
+    FD_ZERO(&errset);
     FD_SET(tcp->sock, &readset);
+    FD_SET(tcp->sock, &errset);
     struct timeval timeout;
     esp_transport_utils_ms_to_timeval(timeout_ms, &timeout);
-    return select(tcp->sock + 1, &readset, NULL, NULL, &timeout);
+    ret = select(tcp->sock + 1, &readset, NULL, &errset, &timeout);
+    if (ret > 0 && FD_ISSET(tcp->sock, &errset)) {
+        int sock_errno = 0;
+        uint32_t optlen = sizeof(sock_errno);
+        getsockopt(tcp->sock, SOL_SOCKET, SO_ERROR, &sock_errno, &optlen);
+        ESP_LOGE(TAG, "tcp_poll_read select error %d, errno = %s, fd = %d", sock_errno, strerror(sock_errno), tcp->sock);
+        ret = -1;
+    }
+    return ret;
 }
 
 static int tcp_poll_write(esp_transport_handle_t t, int timeout_ms)
 {
     transport_tcp_t *tcp = esp_transport_get_context_data(t);
+    int ret = -1;
     fd_set writeset;
+    fd_set errset;
     FD_ZERO(&writeset);
+    FD_ZERO(&errset);
     FD_SET(tcp->sock, &writeset);
+    FD_SET(tcp->sock, &errset);
     struct timeval timeout;
     esp_transport_utils_ms_to_timeval(timeout_ms, &timeout);
-    return select(tcp->sock + 1, NULL, &writeset, NULL, &timeout);
+    ret = select(tcp->sock + 1, NULL, &writeset, &errset, &timeout);
+    if (ret > 0 && FD_ISSET(tcp->sock, &errset)) {
+        int sock_errno = 0;
+        uint32_t optlen = sizeof(sock_errno);
+        getsockopt(tcp->sock, SOL_SOCKET, SO_ERROR, &sock_errno, &optlen);
+        ESP_LOGE(TAG, "tcp_poll_write select error %d, errno = %s, fd = %d", sock_errno, strerror(sock_errno), tcp->sock);
+        ret = -1;
+    }
+    return ret;
 }
 
 static int tcp_close(esp_transport_handle_t t)