Revert API to list updated services

This commit is contained in:
vdutta 2021-06-04 19:36:03 +05:30
parent 4231b2cfa5
commit 5ad4e94b5f
2 changed files with 4 additions and 21 deletions

View file

@ -338,22 +338,6 @@ int adm_entry_get_linker_value(struct dmctx *ctx, char *param, char **value)
return 0; return 0;
} }
int dm_entry_list_updated_services(struct blob_buf *bb)
{
struct package_change *pc = NULL;
void *arr;
if (!bb)
return 0;
arr = blobmsg_open_array(bb, "updated_services");
list_for_each_entry(pc, &head_package_change, list) {
blobmsg_add_string(bb, NULL, pc->package);
}
blobmsg_close_array(bb, arr);
return 0;
}
int dm_entry_restart_services(void) int dm_entry_restart_services(void)
{ {
struct package_change *pc = NULL; struct package_change *pc = NULL;
@ -361,10 +345,10 @@ int dm_entry_restart_services(void)
bbf_uci_commit_bbfdm(); bbf_uci_commit_bbfdm();
list_for_each_entry(pc, &head_package_change, list) { list_for_each_entry(pc, &head_package_change, list) {
// In case of cwmp proto, skip restarting services, if (strcmp(pc->package, "cwmp") == 0) {
// cwmp shall restart services on end session dmuci_init();
if (get_bbfdatamodel_type() == BBFDM_CWMP) { dmuci_commit_package("cwmp");
dmuci_commit_package(pc->package); dmuci_exit();
} else { } else {
dmubus_call_set("uci", "commit", UBUS_ARGS{{"config", pc->package, String}}, 1); dmubus_call_set("uci", "commit", UBUS_ARGS{{"config", pc->package, String}}, 1);
} }

View file

@ -29,7 +29,6 @@ int dm_ctx_init_sub(struct dmctx *ctx, unsigned int instance_mode);
int dm_entry_param_method(struct dmctx *ctx, int cmd, char *inparam, char *arg1, char *arg2); int dm_entry_param_method(struct dmctx *ctx, int cmd, char *inparam, char *arg1, char *arg2);
int dm_entry_apply(struct dmctx *ctx, int cmd, char *arg1, char *arg2); int dm_entry_apply(struct dmctx *ctx, int cmd, char *arg1, char *arg2);
int dm_entry_restart_services(void); int dm_entry_restart_services(void);
int dm_entry_list_updated_services(struct blob_buf *bb);
int dm_entry_revert_changes(void); int dm_entry_revert_changes(void);
int usp_fault_map(int fault); int usp_fault_map(int fault);
int dm_ctx_clean(struct dmctx *ctx); int dm_ctx_clean(struct dmctx *ctx);