OrgUCloud
/
ucloud-iot-rtthread-package
mirror of https://github.com/ucloud/ucloud-iot-rtthread-package.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix add download file reconnect

This commit is contained in:
ethan.du 2020-04-26 19:59:06 +08:00
parent 8832a24b01
commit 9906a54781
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
uiot/ota/src/ota_client.c
View File

@ -321,6 +321,21 @@ int IOT_OTA_Destroy(void *handle)
return SUCCESS_RET; return SUCCESS_RET;
} }
void IOT_OTA_Clear(void *handle)
{
OTA_Struct_t *h_ota = (OTA_Struct_t *)handle;
memset(h_ota->url, 0, strlen(h_ota->url));
memset(h_ota->download_file_name, 0, strlen(h_ota->download_file_name));
memset(h_ota->version, 0, strlen(h_ota->version));
memset(h_ota->md5sum, 0, strlen(h_ota->md5sum));
h_ota->state = OTA_STATE_UNINITED;
h_ota->size_last_fetched = 0;
h_ota->size_fetched = 0;
h_ota->size_file = 0;
ota_lib_md5_deinit(h_ota->md5);
h_ota->md5 = ota_lib_md5_init();
return;
}
int IOT_OTA_ReportVersion(void *handle, const char *version) int IOT_OTA_ReportVersion(void *handle, const char *version)
{ {
@ -438,6 +453,13 @@ int IOT_OTA_FetchYield(void *handle, char *buf, size_t buf_len, size_t range_len
{ {
/* fetch fail,try again utill 5 time */ /* fetch fail,try again utill 5 time */
ret = ofc_fetch(h_ota->ch_fetch, h_ota->size_fetched ,buf, buf_len, range_len, timeout_s); ret = ofc_fetch(h_ota->ch_fetch, h_ota->size_fetched ,buf, buf_len, range_len, timeout_s);
/* range download send request too often maybe cutdown by server, need reconnect and continue to download. */
if(ret == ERR_HTTP_CONN_ERROR) {
h_ota->ch_fetch = ofc_init(h_ota->url);
ofc_connect(h_ota->ch_fetch);
h_ota->state = OTA_STATE_FETCHING;
continue;
}
if (ret < 0) { if (ret < 0) {
LOG_ERROR("Fetch firmware failed"); LOG_ERROR("Fetch firmware failed");
h_ota->state = OTA_STATE_FETCHED; h_ota->state = OTA_STATE_FETCHED;
@ -674,7 +696,7 @@ __exit:
if (buffer_read != RT_NULL) if (buffer_read != RT_NULL)
HAL_Free(buffer_read); HAL_Free(buffer_read);
IOT_OTA_Destroy(h_ota); IOT_OTA_Clear(h_ota);
return ret; return ret;
} }

8
uiot/utils/utils_httpc.c
View File

@ -46,13 +46,13 @@ static int _utils_parse_url(const char *url, char *host, char *path) {
char *fragment_ptr; char *fragment_ptr;
if (host_ptr == NULL) { if (host_ptr == NULL) {
return -1; /* URL is invalid */ return ERR_PARAM_INVALID; /* URL is invalid */
} }
host_ptr += 3; host_ptr += 3;
path_ptr = strchr(host_ptr, '/'); path_ptr = strchr(host_ptr, '/');
if (NULL == path_ptr) { if (NULL == path_ptr) {
return -2; return ERR_PARAM_INVALID;
} }
host_len = path_ptr - host_ptr; host_len = path_ptr - host_ptr;
@ -413,13 +413,13 @@ int _http_send_request(http_client_t *client, const char *url, HTTP_Request_Meth
ret = _http_send_header(client, host, path, method, size_fetched, range_len, client_data); ret = _http_send_header(client, host, path, method, size_fetched, range_len, client_data);
if (ret != 0) { if (ret != 0) {
return -2; return ERR_HTTP_CONN_ERROR;
} }
if (method == HTTP_POST || method == HTTP_PUT) { if (method == HTTP_POST || method == HTTP_PUT) {
ret = _http_send_user_data(client, client_data,timeout_ms); ret = _http_send_user_data(client, client_data,timeout_ms);
if (ret < 0) { if (ret < 0) {
ret = -3; ret = ERR_HTTP_CONN_ERROR;
} }
} }