From 5ad4e94b5f0cb3b48bbe2f0898a97682c8e174cc Mon Sep 17 00:00:00 2001 From: vdutta Date: Fri, 4 Jun 2021 19:36:03 +0530 Subject: [PATCH] Revert API to list updated services --- dmentry.c | 24 ++++-------------------- dmentry.h | 1 - 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/dmentry.c b/dmentry.c index d0a6bf61..8286f960 100644 --- a/dmentry.c +++ b/dmentry.c @@ -338,22 +338,6 @@ int adm_entry_get_linker_value(struct dmctx *ctx, char *param, char **value) 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) { struct package_change *pc = NULL; @@ -361,10 +345,10 @@ int dm_entry_restart_services(void) bbf_uci_commit_bbfdm(); list_for_each_entry(pc, &head_package_change, list) { - // In case of cwmp proto, skip restarting services, - // cwmp shall restart services on end session - if (get_bbfdatamodel_type() == BBFDM_CWMP) { - dmuci_commit_package(pc->package); + if (strcmp(pc->package, "cwmp") == 0) { + dmuci_init(); + dmuci_commit_package("cwmp"); + dmuci_exit(); } else { dmubus_call_set("uci", "commit", UBUS_ARGS{{"config", pc->package, String}}, 1); } diff --git a/dmentry.h b/dmentry.h index 6098d813..4bd2c354 100644 --- a/dmentry.h +++ b/dmentry.h @@ -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_apply(struct dmctx *ctx, int cmd, char *arg1, char *arg2); int dm_entry_restart_services(void); -int dm_entry_list_updated_services(struct blob_buf *bb); int dm_entry_revert_changes(void); int usp_fault_map(int fault); int dm_ctx_clean(struct dmctx *ctx);