espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_tls_timeout_v4.3' into 'release/v4.3'

Browse Source 
esp_tls: Fix issue when timeout is not explicitly given in esp_tls_cfg_t (v4.3)

See merge request espressif/esp-idf!21745
This commit is contained in:
Aditya Patwardhan
2022-12-28 15:05:13 +08:00
parent 81fb7b03ed dbedcc264d
commit 58111664f8
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/esp-tls/esp_tls.c
View File

@@ -72,6 +72,8 @@ static const char *TAG = "esp-tls";
#error "No TLS stack configured" #error "No TLS stack configured"
#endif #endif
#define ESP_TLS_DEFAULT_CONN_TIMEOUT (10) /*!< Default connection timeout in seconds */
static esp_err_t create_ssl_handle(const char *hostname, size_t hostlen, const void *cfg, esp_tls_t *tls) static esp_err_t create_ssl_handle(const char *hostname, size_t hostlen, const void *cfg, esp_tls_t *tls)
{ {
return _esp_create_ssl_handle(hostname, hostlen, cfg, tls); return _esp_create_ssl_handle(hostname, hostlen, cfg, tls);
@@ -226,18 +228,22 @@ static esp_err_t esp_tcp_connect(const char *host, int hostlen, int port, int *s
} }
if (cfg) { if (cfg) {
if (cfg->timeout_ms >= 0) { struct timeval tv = {};
struct timeval tv; if (cfg->timeout_ms > 0) {
ms_to_timeval(cfg->timeout_ms, &tv); ms_to_timeval(cfg->timeout_ms, &tv);
setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)); } else {
setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)); tv.tv_sec = ESP_TLS_DEFAULT_CONN_TIMEOUT;
if (cfg->keep_alive_cfg && cfg->keep_alive_cfg->keep_alive_enable) { tv.tv_usec = 0;
if (esp_tls_tcp_enable_keep_alive(fd, cfg->keep_alive_cfg) < 0) { }
ESP_LOGE(TAG, "Error setting keep-alive"); setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
goto err_freesocket; setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
} if (cfg->keep_alive_cfg && cfg->keep_alive_cfg->keep_alive_enable) {
if (esp_tls_tcp_enable_keep_alive(fd, cfg->keep_alive_cfg) < 0) {
ESP_LOGE(TAG, "Error setting keep-alive");
goto err_freesocket;
} }
} }
if (cfg->non_block) { if (cfg->non_block) {
int flags = fcntl(fd, F_GETFL, 0); int flags = fcntl(fd, F_GETFL, 0);
ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK); ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);