From 0abd1cb51f0a346adcda932e25182692b1f642e1 Mon Sep 17 00:00:00 2001 From: "Mark H. Spatz" Date: Fri, 10 Mar 2023 21:39:02 -0500 Subject: [PATCH] [esp-tls] Add addr_family option to esp_tls_cfg_t --- components/esp-tls/esp_tls.c | 18 +++++++++++++++--- components/esp-tls/esp_tls.h | 11 +++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/components/esp-tls/esp_tls.c b/components/esp-tls/esp_tls.c index 428bdd68f4b..3462cf3e3c3 100644 --- a/components/esp-tls/esp_tls.c +++ b/components/esp-tls/esp_tls.c @@ -141,12 +141,24 @@ esp_tls_t *esp_tls_init(void) return tls; } -static esp_err_t esp_tls_hostname_to_fd(const char *host, size_t hostlen, int port, struct sockaddr_storage *address, int* fd) +static esp_err_t esp_tls_hostname_to_fd(const char *host, size_t hostlen, int port, esp_tls_addr_family_t addr_family, struct sockaddr_storage *address, int* fd) { struct addrinfo *address_info; struct addrinfo hints; memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; + + switch(addr_family) { + case ESP_TLS_AF_INET: + hints.ai_family = AF_INET; + break; + case ESP_TLS_AF_INET6: + hints.ai_family = AF_INET6; + break; + default: + hints.ai_family = AF_UNSPEC; + break; + } + hints.ai_socktype = SOCK_STREAM; char *use_host = strndup(host, hostlen); @@ -283,7 +295,7 @@ static inline esp_err_t tcp_connect(const char *host, int hostlen, int port, con { struct sockaddr_storage address; int fd; - esp_err_t ret = esp_tls_hostname_to_fd(host, hostlen, port, &address, &fd); + esp_err_t ret = esp_tls_hostname_to_fd(host, hostlen, port, cfg->addr_family, &address, &fd); if (ret != ESP_OK) { ESP_INT_EVENT_TRACKER_CAPTURE(error_handle, ESP_TLS_ERR_TYPE_SYSTEM, errno); return ret; diff --git a/components/esp-tls/esp_tls.h b/components/esp-tls/esp_tls.h index 07c1c8089db..4396a98ef0d 100644 --- a/components/esp-tls/esp_tls.h +++ b/components/esp-tls/esp_tls.h @@ -69,6 +69,15 @@ typedef struct tls_keep_alive_cfg { int keep_alive_count; /*!< Keep-alive packet retry send count */ } tls_keep_alive_cfg_t; +/* +* @brief ESP-TLS Address families +*/ +typedef enum esp_tls_addr_family { + ESP_TLS_AF_UNSPEC = 0, /**< Unspecified address family. */ + ESP_TLS_AF_INET, /**< IPv4 address family. */ + ESP_TLS_AF_INET6, /**< IPv6 address family. */ +} esp_tls_addr_family_t; + /** * @brief ESP-TLS configuration parameters * @@ -180,6 +189,8 @@ typedef struct esp_tls_cfg { #ifdef CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS esp_tls_client_session_t *client_session; /*! Pointer for the client session ticket context. */ #endif /* CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS */ + + esp_tls_addr_family_t addr_family; /*!< The address family to use when connecting to a host. */ } esp_tls_cfg_t; #ifdef CONFIG_ESP_TLS_SERVER