mirror/icwmp
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/icwmp.git synced 2026-02-14 03:49:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed mutex on config operation

Browse source
This commit is contained in:
suvendhu 2023-01-23 17:58:27 +05:30
parent 91e473e780
commit 1778000f0f
12 changed files with 392 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common.c
View file

@ -272,7 +272,13 @@ void get_firewall_zone_name_by_wan_iface(char *if_wan, char **zone_name)
if (if_wan == NULL)
if_wan = "wan";
cwmp_uci_foreach_sections("firewall", "zone", UCI_STANDARD_CONFIG, s)
struct uci_paths conf_path;
int ret = cwmp_uci_standard_init(&conf_path);
if (ret != 0)
return;
cwmp_uci_foreach_sections("firewall", "zone", conf_path.uci_ctx, s)
{
cwmp_uci_get_value_by_section_string(s, "network", &network);
if (network == NULL)
@ -282,12 +288,15 @@ void get_firewall_zone_name_by_wan_iface(char *if_wan, char **zone_name)
if (strcmp(net, if_wan) == 0) {
cwmp_uci_get_value_by_section_string(s, "name", zone_name);
icwmp_free(network);
cwmp_uci_exit(&conf_path);
return;
}
net = strtok(NULL, " ");
}
icwmp_free(network);
}
cwmp_uci_exit(&conf_path);
}
/*

8
config.c
View file

@ -21,8 +21,6 @@
#include "datamodel_interface.h"
#include "heartbeat.h"
pthread_mutex_t mutex_config_load = PTHREAD_MUTEX_INITIALIZER;
static char* get_value_from_uci_option(struct uci_option *tb) {
if (tb == NULL)
return NULL;
@ -568,8 +566,6 @@ int global_conf_init(struct cwmp *cwmp)
{
int error = CWMP_OK;
pthread_mutex_lock(&mutex_config_load);
if ((error = get_global_config(&(cwmp->conf)))) {
cwmp->init_complete = false;
goto end;
@ -580,8 +576,6 @@ int global_conf_init(struct cwmp *cwmp)
launch_reboot_methods(cwmp);
end:
pthread_mutex_unlock(&mutex_config_load);
return error;
}
@ -589,12 +583,10 @@ void cwmp_config_load(struct cwmp *cwmp)
{
int ret;
cwmp_uci_reinit();
ret = global_conf_init(cwmp);
while (ret != CWMP_OK && thread_end != true) {
CWMP_LOG(DEBUG, "Error reading uci ret = %d", ret);
sleep(UCI_OPTION_READ_INTERVAL);
cwmp_uci_reinit();
ret = global_conf_init(cwmp);
}
}

8
cwmp.c
View file

@ -63,7 +63,6 @@ static void set_cwmp_session_status_state(int status)
if (!file_exists(VARSTATE_CONFIG"/cwmp"))
creat(VARSTATE_CONFIG"/cwmp", S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
cwmp_uci_reinit();
cwmp_uci_add_section_with_specific_name("cwmp", "sess_status", "sess_status", UCI_VARSTATE_CONFIG);
switch (status) {
@ -224,7 +223,6 @@ end:
int get_firewall_restart_state(char **state)
{
cwmp_uci_reinit();
return uci_get_state_value(UCI_CPE_FIREWALL_RESTART_STATE, state);
}
@ -376,7 +374,6 @@ int run_session_end_func(void)
if (end_session_flag & END_SESSION_RELOAD) {
CWMP_LOG(INFO, "Config reload: end session request");
cwmp_uci_reinit();
if (cwmp_apply_acs_changes() != CWMP_OK) {
CWMP_LOG(ERROR, "config reload failed at session end");
}
@ -457,7 +454,6 @@ int run_session_end_func(void)
INIT_LIST_HEAD(&intf_reset_list);
cwmp_uci_exit();
icwmp_cleanmem();
end_session_flag = 0;
return CWMP_OK;
@ -533,7 +529,6 @@ static void cwmp_schedule_session(struct cwmp *cwmp)
if (file_exists(fc_cookies))
remove(fc_cookies);
cwmp_uci_init();
CWMP_LOG(INFO, "Start session");
uci_get_value(UCI_CPE_EXEC_DOWNLOAD, &exec_download);
@ -545,7 +540,6 @@ static void cwmp_schedule_session(struct cwmp *cwmp)
FREE(exec_download);
error = cwmp_schedule_rpc(cwmp, session);
CWMP_LOG(INFO, "End session");
cwmp_uci_exit();
if (thread_end) {
event_remove_all_event_container(session, RPC_SEND);
@ -951,7 +945,6 @@ static void cwmp_free(struct cwmp *cwmp)
clean_custom_inform_parameters();
icwmp_cleanmem();
cwmp_uci_exit();
}
static void icwmp_signal_handler(int signal_num)
@ -987,7 +980,6 @@ static void configure_var_state(struct cwmp *cwmp)
if (!file_exists(VARSTATE_CONFIG"/cwmp"))
creat(VARSTATE_CONFIG"/cwmp", S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
cwmp_uci_reinit();
cwmp_uci_add_section_with_specific_name("cwmp", "acs", "acs", UCI_VARSTATE_CONFIG);
cwmp_uci_add_section_with_specific_name("cwmp", "cpe", "cpe", UCI_VARSTATE_CONFIG);

2
cwmp_cli.c
View file

@ -312,7 +312,6 @@ char* execute_cwmp_cli_command(char *cmd, char *args[])
char *fault = NULL, *fault_ret = NULL;
size_t i;
size_t commands_array_size = sizeof(icwmp_commands) / sizeof(struct cwmp_cli_command_struct);
cwmp_uci_init();
for (i = 0; i < commands_array_size; i++) {
if (strcmp(icwmp_commands[i].command_name, cmd) == 0) {
fault = icwmp_commands[i].cmd_exec_func(cmd_in, &cmd_out);
@ -329,6 +328,5 @@ cli_help:
cli_end:
icwmp_cleanmem();
cwmp_uci_exit();
return fault_ret;
}

487
cwmp_uci.c
View file

@ -15,11 +15,6 @@
#include "cwmp_uci.h"
#include "log.h"
struct uci_paths uci_save_conf_paths[] = {
[UCI_STANDARD_CONFIG] = { "/etc/config", "/tmp/.uci", NULL },
[UCI_VARSTATE_CONFIG] = { "/var/state", NULL, NULL }
};
/*
* UCI LOOKUP
*/
@ -105,68 +100,73 @@ lookup:
* UCI INIT EXIT
*/
void cwmp_uci_init_by_config(int config)
int cwmp_uci_standard_init(struct uci_paths *conf_path)
{
if(uci_save_conf_paths[config].uci_ctx != NULL)
return;
uci_save_conf_paths[config].uci_ctx = uci_alloc_context();
if ( uci_save_conf_paths[config].uci_ctx == NULL)
return;
uci_add_delta_path(uci_save_conf_paths[config].uci_ctx, uci_save_conf_paths[config].uci_ctx->savedir);
uci_set_savedir(uci_save_conf_paths[config].uci_ctx, uci_save_conf_paths[config].save_dir);
uci_set_confdir(uci_save_conf_paths[config].uci_ctx, uci_save_conf_paths[config].conf_dir);
}
if (conf_path == NULL)
return -1;
void cwmp_uci_exit_by_config(int config)
{
if (uci_save_conf_paths[config].uci_ctx) {
uci_free_context(uci_save_conf_paths[config].uci_ctx);
uci_save_conf_paths[config].uci_ctx = NULL;
}
}
memset(conf_path, 0, sizeof(struct uci_paths));
int cwmp_uci_init(void)
{
unsigned int i = 0;
conf_path->uci_ctx = NULL;
conf_path->conf_dir = "/etc/config";
conf_path->save_dir = "/tmp/.uci";
for (i = 0; i < ARRAY_SIZE(uci_save_conf_paths); i++) {
cwmp_uci_init_by_config(i);
}
conf_path->uci_ctx = uci_alloc_context();
if (conf_path->uci_ctx == NULL)
return -1;
uci_add_delta_path(conf_path->uci_ctx, conf_path->uci_ctx->savedir);
uci_set_savedir(conf_path->uci_ctx, conf_path->save_dir);
uci_set_confdir(conf_path->uci_ctx, conf_path->conf_dir);
return 0;
}
void cwmp_uci_exit(void)
int cwmp_uci_varstate_init(struct uci_paths *conf_path)
{
unsigned int i = 0;
if (conf_path == NULL)
return -1;
for (i = 0; i < ARRAY_SIZE(uci_save_conf_paths); i++) {
cwmp_uci_exit_by_config(i);
}
memset(conf_path, 0, sizeof(struct uci_paths));
conf_path->uci_ctx = NULL;
conf_path->conf_dir = "/var/state";
conf_path->save_dir = NULL;
conf_path->uci_ctx = uci_alloc_context();
if (conf_path->uci_ctx == NULL)
return -1;
uci_add_delta_path(conf_path->uci_ctx, conf_path->uci_ctx->savedir);
uci_set_savedir(conf_path->uci_ctx, conf_path->save_dir);
uci_set_confdir(conf_path->uci_ctx, conf_path->conf_dir);
return 0;
}
void cwmp_uci_reinit(void)
void cwmp_uci_exit(struct uci_paths *conf_path)
{
cwmp_uci_exit();
cwmp_uci_init();
if (conf_path == NULL)
return;
if (conf_path->uci_ctx == NULL)
return;
uci_free_context(conf_path->uci_ctx);
conf_path->uci_ctx = NULL;
}
/*
* UCI GET option value
*/
int cwmp_uci_get_option_value_string(char *package, char *section, char *option, uci_config_paths uci_type, char **value)
int cwmp_uci_get_option_value_string(char *package, char *section, char *option, struct uci_context *uci_ctx, char **value)
{
struct uci_ptr ptr = { 0 };
if (package == NULL || section == NULL || option == NULL) {
if (package == NULL || section == NULL || option == NULL || uci_ctx == NULL) {
*value = NULL;
return UCI_ERR_NOTFOUND;
}
if (uci_save_conf_paths[uci_type].uci_ctx == NULL) {
*value = NULL;
return UCI_ERR_NOTFOUND;
}
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, section, option, NULL) != UCI_OK) {
if (cwmp_uci_lookup_ptr(uci_ctx, &ptr, package, section, option, NULL) != UCI_OK) {
*value = NULL;
return UCI_ERR_PARSE;
}
@ -181,7 +181,7 @@ int cwmp_uci_get_option_value_string(char *package, char *section, char *option,
return UCI_OK;
}
int cwmp_uci_get_value_by_path(char *path, uci_config_paths uci_type, char **value)
int cwmp_uci_get_value_by_path(char *path, struct uci_context *uci_ctx, char **value)
{
struct uci_ptr ptr;
char *s;
@ -192,12 +192,12 @@ int cwmp_uci_get_value_by_path(char *path, uci_config_paths uci_type, char **val
CWMP_LOG(ERROR, "the entered path argument is empty");
return UCI_ERR_IO;
}
if (uci_save_conf_paths[uci_type].uci_ctx == NULL) {
if (uci_ctx == NULL) {
*value = NULL;
return UCI_ERR_NOTFOUND;
}
s = strdup(path);
if (uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, s, true) != UCI_OK) {
if (uci_lookup_ptr(uci_ctx, &ptr, s, true) != UCI_OK) {
CWMP_LOG(ERROR, "Error occurred in uci get %s", path);
free(s);
return UCI_ERR_PARSE;
@ -216,24 +216,38 @@ int cwmp_uci_get_value_by_path(char *path, uci_config_paths uci_type, char **val
int uci_get_state_value(char *path, char **value)
{
int error;
struct uci_paths conf_path;
if (path == NULL) {
*value = NULL;
return UCI_ERR_NOTFOUND;
}
error = cwmp_uci_get_value_by_path(path, UCI_VARSTATE_CONFIG, value);
if (cwmp_uci_varstate_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
error = cwmp_uci_get_value_by_path(path, conf_path.uci_ctx, value);
cwmp_uci_exit(&conf_path);
return error;
}
int uci_get_value(char *path, char **value)
{
int error;
struct uci_paths conf_path;
if (path == NULL) {
*value = NULL;
return UCI_ERR_NOTFOUND;
}
error = cwmp_uci_get_value_by_path(path, UCI_STANDARD_CONFIG, value);
if (cwmp_uci_standard_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
error = cwmp_uci_get_value_by_path(path, conf_path.uci_ctx, value);
cwmp_uci_exit(&conf_path);
return error;
}
@ -311,18 +325,18 @@ int cwmp_uci_get_value_by_section_list(struct uci_section *s, char *option, stru
/*
* UCI Set option value
*/
int cwmp_uci_set_value_string(char *package, char *section, char *option, char *value, uci_config_paths uci_type)
int cwmp_uci_set_value_string(char *package, char *section, char *option, char *value, struct uci_context *uci_ctx)
{
struct uci_ptr ptr = {0};
if (package == NULL || section == NULL || option == NULL)
return UCI_ERR_NOTFOUND;
if (uci_save_conf_paths[uci_type].uci_ctx == NULL)
if (uci_ctx == NULL)
return UCI_ERR_NOTFOUND;
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, section, option, value))
if (cwmp_uci_lookup_ptr(uci_ctx, &ptr, package, section, option, value))
return UCI_ERR_PARSE;
if (uci_set(uci_save_conf_paths[uci_type].uci_ctx, &ptr) != UCI_OK)
if (uci_set(uci_ctx, &ptr) != UCI_OK)
return UCI_ERR_NOTFOUND;
if (ptr.o)
return UCI_OK;
@ -331,32 +345,49 @@ int cwmp_uci_set_value_string(char *package, char *section, char *option, char *
int cwmp_uci_set_value(char *package, char *section, char *option, char *value)
{
return cwmp_uci_set_value_string(package, section, option, value, UCI_STANDARD_CONFIG);
struct uci_paths conf_path;
if (cwmp_uci_standard_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
int ret = cwmp_uci_set_value_string(package, section, option, value, conf_path.uci_ctx);
cwmp_uci_exit(&conf_path);
return ret;
}
int cwmp_uci_set_varstate_value(char *package, char*section, char *option, char *value)
{
return cwmp_uci_set_value_string(package, section, option, value, UCI_VARSTATE_CONFIG);
struct uci_paths conf_path;
if (cwmp_uci_varstate_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
int ret = cwmp_uci_set_value_string(package, section, option, value, conf_path.uci_ctx);
cwmp_uci_exit(&conf_path);
return ret;
}
int uci_set_value_by_path(char *path, char *value, uci_config_paths uci_type)
int uci_set_value_by_path(char *path, char *value, struct uci_context *uci_ctx)
{
struct uci_ptr ptr;
int ret = UCI_OK;
if (path == NULL)
if (path == NULL || uci_ctx == NULL)
return UCI_ERR_NOTFOUND;
char cmd[256];
snprintf(cmd, sizeof(cmd), "%s=%s", path, value);
if (uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, cmd, true) != UCI_OK)
if (uci_lookup_ptr(uci_ctx, &ptr, cmd, true) != UCI_OK)
return UCI_ERR_PARSE;
ret = uci_set(uci_save_conf_paths[uci_type].uci_ctx, &ptr);
ret = uci_set(uci_ctx, &ptr);
if (ret == UCI_OK) {
ret = uci_save(uci_save_conf_paths[uci_type].uci_ctx, ptr.p);
ret = uci_save(uci_ctx, ptr.p);
} else {
CWMP_LOG(ERROR, "UCI delete not succeed %s", path);
CWMP_LOG(ERROR, "UCI set not succeed %s", path);
return UCI_ERR_NOTFOUND;
}
return ret;
@ -364,12 +395,28 @@ int uci_set_value_by_path(char *path, char *value, uci_config_paths uci_type)
int cwmp_uci_set_value_by_path(char *path, char *value)
{
return uci_set_value_by_path(path, value, UCI_STANDARD_CONFIG);
struct uci_paths conf_path;
if (cwmp_uci_standard_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
int ret = uci_set_value_by_path(path, value, conf_path.uci_ctx);
cwmp_uci_exit(&conf_path);
return ret;
}
int cwmp_uci_set_varstate_value_by_path(char *path, char *value)
{
return uci_set_value_by_path(path, value, UCI_VARSTATE_CONFIG);
struct uci_paths conf_path;
if (cwmp_uci_varstate_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
int ret = uci_set_value_by_path(path, value, conf_path.uci_ctx);
cwmp_uci_exit(&conf_path);
return ret;
}
/*
@ -442,7 +489,7 @@ char *cwmp_uci_list_to_string(struct uci_list *list, char *delimitor)
return NULL;
}
int cwmp_uci_get_option_value_list(char *package, char *section, char *option, uci_config_paths uci_type, struct uci_list **value)
int cwmp_uci_get_option_value_list(char *package, char *section, char *option, struct uci_context *uci_ctx, struct uci_list **value)
{
struct uci_element *e = NULL;
struct uci_ptr ptr = {0};
@ -458,7 +505,7 @@ int cwmp_uci_get_option_value_list(char *package, char *section, char *option, u
*value = NULL;
return UCI_ERR_NOTFOUND;
}
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, section, option, NULL))
if (cwmp_uci_lookup_ptr(uci_ctx, &ptr, package, section, option, NULL))
return UCI_ERR_PARSE;
if (ptr.o) {
@ -500,67 +547,136 @@ int cwmp_uci_get_option_value_list(char *package, char *section, char *option, u
int cwmp_uci_get_cwmp_standard_option_value_list(char *package, char *section, char *option, struct uci_list **value)
{
return cwmp_uci_get_option_value_list(package, section, option, UCI_STANDARD_CONFIG, value);
struct uci_paths conf_path;
if (cwmp_uci_standard_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
int ret = cwmp_uci_get_option_value_list(package, section, option, conf_path.uci_ctx, value);
cwmp_uci_exit(&conf_path);
return ret;
}
int cwmp_uci_get_cwmp_varstate_option_value_list(char *package, char *section, char *option, struct uci_list **value)
{
return cwmp_uci_get_option_value_list(package, section, option, UCI_VARSTATE_CONFIG, value);
struct uci_paths conf_path;
if (cwmp_uci_varstate_init(&conf_path) != 0)
return UCI_ERR_NOTFOUND;
int ret = cwmp_uci_get_option_value_list(package, section, option, conf_path.uci_ctx, value);
cwmp_uci_exit(&conf_path);
return ret;
}
int cwmp_uci_add_list_value(char *package, char *section, char *option, char *value, uci_config_paths uci_type)
{
struct uci_ptr ptr = {0};
int error = UCI_OK;
struct uci_paths conf_path;
int ret = -1;
if (package == NULL || section == NULL || option == NULL)
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return UCI_ERR_NOTFOUND;
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, section, option, value))
if (package == NULL || section == NULL || option == NULL) {
cwmp_uci_exit(&conf_path);
return UCI_ERR_NOTFOUND;
}
if (cwmp_uci_lookup_ptr(conf_path.uci_ctx, &ptr, package, section, option, value)) {
cwmp_uci_exit(&conf_path);
return UCI_ERR_PARSE;
}
error = uci_add_list(uci_save_conf_paths[uci_type].uci_ctx, &ptr);
if (error != UCI_OK)
error = uci_add_list(conf_path.uci_ctx, &ptr);
if (error != UCI_OK) {
cwmp_uci_exit(&conf_path);
return error;
}
cwmp_uci_exit(&conf_path);
return UCI_OK;
}
int cwmp_uci_del_list_value(char *package, char *section, char *option, char *value, uci_config_paths uci_type)
{
struct uci_ptr ptr = {0};
struct uci_paths conf_path;
int ret = -1;
if (package == NULL || section == NULL || option == NULL)
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return UCI_ERR_NOTFOUND;
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, section, option, value))
return -1;
if (package == NULL || section == NULL || option == NULL) {
cwmp_uci_exit(&conf_path);
return UCI_ERR_NOTFOUND;
}
if (uci_del_list(uci_save_conf_paths[uci_type].uci_ctx, &ptr) != UCI_OK)
if (cwmp_uci_lookup_ptr(conf_path.uci_ctx, &ptr, package, section, option, value)) {
cwmp_uci_exit(&conf_path);
return -1;
}
if (uci_del_list(conf_path.uci_ctx, &ptr) != UCI_OK) {
cwmp_uci_exit(&conf_path);
return -1;
}
cwmp_uci_exit(&conf_path);
return 0;
}
int uci_add_list_value(char *cmd, uci_config_paths uci_type)
{
struct uci_ptr ptr;
int ret = UCI_OK;
int error = UCI_OK;
struct uci_paths conf_path;
int ret = -1;
if (cmd == NULL)
return UCI_ERR_NOTFOUND;
if (uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, cmd, true) != UCI_OK)
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return UCI_ERR_NOTFOUND;
if (uci_lookup_ptr(conf_path.uci_ctx, &ptr, cmd, true) != UCI_OK) {
cwmp_uci_exit(&conf_path);
return UCI_ERR_PARSE;
}
ret = uci_add_list(uci_save_conf_paths[uci_type].uci_ctx, &ptr);
error = uci_add_list(conf_path.uci_ctx, &ptr);
if (ret == UCI_OK) {
ret = uci_save(uci_save_conf_paths[uci_type].uci_ctx, ptr.p);
if (error == UCI_OK) {
error = uci_save(conf_path.uci_ctx, ptr.p);
} else {
CWMP_LOG(ERROR, "UCI delete not succeed %s", cmd);
cwmp_uci_exit(&conf_path);
return UCI_ERR_NOTFOUND;
}
return ret;
cwmp_uci_exit(&conf_path);
return error;
}
/*
@ -571,40 +687,72 @@ int cwmp_uci_add_section(char *package, char *stype, uci_config_paths uci_type ,
{
struct uci_ptr ptr = {0};
char fname[128];
struct uci_paths conf_path;
int ret = -1;
*s = NULL;
if (package == NULL || stype == NULL)
return UCI_ERR_NOTFOUND;
snprintf(fname, sizeof(fname), "%s/%s", uci_save_conf_paths[uci_type].conf_dir, package);
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return UCI_ERR_NOTFOUND;
snprintf(fname, sizeof(fname), "%s/%s", conf_path.conf_dir, package);
if (!file_exists(fname)) {
FILE *fptr = fopen(fname, "w");
if (fptr)
if (fptr) {
fclose(fptr);
else
} else {
cwmp_uci_exit(&conf_path);
return UCI_ERR_UNKNOWN;
}
}
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, NULL, NULL, NULL) == 0
&& uci_add_section(uci_save_conf_paths[uci_type].uci_ctx, ptr.p, stype, s) == UCI_OK) {
if (cwmp_uci_lookup_ptr(conf_path.uci_ctx, &ptr, package, NULL, NULL, NULL) == 0
&& uci_add_section(conf_path.uci_ctx, ptr.p, stype, s) == UCI_OK) {
CWMP_LOG(INFO, "New uci section %s added successfully", stype);
}
else
} else {
cwmp_uci_exit(&conf_path);
return UCI_ERR_NOTFOUND;
}
cwmp_uci_exit(&conf_path);
return UCI_OK;
}
struct uci_section* get_section_by_section_name(char *package, char *stype, char* sname, uci_config_paths uci_type)
{
struct uci_section *s;
if (package == NULL || stype == NULL || sname == NULL)
return NULL;
cwmp_uci_foreach_sections(package, stype, uci_type, s) {
if (strcmp(section_name(s), sname) == 0)
return s;
struct uci_paths conf_path;
int ret = 0;
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return NULL;
cwmp_uci_foreach_sections(package, stype, conf_path.uci_ctx, s) {
if (strcmp(section_name(s), sname) == 0) {
cwmp_uci_exit(&conf_path);
return s;
}
}
return NULL;
}
@ -612,15 +760,32 @@ struct uci_section* get_section_by_section_name(char *package, char *stype, char
int cwmp_uci_rename_section_by_section(struct uci_section *s, char *value, uci_config_paths uci_type)
{
struct uci_ptr up = {0};
struct uci_paths conf_path;
int ret = -1;
if (s == NULL)
return UCI_ERR_NOTFOUND;
if (cwmp_uci_lookup_ptr_by_section(uci_save_conf_paths[uci_type].uci_ctx, &up, s, NULL, value) == -1)
return UCI_ERR_PARSE;
if (uci_rename(uci_save_conf_paths[uci_type].uci_ctx, &up) != UCI_OK)
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return UCI_ERR_NOTFOUND;
if (cwmp_uci_lookup_ptr_by_section(conf_path.uci_ctx, &up, s, NULL, value) == -1) {
cwmp_uci_exit(&conf_path);
return UCI_ERR_PARSE;
}
if (uci_rename(conf_path.uci_ctx, &up) != UCI_OK) {
cwmp_uci_exit(&conf_path);
return UCI_ERR_NOTFOUND;
}
cwmp_uci_exit(&conf_path);
return UCI_OK;
}
@ -644,46 +809,77 @@ int cwmp_uci_add_section_with_specific_name(char *package, char *stype, char *se
int uci_delete_value(char *path, int uci_type)
{
struct uci_ptr ptr;
int ret = UCI_OK;
struct uci_paths conf_path;
int ret = -1;
if (path == NULL)
return UCI_ERR_NOTFOUND;
if (uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, path, true) != UCI_OK)
return CWMP_GEN_ERR;
ret = uci_delete(uci_save_conf_paths[uci_type].uci_ctx, &ptr);
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret == UCI_OK) {
ret = uci_save(uci_save_conf_paths[uci_type].uci_ctx, ptr.p);
} else {
CWMP_LOG(ERROR, "UCI delete not succeed %s", path);
if (ret != 0)
return UCI_ERR_NOTFOUND;
if (uci_lookup_ptr(conf_path.uci_ctx, &ptr, path, true) != UCI_OK) {
cwmp_uci_exit(&conf_path);
return CWMP_GEN_ERR;
}
return ret;
int error = uci_delete(conf_path.uci_ctx, &ptr);
if (error == UCI_OK) {
error = uci_save(conf_path.uci_ctx, ptr.p);
} else {
CWMP_LOG(ERROR, "UCI delete not succeed %s", path);
cwmp_uci_exit(&conf_path);
return CWMP_GEN_ERR;
}
cwmp_uci_exit(&conf_path);
return error;
}
int cwmp_uci_get_section_type(char *package, char *section, uci_config_paths uci_type, char **value)
{
struct uci_ptr ptr = {0};
struct uci_paths conf_path;
int ret = -1;
if (package == NULL || section == NULL) {
*value = NULL;
return UCI_ERR_NOTFOUND;
}
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, section, NULL, NULL)) {
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return UCI_ERR_NOTFOUND;
if (cwmp_uci_lookup_ptr(conf_path.uci_ctx, &ptr, package, section, NULL, NULL)) {
*value = "";
cwmp_uci_exit(&conf_path);
return -1;
}
if (ptr.s) {
*value = icwmp_strdup(ptr.s->type ? ptr.s->type : "");
} else {
*value = "";
}
cwmp_uci_exit(&conf_path);
return UCI_OK;
}
struct uci_section *cwmp_uci_walk_section(char *package, char *stype, void *arg1, void *arg2, int cmp, int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, uci_config_paths uci_type, int walk)
struct uci_section *cwmp_uci_walk_section(char *package, char *stype, void *arg1, void *arg2, int cmp, int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, struct uci_context *uci_ctx, int walk)
{
struct uci_section *s = NULL;
struct uci_element *e, *m;
@ -693,7 +889,7 @@ struct uci_section *cwmp_uci_walk_section(char *package, char *stype, void *arg1
struct uci_ptr ptr = { 0 };
if (walk == CWMP_GET_FIRST_SECTION) {
if (cwmp_uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, NULL, NULL, NULL) != UCI_OK)
if (cwmp_uci_lookup_ptr(uci_ctx, &ptr, package, NULL, NULL, NULL) != UCI_OK)
goto end;
list_section = &(ptr.p)->sections;
@ -762,13 +958,29 @@ end:
int cwmp_commit_package(char *package, uci_config_paths uci_type)
{
struct uci_ptr ptr = { 0 };
if (uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, true) != UCI_OK) {
struct uci_paths conf_path;
int ret = -1;
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0)
return UCI_ERR_NOTFOUND;
if (uci_lookup_ptr(conf_path.uci_ctx, &ptr, package, true) != UCI_OK) {
cwmp_uci_exit(&conf_path);
return -1;
}
if (uci_commit(uci_save_conf_paths[uci_type].uci_ctx, &ptr.p, false) != UCI_OK) {
if (uci_commit(conf_path.uci_ctx, &ptr.p, false) != UCI_OK) {
cwmp_uci_exit(&conf_path);
return -1;
}
cwmp_uci_exit(&conf_path);
return 0;
}
@ -776,32 +988,44 @@ int cwmp_uci_import(char *package_name, const char *input_path, uci_config_paths
{
struct uci_package *package = NULL;
struct uci_element *e = NULL;
int ret = CWMP_OK;
int ret = CWMP_OK, err = -1;
FILE *input = fopen(input_path, "r");
if (!input)
return -1;
if (uci_save_conf_paths[uci_type].uci_ctx == NULL)
goto end;
struct uci_paths conf_path;
if (uci_import(uci_save_conf_paths[uci_type].uci_ctx, input, package_name, &package, (package_name != NULL)) != UCI_OK) {
if (uci_type == UCI_STANDARD_CONFIG) {
err = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
err = cwmp_uci_varstate_init(&conf_path);
}
if (err != 0) {
fclose(input);
return err;
}
if (uci_import(conf_path.uci_ctx, input, package_name, &package, (package_name != NULL)) != UCI_OK) {
ret = -1;
goto end;
}
if (uci_save_conf_paths[uci_type].uci_ctx == NULL) {
if (conf_path.uci_ctx == NULL) {
ret = -1;
goto end;
}
uci_foreach_element(&uci_save_conf_paths[uci_type].uci_ctx->root, e)
uci_foreach_element(&conf_path.uci_ctx->root, e)
{
struct uci_package *p = uci_to_package(e);
if (uci_commit(uci_save_conf_paths[uci_type].uci_ctx, &p, true) != UCI_OK)
if (uci_commit(conf_path.uci_ctx, &p, true) != UCI_OK)
ret = CWMP_GEN_ERR;
}
end:
fclose(input);
cwmp_uci_exit(&conf_path);
return ret;
}
@ -813,16 +1037,30 @@ int cwmp_uci_export_package(char *package, const char *output_path, uci_config_p
if (!out)
return -1;
if (uci_lookup_ptr(uci_save_conf_paths[uci_type].uci_ctx, &ptr, package, true) != UCI_OK) {
struct uci_paths conf_path;
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0) {
fclose(out);
return ret;
}
if (uci_lookup_ptr(conf_path.uci_ctx, &ptr, package, true) != UCI_OK) {
ret = -1;
goto end;
}
if (uci_export(uci_save_conf_paths[uci_type].uci_ctx, out, ptr.p, true) != UCI_OK)
if (uci_export(conf_path.uci_ctx, out, ptr.p, true) != UCI_OK)
ret = -1;
end:
fclose(out);
cwmp_uci_exit(&conf_path);
return ret;
}
@ -830,10 +1068,25 @@ int cwmp_uci_export(const char *output_path, uci_config_paths uci_type)
{
char **configs = NULL;
char **p;
struct uci_paths conf_path;
int ret = 0;
if (uci_list_configs(uci_save_conf_paths[uci_type].uci_ctx, &configs) != UCI_OK)
if (uci_type == UCI_STANDARD_CONFIG) {
ret = cwmp_uci_standard_init(&conf_path);
} else if (uci_type == UCI_VARSTATE_CONFIG) {
ret = cwmp_uci_varstate_init(&conf_path);
}
if (ret != 0) {
return -1;
}
if (uci_list_configs(conf_path.uci_ctx, &configs) != UCI_OK) {
cwmp_uci_exit(&conf_path);
return -1;
}
cwmp_uci_exit(&conf_path);
if (configs == NULL)
return -1;

4
download.c
View file

@ -363,7 +363,6 @@ int apply_downloaded_file(struct cwmp *cwmp, struct download *pdownload, char *d
//TODO Not Supported
error = FAULT_CPE_NO_FAULT;
} else if (strcmp(pdownload->file_type, VENDOR_CONFIG_FILE_TYPE) == 0) {
cwmp_uci_init();
int err = CWMP_OK;
if (download_file_name != NULL) {
char file_path[512];
@ -375,7 +374,6 @@ int apply_downloaded_file(struct cwmp *cwmp, struct download *pdownload, char *d
remove(VENDOR_CONFIG_FILE);
}
cwmp_uci_exit();
if (err == CWMP_OK)
error = FAULT_CPE_NO_FAULT;
else if (err == CWMP_GEN_ERR)
@ -801,9 +799,7 @@ void *thread_cwmp_rpc_cpe_apply_schedule_download(void *v)
//TODO Not Supported
error = FAULT_CPE_NO_FAULT;
} else if (strcmp(apply_download->file_type, VENDOR_CONFIG_FILE_TYPE) == 0) {
cwmp_uci_init();
int err = cwmp_uci_import(NULL, VENDOR_CONFIG_FILE, UCI_STANDARD_CONFIG);
cwmp_uci_exit();
if (err == CWMP_OK)
error = FAULT_CPE_NO_FAULT;
else if (err == CWMP_GEN_ERR)

2
heartbeat.c
View file

@ -115,11 +115,9 @@ void *thread_heartbeat_session(void *v __attribute__((unused)))
if (file_exists(fc_cookies))
remove(fc_cookies);
cwmp_uci_init();
CWMP_LOG(INFO, "Start HEARTBEAT session");
int error = cwmp_schedule_rpc(&cwmp_main, heartbeat_session);
CWMP_LOG(INFO, "End HEARTBEAT session");
cwmp_uci_exit();
if (thread_end) {
event_remove_all_event_container(heartbeat_session, RPC_SEND);

2
inc/config.h
View file

@ -15,8 +15,6 @@
#include "cwmp_uci.h"
extern pthread_mutex_t mutex_config_load;
int global_conf_init(struct cwmp *cwmp);
int get_global_config(struct config *conf);
int cwmp_get_deviceid(struct cwmp *cwmp);

25
inc/cwmp_uci.h
View file

@ -115,21 +115,20 @@ struct uci_paths {
struct uci_context *uci_ctx;
};
extern struct uci_paths uci_save_conf_paths[];
int cwmp_uci_init();
void cwmp_uci_exit(void);
void cwmp_uci_reinit(void);
int cwmp_uci_standard_init(struct uci_paths *conf_path);
int cwmp_uci_varstate_init(struct uci_paths *conf_path);
void cwmp_uci_exit(struct uci_paths *conf_path);
int cwmp_uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *package, char *section, char *option, char *value);
int cwmp_uci_get_cwmp_standard_option_value_list(char *package, char *section, char *option, struct uci_list **value);
int cwmp_uci_get_cwmp_varstate_option_value_list(char *package, char *section, char *option, struct uci_list **value);
int uci_get_state_value(char *cmd, char **value);
int uci_set_value_by_path(char *cmd, char *value, uci_config_paths uci_type);
int uci_set_value_by_path(char *cmd, char *value, struct uci_context *uci_ctx);
int cwmp_uci_set_value_by_path(char *path, char *value);
int cwmp_uci_set_varstate_value_by_path(char *path, char *value);
int uci_get_value(char *cmd, char **value);
struct uci_section *cwmp_uci_walk_section(char *package, char *stype, void *arg1, void *arg2, int cmp, int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, uci_config_paths uci_type, int walk);
struct uci_section *cwmp_uci_walk_section(char *package, char *stype, void *arg1, void *arg2, int cmp, int (*filter)(struct uci_section *s, void *value), struct uci_section *prev_section, struct uci_context *uci_ctx, int walk);
int cwmp_uci_get_value_by_section_string(struct uci_section *s, char *option, char **value);
int cwmp_uci_get_option_value_string(char *package, char *section, char *option, uci_config_paths uci_type, char **value);
int cwmp_uci_get_option_value_string(char *package, char *section, char *option, struct uci_context *uci_ctx, char **value);
int cwmp_commit_package(char *package, uci_config_paths uci_type);
int cwmp_uci_import(char *package_name, const char *input_path, uci_config_paths uci_type);
int cwmp_uci_export_package(char *package, const char *output_path, uci_config_paths uci_type);
@ -147,12 +146,12 @@ void cwmp_uci_list_init(struct uci_list *ptr);
void cwmp_uci_list_add(struct uci_list *head, struct uci_list *ptr);
struct uci_section* get_section_by_section_name(char *package, char *stype, char* sname, uci_config_paths uci_type);
#define cwmp_uci_path_foreach_option_eq(package, stype, option, val, section) \
for (section = cwmp_uci_walk_section(package, stype, option, val, CWMP_CMP_OPTION_EQUAL, NULL, NULL, UCI_STANDARD_CONFIG, CWMP_GET_FIRST_SECTION); section != NULL; section = cwmp_uci_walk_section(package, stype, option, val, CWMP_CMP_OPTION_EQUAL, NULL, section, UCI_STANDARD_CONFIG, CWMP_GET_NEXT_SECTION))
#define cwmp_uci_path_foreach_option_eq(package, stype, option, val, uci_ctx, section) \
for (section = cwmp_uci_walk_section(package, stype, option, val, CWMP_CMP_OPTION_EQUAL, NULL, NULL, uci_ctx, CWMP_GET_FIRST_SECTION); section != NULL; section = cwmp_uci_walk_section(package, stype, option, val, CWMP_CMP_OPTION_EQUAL, NULL, section, uci_ctx, CWMP_GET_NEXT_SECTION))
#define cwmp_uci_foreach_sections(package, stype, uci_type, section) \
for (section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, NULL, uci_type, CWMP_GET_FIRST_SECTION); section != NULL; section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, section, uci_type, CWMP_GET_NEXT_SECTION))
#define cwmp_uci_foreach_sections(package, stype, uci_ctx, section) \
for (section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, NULL, uci_ctx, CWMP_GET_FIRST_SECTION); section != NULL; section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, section, uci_ctx, CWMP_GET_NEXT_SECTION))
#define cwmp_uci_foreach_varstate_sections(package, stype, section) \
for (section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, NULL, UCI_VARSTATE_CONFIG, CWMP_GET_FIRST_SECTION); section != NULL; section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, section, UCI_VARSTATE_CONFIG, CWMP_GET_NEXT_SECTION))
#define cwmp_uci_foreach_varstate_sections(package, stype, uci_ctx, section) \
for (section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, NULL, uci_ctx, CWMP_GET_FIRST_SECTION); section != NULL; section = cwmp_uci_walk_section(package, stype, NULL, NULL, CWMP_CMP_SECTION, NULL, section, uci_ctx, CWMP_GET_NEXT_SECTION))
#endif

1
notifications.c
View file

@ -328,7 +328,6 @@ void create_list_param_obj_notify()
struct uci_element *e = NULL;
int i;
cwmp_uci_reinit();
for (i = 0; i < 7; i++) {
int option_type;
option_type = cwmp_uci_get_cwmp_varstate_option_value_list("cwmp", "@notifications[0]", notifications[i], &list_notif);

1
ubus_utils.c
View file

@ -42,7 +42,6 @@ static int reload_cmd(struct blob_buf *b)
} else {
int error = CWMP_OK;
pthread_mutex_lock(&(cwmp_main.mutex_session_queue));
cwmp_uci_reinit();
error = cwmp_apply_acs_changes();
pthread_mutex_unlock(&(cwmp_main.mutex_session_queue));
if (error != CWMP_OK) {

4
upload.c
View file

@ -137,9 +137,7 @@ int cwmp_launch_upload(struct upload *pupload, struct transfer_complete **ptrans
}
if (pupload->file_type[0] == '1') {
snprintf(file_path, sizeof(file_path), "/tmp/all_configs");
cwmp_uci_init();
cwmp_uci_export(file_path, UCI_STANDARD_CONFIG);
cwmp_uci_exit();
} else if (pupload->file_type[0] == '2') {
snprintf(file_path, sizeof(file_path), "/tmp/syslog");
copy("/var/log/syslog", file_path);
@ -147,9 +145,7 @@ int cwmp_launch_upload(struct upload *pupload, struct transfer_complete **ptrans
lookup_vcf_name(pupload->f_instance, &name);
if (name && strlen(name) > 0) {
snprintf(file_path, sizeof(file_path), "/tmp/%s", name);
cwmp_uci_init();
cwmp_uci_export_package(name, file_path, UCI_STANDARD_CONFIG);
cwmp_uci_exit();
FREE(name);
} else {
error = FAULT_CPE_UPLOAD_FAILURE;