From 7c012e3fe1edaa1dd0a791c87cf5a3295bfd94e2 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 15 Aug 2023 07:39:28 +0200 Subject: [PATCH] fix(http_client): Set common tcp config to both TCP and SSL transport Foundation transport contained TCP properties for both TCP and SSL transport, so it was enough to set the TCP connection properties (keepalive, interface binding) to one transport only. After merging 5778a7c7 we have separate TCP properties for these transports and need to set the same for both. This commit also fixes unnecessary allocation of 1 more byte for if_name Closes https://github.com/espressif/esp-protocols/issues/322 --- components/esp_http_client/esp_http_client.c | 36 ++++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/components/esp_http_client/esp_http_client.c b/components/esp_http_client/esp_http_client.c index 9ae029a623..4bbf4f5052 100644 --- a/components/esp_http_client/esp_http_client.c +++ b/components/esp_http_client/esp_http_client.c @@ -626,6 +626,25 @@ static char *_get_host_header(char *host, int port) return host_name; } +static bool init_common_tcp_transport(esp_http_client_handle_t client, const esp_http_client_config_t *config, esp_transport_handle_t transport) +{ + if (config->keep_alive_enable == true) { + client->keep_alive_cfg.keep_alive_enable = true; + client->keep_alive_cfg.keep_alive_idle = (config->keep_alive_idle == 0) ? DEFAULT_KEEP_ALIVE_IDLE : config->keep_alive_idle; + client->keep_alive_cfg.keep_alive_interval = (config->keep_alive_interval == 0) ? DEFAULT_KEEP_ALIVE_INTERVAL : config->keep_alive_interval; + client->keep_alive_cfg.keep_alive_count = (config->keep_alive_count == 0) ? DEFAULT_KEEP_ALIVE_COUNT : config->keep_alive_count; + esp_transport_tcp_set_keep_alive(transport, &client->keep_alive_cfg); + } + + if (config->if_name) { + client->if_name = calloc(1, sizeof(struct ifreq)); + ESP_RETURN_ON_FALSE(client->if_name, false, TAG, "Memory exhausted"); + memcpy(client->if_name, config->if_name, sizeof(struct ifreq)); + esp_transport_tcp_set_interface_name(transport, client->if_name); + } + return true; +} + esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *config) { @@ -664,20 +683,7 @@ esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *co goto error; } - if (config->keep_alive_enable == true) { - client->keep_alive_cfg.keep_alive_enable = true; - client->keep_alive_cfg.keep_alive_idle = (config->keep_alive_idle == 0) ? DEFAULT_KEEP_ALIVE_IDLE : config->keep_alive_idle; - client->keep_alive_cfg.keep_alive_interval = (config->keep_alive_interval == 0) ? DEFAULT_KEEP_ALIVE_INTERVAL : config->keep_alive_interval; - client->keep_alive_cfg.keep_alive_count = (config->keep_alive_count == 0) ? DEFAULT_KEEP_ALIVE_COUNT : config->keep_alive_count; - esp_transport_tcp_set_keep_alive(tcp, &client->keep_alive_cfg); - } - - if (config->if_name) { - client->if_name = calloc(1, sizeof(struct ifreq) + 1); - ESP_GOTO_ON_FALSE(client->if_name, ESP_FAIL, error, TAG, "Memory exhausted"); - memcpy(client->if_name, config->if_name, sizeof(struct ifreq)); - esp_transport_tcp_set_interface_name(tcp, client->if_name); - } + ESP_GOTO_ON_FALSE(init_common_tcp_transport(client, config, tcp), ESP_FAIL, error, TAG, "Failed to set TCP config"); #ifdef CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS esp_transport_handle_t ssl = NULL; @@ -692,6 +698,8 @@ esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *co goto error; } + ESP_GOTO_ON_FALSE(init_common_tcp_transport(client, config, ssl), ESP_FAIL, error, TAG, "Failed to set SSL config"); + if (config->crt_bundle_attach != NULL) { #ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE esp_transport_ssl_crt_bundle_attach(ssl, config->crt_bundle_attach);