alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/esp_tls_closing_fd0' into 'master'

Browse Source 
esp_tls: fix incorrect closing of fd 0 on connection failure

See merge request idf/esp-idf!4726
This commit is contained in:
Ivan Grokhotkov 2019-04-17 15:10:20 +08:00
commit 92989b5718
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,6 @@ static int esp_tcp_connect(const char *host, int hostlen, int port, int *sockfd,
ESP_LOGE(TAG, "Failed to create socket (family %d socktype %d protocol %d)", res->ai_family, res->ai_socktype, res->ai_protocol); ESP_LOGE(TAG, "Failed to create socket (family %d socktype %d protocol %d)", res->ai_family, res->ai_socktype, res->ai_protocol);
goto err_freeaddr; goto err_freeaddr;
} }
*sockfd = fd;
void *addr_ptr; void *addr_ptr;
if (res->ai_family == AF_INET) { if (res->ai_family == AF_INET) {
@ -125,12 +124,13 @@ static int esp_tcp_connect(const char *host, int hostlen, int port, int *sockfd,
} }
ret = connect(fd, addr_ptr, res->ai_addrlen); ret = connect(fd, addr_ptr, res->ai_addrlen);
if (ret < 0 && !(errno == EINPROGRESS && cfg->non_block)) { if (ret < 0 && !(errno == EINPROGRESS && cfg && cfg->non_block)) {
ESP_LOGE(TAG, "Failed to connnect to host (errno %d)", errno); ESP_LOGE(TAG, "Failed to connect to host (errno %d)", errno);
goto err_freesocket; goto err_freesocket;
} }
*sockfd = fd;
freeaddrinfo(res); freeaddrinfo(res);
return 0; return 0;
@ -222,14 +222,12 @@ static void mbedtls_cleanup(esp_tls_t *tls)
mbedtls_ssl_config_free(&tls->conf); mbedtls_ssl_config_free(&tls->conf);
mbedtls_ctr_drbg_free(&tls->ctr_drbg); mbedtls_ctr_drbg_free(&tls->ctr_drbg);
mbedtls_ssl_free(&tls->ssl); mbedtls_ssl_free(&tls->ssl);
mbedtls_net_free(&tls->server_fd);
} }
static int create_ssl_handle(esp_tls_t *tls, const char *hostname, size_t hostlen, const esp_tls_cfg_t *cfg) static int create_ssl_handle(esp_tls_t *tls, const char *hostname, size_t hostlen, const esp_tls_cfg_t *cfg)
{ {
int ret; int ret;
mbedtls_net_init(&tls->server_fd);
tls->server_fd.fd = tls->sockfd; tls->server_fd.fd = tls->sockfd;
mbedtls_ssl_init(&tls->ssl); mbedtls_ssl_init(&tls->ssl);
mbedtls_ctr_drbg_init(&tls->ctr_drbg); mbedtls_ctr_drbg_init(&tls->ctr_drbg);
@ -343,7 +341,9 @@ void esp_tls_conn_delete(esp_tls_t *tls)
{ {
if (tls != NULL) { if (tls != NULL) {
mbedtls_cleanup(tls); mbedtls_cleanup(tls);
if (tls->sockfd) { if (tls->is_tls) {
mbedtls_net_free(&tls->server_fd);
} else if (tls->sockfd >= 0) {
close(tls->sockfd); close(tls->sockfd);
} }
free(tls); free(tls);
@ -376,13 +376,15 @@ static int esp_tls_low_level_conn(const char *hostname, int hostlen, int port, c
and in case of blocking connect these cases will get executed one after the other */ and in case of blocking connect these cases will get executed one after the other */
switch (tls->conn_state) { switch (tls->conn_state) {
case ESP_TLS_INIT: case ESP_TLS_INIT:
; tls->sockfd = -1;
int sockfd; if (cfg != NULL) {
int ret = esp_tcp_connect(hostname, hostlen, port, &sockfd, cfg); mbedtls_net_init(&tls->server_fd);
tls->is_tls = true;
}
int ret = esp_tcp_connect(hostname, hostlen, port, &tls->sockfd, cfg);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }
tls->sockfd = sockfd;
if (!cfg) { if (!cfg) {
tls->read = tcp_read; tls->read = tcp_read;
tls->write = tcp_write; tls->write = tcp_write;

2
components/esp-tls/esp_tls.h
View File

@ -126,6 +126,8 @@ typedef struct esp_tls {
fd_set rset; /*!< read file descriptors */ fd_set rset; /*!< read file descriptors */
fd_set wset; /*!< write file descriptors */ fd_set wset; /*!< write file descriptors */
bool is_tls; /*!< indicates connection type (TLS or NON-TLS) */
} esp_tls_t; } esp_tls_t;
/** /**