mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-02-17 17:51:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Stage var state uci"

Browse source 
This reverts commit 2ea9a2e311.
This commit is contained in:
Omar Kallel 2021-11-09 16:49:22 +01:00
parent 2ea9a2e311
commit dc642082f9
3 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dmentry.c
View file

@ -267,7 +267,7 @@ int dm_entry_param_method(struct dmctx *ctx, int cmd, char *inparam, char *arg1,
fault = dm_entry_add_object(ctx);
if (!fault) {
dmuci_set_value_varstate("cwmp", "cpe", "ParameterKey", arg1 ? arg1 : "");
dmuci_save_package_varstate("cwmp");
dmuci_commit_package_varstate("cwmp");
dmuci_change_packages(&head_package_change);
}
break;
@ -275,7 +275,7 @@ int dm_entry_param_method(struct dmctx *ctx, int cmd, char *inparam, char *arg1,
fault = dm_entry_delete_object(ctx);
if (!fault) {
dmuci_set_value_varstate("cwmp", "cpe", "ParameterKey", arg1 ? arg1 : "");
dmuci_save_package_varstate("cwmp");
dmuci_commit_package_varstate("cwmp");
dmuci_change_packages(&head_package_change);
}
break;
@ -308,12 +308,10 @@ int dm_entry_apply(struct dmctx *ctx, int cmd, char *arg1)
{
struct set_tmp *n = NULL, *p = NULL;
int fault = 0;
bool set_success = false;
switch(cmd) {
case CMD_SET_VALUE:
ctx->setaction = VALUESET;
set_success = false;
list_for_each_entry_safe(n, p, &ctx->set_list_tmp, list) {
ctx->in_param = n->name;
ctx->in_value = n->value ? n->value : "";
@ -323,11 +321,10 @@ int dm_entry_apply(struct dmctx *ctx, int cmd, char *arg1)
add_list_fault_param(ctx, ctx->in_param, usp_fault_map(fault));
break;
}
set_success = true;
}
if (!fault && set_success == true) {
if (!fault) {
dmuci_set_value_varstate("cwmp", "cpe", "ParameterKey", arg1 ? arg1 : "");
dmuci_save_package_varstate("cwmp");
dmuci_commit_package_varstate("cwmp");
dmuci_change_packages(&head_package_change);
dmuci_save();
}
@ -410,8 +407,6 @@ int dm_entry_restart_services(void)
dmubus_call_set("uci", "commit", UBUS_ARGS{{"config", pc->package, String}}, 1);
}
}
dmuci_commit_package_varstate("cwmp");
free_all_list_package_change(&head_package_change);
return 0;
@ -426,7 +421,6 @@ int dm_entry_revert_changes(void)
list_for_each_entry(pc, &head_package_change, list) {
dmubus_call_set("uci", "revert", UBUS_ARGS{{"config", pc->package, String}}, 1);
}
dmuci_revert_package_varstate("cwmp");
free_all_list_package_change(&head_package_change);
return 0;

2
libbbf_api/dmuci.c
View file

@ -20,7 +20,7 @@ static struct uci_context *uci_ctx = NULL;
static char *db_config = NULL;
NEW_UCI_PATH(bbfdm, BBFDM_CONFIG, BBFDM_SAVEDIR)
NEW_UCI_PATH(varstate, VARSTATE_CONFDIR, VARSTATE_SAVEDIR)
NEW_UCI_PATH(varstate, VARSTATE_CONFDIR, NULL)
int dmuci_init(void)
{

12
libbbf_api/dmuci.h
View file

@ -31,7 +31,6 @@
#define BBFDM_SAVEDIR "/tmp/.bbfdm"
#define UCI_CONFIG_DIR "/etc/config/"
#define VARSTATE_CONFDIR "/var/state/"
#define VARSTATE_SAVEDIR "/tmp/.bbfdm_var"
enum dm_uci_cmp {
CMP_SECTION,
@ -308,15 +307,6 @@ int dmuci_save_package_##UCI_PATH(char *package) \
uci_ctx = save_uci_ctx; \
return res; \
}\
int dmuci_revert_package_##UCI_PATH(char *package) \
{\
struct uci_context *save_uci_ctx; \
save_uci_ctx = uci_ctx; \
uci_ctx = uci_ctx_##UCI_PATH; \
int res = dmuci_revert_package(package); \
uci_ctx = save_uci_ctx; \
return res; \
}\
int dmuci_delete_by_section_unnamed_##UCI_PATH(struct uci_section *s, char *option, char *value)\
{\
struct uci_context *save_uci_ctx; \
@ -376,8 +366,6 @@ int dmuci_commit_package_bbfdm(char *package);
int dmuci_commit_bbfdm(void);
int dmuci_revert_bbfdm(void);
int dmuci_commit_package_varstate(char *package);
int dmuci_save_package_varstate(char *package);
int dmuci_revert_package_varstate(char *package);
struct uci_section *dmuci_walk_section_bbfdm(char *package, char *stype, void *arg1, void *arg2, int cmp , int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, int walk);
int dmuci_init_bbfdm(void);