espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-14 11:06:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

components: Support bind socket to specified interface in esp_http_client and esp_websocket_client component

Browse Source 
* Original commit: espressif/esp-idf@bead3599ab
This commit is contained in:
yuanjm
2021-01-19 17:50:31 +08:00
committed by gabsuren
parent f0351ff378
commit 4a608ec1cd
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/esp_websocket_client/esp_websocket_client.c
View File

@ -121,6 +121,7 @@ struct esp_websocket_client {
int payload_len; int payload_len;
int payload_offset; int payload_offset;
esp_transport_keep_alive_t keep_alive_cfg; esp_transport_keep_alive_t keep_alive_cfg;
struct ifreq *if_name;
}; };
static uint64_t _tick_get_ms(void) static uint64_t _tick_get_ms(void)
@ -316,6 +317,12 @@ esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_clie
client->keep_alive_cfg.keep_alive_count = (config->keep_alive_count == 0) ? WEBSOCKET_KEEP_ALIVE_COUNT : config->keep_alive_count; client->keep_alive_cfg.keep_alive_count = (config->keep_alive_count == 0) ? WEBSOCKET_KEEP_ALIVE_COUNT : config->keep_alive_count;
} }
if (config->if_name) {
client->if_name = calloc(1, sizeof(struct ifreq) + 1);
ESP_WS_CLIENT_MEM_CHECK(TAG, client->if_name, goto _websocket_init_fail);
memcpy(client->if_name, config->if_name, sizeof(struct ifreq));
}
client->lock = xSemaphoreCreateRecursiveMutex(); client->lock = xSemaphoreCreateRecursiveMutex();
ESP_WS_CLIENT_MEM_CHECK(TAG, client->lock, goto _websocket_init_fail); ESP_WS_CLIENT_MEM_CHECK(TAG, client->lock, goto _websocket_init_fail);
@ -331,7 +338,7 @@ esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_clie
esp_transport_set_default_port(tcp, WEBSOCKET_TCP_DEFAULT_PORT); esp_transport_set_default_port(tcp, WEBSOCKET_TCP_DEFAULT_PORT);
esp_transport_list_add(client->transport_list, tcp, "_tcp"); // need to save to transport list, for cleanup esp_transport_list_add(client->transport_list, tcp, "_tcp"); // need to save to transport list, for cleanup
esp_transport_tcp_set_keep_alive(tcp, &client->keep_alive_cfg); esp_transport_tcp_set_keep_alive(tcp, &client->keep_alive_cfg);
esp_transport_tcp_set_interface_name(tcp, client->if_name);
esp_transport_handle_t ws = esp_transport_ws_init(tcp); esp_transport_handle_t ws = esp_transport_ws_init(tcp);
ESP_WS_CLIENT_MEM_CHECK(TAG, ws, goto _websocket_init_fail); ESP_WS_CLIENT_MEM_CHECK(TAG, ws, goto _websocket_init_fail);
@ -448,6 +455,9 @@ esp_err_t esp_websocket_client_destroy(esp_websocket_client_handle_t client)
if (client->event_handle) { if (client->event_handle) {
esp_event_loop_delete(client->event_handle); esp_event_loop_delete(client->event_handle);
} }
if (client->if_name) {
free(client->if_name);
}
esp_websocket_client_destroy_config(client); esp_websocket_client_destroy_config(client);
esp_transport_list_destroy(client->transport_list); esp_transport_list_destroy(client->transport_list);
vQueueDelete(client->lock); vQueueDelete(client->lock);

2
components/esp_websocket_client/include/esp_websocket_client.h
View File

@ -22,6 +22,7 @@
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "esp_err.h" #include "esp_err.h"
#include "esp_event.h" #include "esp_event.h"
#include <sys/socket.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -100,6 +101,7 @@ typedef struct {
int keep_alive_interval; /*!< Keep-alive interval time. Default is 5 (second) */ int keep_alive_interval; /*!< Keep-alive interval time. Default is 5 (second) */
int keep_alive_count; /*!< Keep-alive packet retry send count. Default is 3 counts */ int keep_alive_count; /*!< Keep-alive packet retry send count. Default is 3 counts */
size_t ping_interval_sec; /*!< Websocket ping interval, defaults to 10 seconds if not set */ size_t ping_interval_sec; /*!< Websocket ping interval, defaults to 10 seconds if not set */
struct ifreq *if_name; /*!< The name of interface for data to go through. Use the default interface without setting */
} esp_websocket_client_config_t; } esp_websocket_client_config_t;
/** /**