blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-31 03:41:07 -04:00
Code Issues Projects Releases Wiki Activity

ws_client: fixed path config issue when ws server configured using host and path instead of uri

Browse Source 
closes https://github.com/espressif/esp-idf/issues/3892
This commit is contained in:
David Cermak 2019-08-22 21:25:20 +02:00
parent 7a05879024
commit b529c6f282
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/esp_websocket_client/esp_websocket_client.c
View File

@ -206,6 +206,18 @@ static esp_err_t esp_websocket_client_destroy_config(esp_websocket_client_handle
return ESP_OK; return ESP_OK;
} }
static void set_websocket_client_path(esp_websocket_client_handle_t client)
{
esp_transport_handle_t trans = esp_transport_list_get_transport(client->transport_list, "ws");
if (trans) {
esp_transport_ws_set_path(trans, client->config->path);
}
trans = esp_transport_list_get_transport(client->transport_list, "wss");
if (trans) {
esp_transport_ws_set_path(trans, client->config->path);
}
}
esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_client_config_t *config) esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_client_config_t *config)
{ {
esp_websocket_client_handle_t client = calloc(1, sizeof(struct esp_websocket_client)); esp_websocket_client_handle_t client = calloc(1, sizeof(struct esp_websocket_client));
@ -285,6 +297,10 @@ esp_websocket_client_handle_t esp_websocket_client_init(const esp_websocket_clie
ESP_WS_CLIENT_MEM_CHECK(TAG, client->config->scheme, goto _websocket_init_fail); ESP_WS_CLIENT_MEM_CHECK(TAG, client->config->scheme, goto _websocket_init_fail);
} }
if (client->config->path) {
set_websocket_client_path(client);
}
client->keepalive_tick_ms = _tick_get_ms(); client->keepalive_tick_ms = _tick_get_ms();
client->reconnect_tick_ms = _tick_get_ms(); client->reconnect_tick_ms = _tick_get_ms();
client->ping_tick_ms = _tick_get_ms(); client->ping_tick_ms = _tick_get_ms();
@ -374,15 +390,7 @@ esp_err_t esp_websocket_client_set_uri(esp_websocket_client_handle_t client, con
puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off); puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off);
} }
ESP_WS_CLIENT_MEM_CHECK(TAG, client->config->path, return ESP_ERR_NO_MEM); ESP_WS_CLIENT_MEM_CHECK(TAG, client->config->path, return ESP_ERR_NO_MEM);
set_websocket_client_path(client);
esp_transport_handle_t trans = esp_transport_list_get_transport(client->transport_list, "ws");
if (trans) {
esp_transport_ws_set_path(trans, client->config->path);
}
trans = esp_transport_list_get_transport(client->transport_list, "wss");
if (trans) {
esp_transport_ws_set_path(trans, client->config->path);
}
} }
if (puri.field_data[UF_PORT].off) { if (puri.field_data[UF_PORT].off) {
client->config->port = strtol((const char*)(uri + puri.field_data[UF_PORT].off), NULL, 10); client->config->port = strtol((const char*)(uri + puri.field_data[UF_PORT].off), NULL, 10);