Skip to content

fix(websocket): prevent connection abort on write timeout (IDFGH-16792) #975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabsuren wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −0
Open

fix(websocket): prevent connection abort on write timeout (IDFGH-16792) #975

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions components/esp_websocket_client/esp_websocket_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,15 @@ static int esp_websocket_client_send_with_exact_opcode(esp_websocket_client_hand
}
memcpy(client->tx_buffer, data + widx, need_write);
// send with ws specific way and specific opcode
errno = 0;
wlen = esp_transport_ws_send_raw(client->transport, opcode, (char *)client->tx_buffer, need_write,
(timeout == portMAX_DELAY) ? -1 : timeout * portTICK_PERIOD_MS);
if (wlen < 0 || (wlen == 0 && need_write != 0)) {
if (wlen == 0 && timeout != portMAX_DELAY && errno == 0) {
ret = widx;
esp_websocket_free_buf(client, true);
goto unlock_and_return;
}
ret = wlen;
esp_websocket_free_buf(client, true);
esp_tls_error_handle_t error_handle = esp_transport_get_error_handle(client->transport);
Expand Down
Loading