Merge pull request #694 from johanstokking/fix/websocket-esp-tls-errors

david-cermak · web-flow · commit d4a004b5b476 · 2025-01-27T15:50:32.000+01:00
fix(websocket): propagate error type (IDFGH-14518)
diff --git a/components/esp_websocket_client/esp_websocket_client.c b/components/esp_websocket_client/esp_websocket_client.c
@@ -234,9 +234,9 @@ static esp_err_t esp_websocket_client_abort_connection(esp_websocket_client_hand
     } else {
         client->reconnect_tick_ms = _tick_get_ms();
         ESP_LOGI(TAG, "Reconnect after %d ms", client->wait_timeout_ms);
-        client->error_handle.error_type = error_type;
         client->state = WEBSOCKET_STATE_WAIT_TIMEOUT;
     }
+    client->error_handle.error_type = error_type;
     esp_websocket_client_dispatch_event(client, WEBSOCKET_EVENT_DISCONNECTED, NULL, 0);
     return ESP_OK;
 }

Original file line number	Diff line number	Diff line change
`@@ -234,9 +234,9 @@ static esp_err_t esp_websocket_client_abort_connection(esp_websocket_client_hand`
`234`	`234`	`} else {`
`235`	`235`	`client->reconnect_tick_ms = _tick_get_ms();`
`236`	`236`	`ESP_LOGI(TAG, "Reconnect after %d ms", client->wait_timeout_ms);`
`237`		`- client->error_handle.error_type = error_type;`
`238`	`237`	`client->state = WEBSOCKET_STATE_WAIT_TIMEOUT;`
`239`	`238`	`}`
	`239`	`+ client->error_handle.error_type = error_type;`
`240`	`240`	`esp_websocket_client_dispatch_event(client, WEBSOCKET_EVENT_DISCONNECTED, NULL, 0);`
`241`	`241`	`return ESP_OK;`
`242`	`242`	`}`