Skip to content

Commit

Permalink
fix(websocket): Return error code correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
sjames committed Oct 23, 2023
1 parent 21d987b commit fa5b466
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions components/esp_websocket_client/esp_websocket_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ int esp_websocket_client_send_fin(esp_websocket_client_handle_t client, TickType

int esp_websocket_client_send_with_opcode(esp_websocket_client_handle_t client, ws_transport_opcodes_t opcode, const uint8_t *data, int len, TickType_t timeout)
{
int error = ESP_OK;
int ret = ESP_OK;
if (client == NULL || len < 0 || (data == NULL && len > 0)) {
ESP_LOGE(TAG, "Invalid arguments");
return ESP_FAIL;
Expand All @@ -1213,28 +1213,28 @@ int esp_websocket_client_send_with_opcode(esp_websocket_client_handle_t client,

if (!esp_websocket_client_is_connected(client)) {
ESP_LOGE(TAG, "Websocket client is not connected");
error = ESP_FAIL;
ret = ESP_FAIL;
goto unlock_and_return;
}

if (client->transport == NULL) {
ESP_LOGE(TAG, "Invalid transport");
error = ESP_FAIL;
ret = ESP_FAIL;
goto unlock_and_return;
}
if (esp_websocket_new_buf(client, true) != ESP_OK) {
ESP_LOGE(TAG, "Failed to setup tx buffer");
error = ESP_FAIL;
ret = ESP_FAIL;
goto unlock_and_return;
}
if (esp_websocket_client_send_with_exact_opcode(client, opcode | WS_TRANSPORT_OPCODES_FIN, data, len, timeout) != true) {
ESP_LOGE(TAG, "Failed to send the buffer");
error = ESP_FAIL;
ret = ESP_FAIL;
goto unlock_and_return;
}
unlock_and_return:
xSemaphoreGiveRecursive(client->lock);
return error;
return ret;
}

bool esp_websocket_client_is_connected(esp_websocket_client_handle_t client)
Expand Down

0 comments on commit fa5b466

Please sign in to comment.