espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-20 05:52:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

websocket: added missing event data

Browse Source 
user_context was missing from websocket event data, added. Also added the websocket client handle to the event data.

Removed  unused event data struct.

Closes: IDF-1271


* Original commit: espressif/esp-idf@7c0e3765ec
This commit is contained in:
Marius Vikhammer
2019-12-19 17:32:14 +08:00
committed by gabsuren
parent 09453e4694
commit a6be8e2e3d
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_websocket_client/esp_websocket_client.c
View File

@ -107,6 +107,10 @@ static esp_err_t esp_websocket_client_dispatch_event(esp_websocket_client_handle
{ {
esp_err_t err; esp_err_t err;
esp_websocket_event_data_t event_data; esp_websocket_event_data_t event_data;
event_data.client = client;
event_data.user_context = client->config->user_context;
event_data.data_ptr = data; event_data.data_ptr = data;
event_data.data_len = data_len; event_data.data_len = data_len;
event_data.op_code = client->last_opcode; event_data.op_code = client->last_opcode;

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

@ -50,6 +50,8 @@ typedef struct {
const char *data_ptr; /*!< Data pointer */ const char *data_ptr; /*!< Data pointer */
int data_len; /*!< Data length */ int data_len; /*!< Data length */
uint8_t op_code; /*!< Received opcode */ uint8_t op_code; /*!< Received opcode */
esp_websocket_client_handle_t client; /*!< esp_websocket_client_handle_t context */
void *user_context; /*!< user_data context, from esp_websocket_client_config_t user_data */
} esp_websocket_event_data_t; } esp_websocket_event_data_t;
/** /**
@ -61,19 +63,6 @@ typedef enum {
WEBSOCKET_TRANSPORT_OVER_SSL, /*!< Transport over ssl */ WEBSOCKET_TRANSPORT_OVER_SSL, /*!< Transport over ssl */
} esp_websocket_transport_t; } esp_websocket_transport_t;
/**
* @brief Websocket Client events data
*/
typedef struct {
esp_websocket_event_id_t event_id; /*!< event_id, to know the cause of the event */
esp_websocket_client_handle_t client; /*!< esp_websocket_client_handle_t context */
void *user_context;/*!< user_data context, from esp_websocket_client_config_t user_data */
char *data; /*!< data of the event */
int data_len; /*!< length of data */
} esp_websocket_event_t;
typedef esp_websocket_event_t* esp_websocket_event_handle_t;
/** /**
* @brief Websocket client setup configuration * @brief Websocket client setup configuration
*/ */