mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-01-28 01:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve error handing in firmware upgrade

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-06-27 20:10:02 +05:30
parent a19cce88d1
commit db40cb6311
2 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common.c
View file

@ -654,27 +654,27 @@ char *string_to_hex(const unsigned char *str, size_t size)
int copy_file(char *source_file, char *target_file)
{
char ch;
int ch;
FILE *source, *target;
source = fopen(source_file, "r");
size_t len = 0;
source = fopen(source_file, "rb");
if (source == NULL) {
CWMP_LOG(ERROR, "Not able to open the source file: %s\n", source_file);
return -1;
}
target = fopen(target_file, "w");
target = fopen(target_file, "wb");
if (target == NULL) {
fclose(source);
CWMP_LOG(ERROR, "Not able to open the target file: %s\n", target_file);
return -1;
}
ch = fgetc(source);
while( feof(source) != EOF) {
while((ch = fgetc(source)) != EOF) {
fputc(ch, target);
ch = fgetc(source);
len++;
}
CWMP_LOG(ERROR, "File copied successfully.\n");
CWMP_LOG(ERROR, "File copied successfully, len %zd", len);
fclose(source);
fclose(target);
return 0;

32
src/download.c
View file

@ -145,30 +145,44 @@ int download_file_in_subprocess(const char *file_path, const char *url, const ch
*/
void ubus_check_image_callback(struct ubus_request *req, int type __attribute__((unused)), struct blob_attr *msg)
{
if (msg == NULL) {
CWMP_LOG(ERROR, "download %s: msg is null");
const struct blobmsg_policy p[1] = {{ "code", BLOBMSG_TYPE_INT32 }};
struct blob_attr *tb[1] = { NULL };
int *code;
if (!req) {
CWMP_LOG(ERROR, "image_check: req is null");
return;
}
int *code = (int *)req->priv;
const struct blobmsg_policy p[2] = { { "code", BLOBMSG_TYPE_INT32 }, { "stdout", BLOBMSG_TYPE_STRING } };
struct blob_attr *tb[2] = { NULL, NULL };
blobmsg_parse(p, 2, tb, blobmsg_data(msg), blobmsg_len(msg));
*code = tb[0] ? blobmsg_get_u32(tb[0]) : 1;
code = (int *)req->priv;
if (msg == NULL) {
*code = 2;
CWMP_LOG(ERROR, "image_check: msg is null");
return;
}
if (blobmsg_parse(p, 1, tb, blobmsg_data(msg), blobmsg_len(msg)) != 0) {
*code = 3;
CWMP_LOG(ERROR, "image_check: msg parse error");
return;
}
*code = tb[0] ? blobmsg_get_u32(tb[0]) : 4;
}
int cwmp_check_image()
{
int code = 0, e;
struct blob_buf b = { 0 };
CWMP_MEMSET(&b, 0, sizeof(struct blob_buf));
blob_buf_init(&b, 0);
CWMP_LOG(INFO, "Check downloaded image ...");
e = icwmp_ubus_invoke("rpc-sys", "upgrade_test", b.head, ubus_check_image_callback, &code);
if (e != 0) {
CWMP_LOG(INFO, "rpc-sys upgrade_test ubus method failed: Ubus err code: %d", e);
code = 1;
code = 5;
}
blob_buf_free(&b);
return code;