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

Merge branch 'bugfix/fix_esp_http_client_host_test_failures' into 'master'

Browse Source 
esp-tls: Fix esp-tls component to resolve esp_http_client example failure for Linux target.

Closes IDFCI-1646 and IDFCI-1647

See merge request espressif/esp-idf!22584
This commit is contained in:
Aditya Patwardhan
2023-03-09 15:46:00 +08:00
parent 47852846d3 866e6b0d6b
commit 38b036e9ae
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@
#include <netdb.h> #include <netdb.h>
#include <http_parser.h> #include <http_parser.h>
#include "sdkconfig.h"
#include "esp_tls.h" #include "esp_tls.h"
#include "esp_tls_private.h" #include "esp_tls_private.h"
#include "esp_tls_error_capture_internal.h" #include "esp_tls_error_capture_internal.h"
@@ -25,8 +26,16 @@
#include <linux/if.h> #include <linux/if.h>
#include <sys/time.h> #include <sys/time.h>
#define ipaddr_ntoa(ipaddr) inet_ntoa(*ipaddr)
typedef struct in_addr ip_addr_t; typedef struct in_addr ip_addr_t;
typedef struct in6_addr ip6_addr_t;
#define ipaddr_ntoa(ipaddr) inet_ntoa(*ipaddr)
static inline char *ip6addr_ntoa(const ip6_addr_t *addr)
{
static char str[40];
return (char *)inet_ntop(AF_INET6, addr->s6_addr, str, 40);
}
#endif #endif
static const char *TAG = "esp-tls"; static const char *TAG = "esp-tls";
@@ -85,6 +94,14 @@ static const char *TAG = "esp-tls";
#error "No TLS stack configured" #error "No TLS stack configured"
#endif #endif
#if CONFIG_IDF_TARGET_LINUX
#define IPV4_ENABLED 1
#define IPV6_ENABLED 1
#else // CONFIG_IDF_TARGET_LINUX
#define IPV4_ENABLED CONFIG_LWIP_IPV4
#define IPV6_ENABLED CONFIG_LWIP_IPV6
#endif // !CONFIG_IDF_TARGET_LINUX
#define ESP_TLS_DEFAULT_CONN_TIMEOUT (10) /*!< Default connection timeout in seconds */ #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)
@@ -182,7 +199,7 @@ static esp_err_t esp_tls_hostname_to_fd(const char *host, size_t hostlen, int po
return ESP_ERR_ESP_TLS_CANNOT_CREATE_SOCKET; return ESP_ERR_ESP_TLS_CANNOT_CREATE_SOCKET;
} }
#if CONFIG_LWIP_IPV4 #if IPV4_ENABLED
if (address_info->ai_family == AF_INET) { if (address_info->ai_family == AF_INET) {
struct sockaddr_in *p = (struct sockaddr_in *)address_info->ai_addr; struct sockaddr_in *p = (struct sockaddr_in *)address_info->ai_addr;
p->sin_port = htons(port); p->sin_port = htons(port);
@@ -191,11 +208,11 @@ static esp_err_t esp_tls_hostname_to_fd(const char *host, size_t hostlen, int po
} }
#endif #endif
#if defined(CONFIG_LWIP_IPV4) && defined(CONFIG_LWIP_IPV6) #if IPV4_ENABLED && IPV6_ENABLED
else else
#endif #endif
#if CONFIG_LWIP_IPV6 #if IPV6_ENABLED
if (address_info->ai_family == AF_INET6) { if (address_info->ai_family == AF_INET6) {
struct sockaddr_in6 *p = (struct sockaddr_in6 *)address_info->ai_addr; struct sockaddr_in6 *p = (struct sockaddr_in6 *)address_info->ai_addr;
p->sin6_port = htons(port); p->sin6_port = htons(port);