feat(tls): Modify tls component for building

Author: ESP-YJM

components/esp-tls/esp_tls.c

@@ -249,8 +249,8 @@ static int esp_tls_low_level_conn(const char *hostname, int hostlen, int port, c
             return -1;
         }
         if (!cfg) {
-            tls->read = tcp_read;
-            tls->write = tcp_write;
+            tls->_read = tcp_read;
+            tls->_write = tcp_write;
             ESP_LOGD(TAG, "non-tls connection established");
             return 1;
         }
@@ -295,8 +295,8 @@ static int esp_tls_low_level_conn(const char *hostname, int hostlen, int port, c
             tls->conn_state = ESP_TLS_FAIL;
             return -1;
         }
-        tls->read = _esp_tls_read;
-        tls->write = _esp_tls_write;
+        tls->_read = _esp_tls_read;
+        tls->_write = _esp_tls_write;
         tls->conn_state = ESP_TLS_HANDSHAKE;
     /* falls through */
     case ESP_TLS_HANDSHAKE:

components/esp-tls/esp_tls.h

@@ -297,10 +297,10 @@ typedef struct esp_tls {
 #endif
     int sockfd;                                                                 /*!< Underlying socket file descriptor. */
 
-    ssize_t (*read)(struct esp_tls  *tls, char *data, size_t datalen);          /*!< Callback function for reading data from TLS/SSL
+    ssize_t (*_read)(struct esp_tls  *tls, char *data, size_t datalen);          /*!< Callback function for reading data from TLS/SSL
                                                                                      connection. */
 
-    ssize_t (*write)(struct esp_tls *tls, const char *data, size_t datalen);    /*!< Callback function for writing data to TLS/SSL
+    ssize_t (*_write)(struct esp_tls *tls, const char *data, size_t datalen);    /*!< Callback function for writing data to TLS/SSL
                                                                                      connection. */
 
     esp_tls_conn_state_t  conn_state;                                           /*!< ESP-TLS Connection state */
@@ -442,7 +442,7 @@ int esp_tls_conn_http_new_async(const char *url, const esp_tls_cfg_t *cfg, esp_t
  */
 static inline ssize_t esp_tls_conn_write(esp_tls_t *tls, const void *data, size_t datalen)
 {
-    return tls->write(tls, (char *)data, datalen);
+    return tls->_write(tls, (char *)data, datalen);
 }
 
 /**
@@ -462,7 +462,7 @@ static inline ssize_t esp_tls_conn_write(esp_tls_t *tls, const void *data, size_
  */
 static inline ssize_t esp_tls_conn_read(esp_tls_t *tls, void  *data, size_t datalen)
 {
-    return tls->read(tls, (char *)data, datalen);
+    return tls->_read(tls, (char *)data, datalen);
 }
 
 /**

components/esp-tls/esp_tls_mbedtls.c

@@ -489,8 +489,8 @@ int esp_mbedtls_server_session_create(esp_tls_cfg_server_t *cfg, int sockfd, esp
         tls->conn_state = ESP_TLS_FAIL;
         return -1;
     }
-    tls->read = esp_mbedtls_read;
-    tls->write = esp_mbedtls_write;
+    tls->_read = esp_mbedtls_read;
+    tls->_write = esp_mbedtls_write;
     int ret;
     while ((ret = mbedtls_ssl_handshake(&tls->ssl)) != 0) {
         if (ret != ESP_TLS_ERR_SSL_WANT_READ && ret != ESP_TLS_ERR_SSL_WANT_WRITE) {

components/esp-tls/esp_tls_wolfssl.c

@@ -231,6 +231,7 @@ static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls
     }
 
     if (!cfg->skip_common_name) {
+#ifdef HAVE_SNI
         char *use_host = NULL;
         if (cfg->common_name != NULL) {
             use_host = strdup(cfg->common_name);
@@ -248,6 +249,7 @@ static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls
             return ESP_ERR_WOLFSSL_SSL_SET_HOSTNAME_FAILED;
         }
         free(use_host);
+#endif /* HAVE_SNI */
     }
 
     if (cfg->alpn_protos) {
@@ -438,8 +440,8 @@ int esp_wolfssl_server_session_create(esp_tls_cfg_server_t *cfg, int sockfd, esp
         tls->conn_state = ESP_TLS_FAIL;
         return -1;
     }
-    tls->read = esp_wolfssl_read;
-    tls->write = esp_wolfssl_write;
+    tls->_read = esp_wolfssl_read;
+    tls->_write = esp_wolfssl_write;
     int ret;
     while ((ret = wolfSSL_accept((WOLFSSL *)tls->priv_ssl)) != WOLFSSL_SUCCESS) {
         if (ret != ESP_TLS_ERR_SSL_WANT_READ && ret != ESP_TLS_ERR_SSL_WANT_WRITE) {

components/lwip/lwip/src/include/posix/sys/socket.h

@@ -33,7 +33,8 @@
 #include "sdkconfig.h"
 
 #include "lwip/sockets.h"
-
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
 #if !LWIP_POSIX_SOCKETS_IO_NAMES
 #include <unistd.h>
 #include <fcntl.h>