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

esp-tls: Separate timeout_ms conditional judgement from keep alive

Browse Source
This commit is contained in:
yuanjm
2021-02-19 19:38:50 +08:00
committed by bot
parent a412eb867c
commit f68e55edb3
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,16 +196,18 @@ static void ms_to_timeval(int timeout_ms, struct timeval *tv)
static esp_err_t esp_tls_set_socket_options(int fd, const esp_tls_cfg_t *cfg) static esp_err_t esp_tls_set_socket_options(int fd, const esp_tls_cfg_t *cfg)
{ {
if (cfg && cfg->timeout_ms >= 0) { if (cfg) {
struct timeval tv; if (cfg->timeout_ms >= 0) {
ms_to_timeval(cfg->timeout_ms, &tv); struct timeval tv;
if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) != 0) { ms_to_timeval(cfg->timeout_ms, &tv);
ESP_LOGE(TAG, "Fail to setsockopt SO_RCVTIMEO"); if (setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) != 0) {
return ESP_ERR_ESP_TLS_SOCKET_SETOPT_FAILED; ESP_LOGE(TAG, "Fail to setsockopt SO_RCVTIMEO");
} return ESP_ERR_ESP_TLS_SOCKET_SETOPT_FAILED;
if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) != 0) { }
ESP_LOGE(TAG, "Fail to setsockopt SO_SNDTIMEO"); if (setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) != 0) {
return ESP_ERR_ESP_TLS_SOCKET_SETOPT_FAILED; ESP_LOGE(TAG, "Fail to setsockopt SO_SNDTIMEO");
return ESP_ERR_ESP_TLS_SOCKET_SETOPT_FAILED;
}
} }
if (cfg->keep_alive_cfg && cfg->keep_alive_cfg->keep_alive_enable) { if (cfg->keep_alive_cfg && cfg->keep_alive_cfg->keep_alive_enable) {
int keep_alive_enable = 1; int keep_alive_enable = 1;