espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

OTA: Fixed OTA with chunked servers

Browse Source 
If esp_http_client_read returns 0, errno check is performed if complete data is not received.
This commit is contained in:
Shubham Kulkarni
2020-01-27 17:33:36 +05:30
parent 46c8f40a83
commit 9df632482c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/esp_https_ota/src/esp_https_ota.c
View File

@@ -296,17 +296,21 @@ esp_err_t esp_https_ota_perform(esp_https_ota_handle_t https_ota_handle)
handle->ota_upgrade_buf_size); handle->ota_upgrade_buf_size);
if (data_read == 0) { if (data_read == 0) {
/* /*
* As esp_http_client_read never returns negative error code, we rely on * esp_https_ota_is_complete_data_received is added to check whether
* `errno` to check for underlying transport connectivity closure if any * complete image is received.
*/ */
if (errno == ENOTCONN || errno == ECONNRESET) { bool is_recv_complete = esp_https_ota_is_complete_data_received(https_ota_handle);
/*
* As esp_http_client_read never returns negative error code, we rely on
* `errno` to check for underlying transport connectivity closure if any.
* Incase the complete data has not been received but the server has sent
* an ENOTCONN or ECONNRESET, failure is returned. We close with success
* if complete data has been received.
*/
if ((errno == ENOTCONN || errno == ECONNRESET) && !is_recv_complete) {
ESP_LOGE(TAG, "Connection closed, errno = %d", errno); ESP_LOGE(TAG, "Connection closed, errno = %d", errno);
return ESP_FAIL; return ESP_FAIL;
} } else if (!is_recv_complete) {
/* esp_https_ota_is_complete_data_received is added to check whether
complete image is received.
*/
if (!esp_https_ota_is_complete_data_received(https_ota_handle)) {
return ESP_ERR_HTTPS_OTA_IN_PROGRESS; return ESP_ERR_HTTPS_OTA_IN_PROGRESS;
} }
ESP_LOGI(TAG, "Connection closed"); ESP_LOGI(TAG, "Connection closed");