feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

feat(ws_transport): include error reason in failure log

Browse Source 
When the underlying transport returns a failure,
add the failure result to the log.
This commit is contained in:
Richard Allen
2024-10-30 08:49:38 -05:00
committed by glmfe
parent ccd99874a7
commit 5362a03eac
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/tcp_transport/transport_ws.c
View File

@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -362,7 +362,7 @@ static int _ws_write(esp_transport_handle_t t, int opcode, int mask_flag, const
int poll_write;
if ((poll_write = esp_transport_poll_write(ws->parent, timeout_ms)) <= 0) {
ESP_LOGE(TAG, "Error transport_poll_write");
ESP_LOGE(TAG, "Error transport_poll_write(%d)", poll_write);
return poll_write;
}
ws_header[header_len++] = opcode;
@@ -461,7 +461,7 @@ static int ws_read_payload(esp_transport_handle_t t, char *buffer, int len, int
// Receive and process payload
if (bytes_to_read != 0 && (rlen = esp_transport_read_internal(ws, buffer, bytes_to_read, timeout_ms)) <= 0) {
ESP_LOGE(TAG, "Error read data");
ESP_LOGE(TAG, "Error read data(%d)", rlen);
return rlen;
}
ws->frame_state.bytes_remaining -= rlen;
@@ -520,7 +520,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
int header = 2;
int mask_len = 4;
if ((rlen = esp_transport_read_exact_size(ws, data_ptr, header, timeout_ms)) <= 0) {
ESP_LOGE(TAG, "Error read data");
ESP_LOGE(TAG, "Error read data(%d)", rlen);
return rlen;
}
ws->frame_state.header_received = true;
@@ -534,7 +534,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
if (payload_len == 126) {
// headerLen += 2;
if ((rlen = esp_transport_read_exact_size(ws, data_ptr, header, timeout_ms)) <= 0) {
ESP_LOGE(TAG, "Error read data");
ESP_LOGE(TAG, "Error read data(%d)", rlen);
return rlen;
}
payload_len = (uint8_t)data_ptr[0] << 8 | (uint8_t)data_ptr[1];
@@ -542,7 +542,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
// headerLen += 8;
header = 8;
if ((rlen = esp_transport_read_exact_size(ws, data_ptr, header, timeout_ms)) <= 0) {
ESP_LOGE(TAG, "Error read data");
ESP_LOGE(TAG, "Error read data(%d)", rlen);
return rlen;
}
@@ -557,7 +557,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
if (mask) {
// Read and store mask
if (payload_len != 0 && (rlen = esp_transport_read_exact_size(ws, buffer, mask_len, timeout_ms)) <= 0) {
ESP_LOGE(TAG, "Error read data");
ESP_LOGE(TAG, "Error read data(%d)", rlen);
return rlen;
}
memcpy(ws->frame_state.mask_key, buffer, mask_len);
@@ -652,7 +652,7 @@ static int ws_read(esp_transport_handle_t t, char *buffer, int len, int timeout_
if (ws->frame_state.payload_len) {
if ( (rlen = ws_read_payload(t, buffer, len, timeout_ms)) <= 0) {
ESP_LOGE(TAG, "Error reading payload data");
ESP_LOGE(TAG, "Error reading payload data(%d)", rlen);
ws->frame_state.bytes_remaining = 0;
return rlen;
}