Skip to content

Commit 5362a03

Browse files
bryghtlabs-richardglmfe
authored andcommitted
feat(ws_transport): include error reason in failure log
When the underlying transport returns a failure, add the failure result to the log.
1 parent ccd9987 commit 5362a03

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

components/tcp_transport/transport_ws.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -362,7 +362,7 @@ static int _ws_write(esp_transport_handle_t t, int opcode, int mask_flag, const
362362

363363
int poll_write;
364364
if ((poll_write = esp_transport_poll_write(ws->parent, timeout_ms)) <= 0) {
365-
ESP_LOGE(TAG, "Error transport_poll_write");
365+
ESP_LOGE(TAG, "Error transport_poll_write(%d)", poll_write);
366366
return poll_write;
367367
}
368368
ws_header[header_len++] = opcode;
@@ -461,7 +461,7 @@ static int ws_read_payload(esp_transport_handle_t t, char *buffer, int len, int
461461

462462
// Receive and process payload
463463
if (bytes_to_read != 0 && (rlen = esp_transport_read_internal(ws, buffer, bytes_to_read, timeout_ms)) <= 0) {
464-
ESP_LOGE(TAG, "Error read data");
464+
ESP_LOGE(TAG, "Error read data(%d)", rlen);
465465
return rlen;
466466
}
467467
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
520520
int header = 2;
521521
int mask_len = 4;
522522
if ((rlen = esp_transport_read_exact_size(ws, data_ptr, header, timeout_ms)) <= 0) {
523-
ESP_LOGE(TAG, "Error read data");
523+
ESP_LOGE(TAG, "Error read data(%d)", rlen);
524524
return rlen;
525525
}
526526
ws->frame_state.header_received = true;
@@ -534,15 +534,15 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
534534
if (payload_len == 126) {
535535
// headerLen += 2;
536536
if ((rlen = esp_transport_read_exact_size(ws, data_ptr, header, timeout_ms)) <= 0) {
537-
ESP_LOGE(TAG, "Error read data");
537+
ESP_LOGE(TAG, "Error read data(%d)", rlen);
538538
return rlen;
539539
}
540540
payload_len = (uint8_t)data_ptr[0] << 8 | (uint8_t)data_ptr[1];
541541
} else if (payload_len == 127) {
542542
// headerLen += 8;
543543
header = 8;
544544
if ((rlen = esp_transport_read_exact_size(ws, data_ptr, header, timeout_ms)) <= 0) {
545-
ESP_LOGE(TAG, "Error read data");
545+
ESP_LOGE(TAG, "Error read data(%d)", rlen);
546546
return rlen;
547547
}
548548

@@ -557,7 +557,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t
557557
if (mask) {
558558
// Read and store mask
559559
if (payload_len != 0 && (rlen = esp_transport_read_exact_size(ws, buffer, mask_len, timeout_ms)) <= 0) {
560-
ESP_LOGE(TAG, "Error read data");
560+
ESP_LOGE(TAG, "Error read data(%d)", rlen);
561561
return rlen;
562562
}
563563
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_
652652

653653
if (ws->frame_state.payload_len) {
654654
if ( (rlen = ws_read_payload(t, buffer, len, timeout_ms)) <= 0) {
655-
ESP_LOGE(TAG, "Error reading payload data");
655+
ESP_LOGE(TAG, "Error reading payload data(%d)", rlen);
656656
ws->frame_state.bytes_remaining = 0;
657657
return rlen;
658658
}

0 commit comments

Comments
 (0)