espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/add_check_for_range_request_supported_by_server_during_ota_resumption' into 'master'

Browse Source 
fix(esp_https_ota): added a check if range request is supported during OTA resumption is enabled

Closes IDFGH-16894

See merge request espressif/esp-idf!44090
This commit is contained in:
Mahavir Jain
2026-02-10 17:53:04 +05:30
parent 5b5ee24f1f ba308b6d76
commit c60f19c299
4 changed files with 129 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_https_ota/src/esp_https_ota.c
+22 -8
View File
@@ -59,6 +59,7 @@ struct esp_https_ota_handle {
#endif
esp_https_ota_state state;
bool bulk_flash_erase;
bool ota_resumption;
int max_authorization_retries;
#if CONFIG_ESP_HTTPS_OTA_DECRYPT_CB
decrypt_cb_t decrypt_cb;
@@ -135,6 +136,14 @@ static esp_err_t _http_handle_response_code(esp_https_ota_t *https_ota_handle, i
} else if (status_code >= HttpStatus_InternalError) {
ESP_LOGE(TAG, "Server error (%d)", status_code);
return ESP_FAIL;
} else if (https_ota_handle->ota_resumption
#if CONFIG_ESP_HTTPS_OTA_ENABLE_PARTIAL_DOWNLOAD
&& !https_ota_handle->partial_http_download
#endif
&& status_code != HttpStatus_PartialContent) {
ESP_LOGW(TAG, "Server ignored the requested Range header");
ESP_LOGW(TAG, "OTA resumption requires server with range request support.");
return ESP_ERR_HTTP_RANGE_NOT_SATISFIABLE;
}
char upgrade_data_buf[256];
@@ -338,6 +347,7 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
https_ota_handle->partial_http_download = ota_config->partial_http_download;
https_ota_handle->max_http_request_size = (ota_config->max_http_request_size == 0) ? DEFAULT_REQUEST_SIZE : ota_config->max_http_request_size;
#endif
https_ota_handle->ota_resumption = ota_config->ota_resumption;
https_ota_handle->max_authorization_retries = ota_config->http_config->max_authorization_retries;
if (https_ota_handle->max_authorization_retries == 0) {
@@ -372,12 +382,13 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
}
/*
* If OTA resumption is enabled, set the "Range" header to resume downloading the OTA image
* from the last written byte. For non-partial cases, the range pattern is 'from-'.
* Partial cases ('from-to') are handled separately below based on the remaining data to
* be downloaded and the max_http_request_size.
* If OTA resumption is enabled, always make a range request first to detect if server
* supports range requests. This helps fail early if server doesn't support range requests.
* - If resuming from NVS recovered offset: use 'bytes=offset-'
* - If starting fresh: use 'bytes=0-'
* This applies to both partial and non-partial download cases.
*/
if (https_ota_handle->binary_file_len > 0
if (https_ota_handle->ota_resumption
#if CONFIG_ESP_HTTPS_OTA_ENABLE_PARTIAL_DOWNLOAD
&& !https_ota_handle->partial_http_download
#endif
@@ -469,9 +480,10 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
#endif
err = _http_connect(https_ota_handle);
if (err == ESP_ERR_HTTP_RANGE_NOT_SATISFIABLE && https_ota_handle->binary_file_len > 0) {
ESP_LOGE(TAG, "OTA resumption failed with err: %d", err);
ESP_LOGI(TAG, "Restarting download from beginning");
if (err == ESP_ERR_HTTP_RANGE_NOT_SATISFIABLE && https_ota_handle->ota_resumption) {
ESP_LOGE(TAG, "OTA resumption failed with err: %d.", err);
ESP_LOGI(TAG, "Falling back to OTA without resumption and restarting download from beginning");
https_ota_handle->ota_resumption = false;
https_ota_handle->binary_file_len = 0;
// If range in request header is not satisfiable, restart download from beginning
@@ -490,6 +502,8 @@ esp_err_t esp_https_ota_begin(const esp_https_ota_config_t *ota_config, esp_http
free(header_val);
}
#endif
esp_http_client_close(https_ota_handle->http_client);
esp_http_client_clear_response_buffer(https_ota_handle->http_client);
err = _http_connect(https_ota_handle);
}