mirror of
https://dev.iopsys.eu/bbf/bbfdm.git
synced 2026-02-19 10:41:34 +01:00
Json_plugin: Add/Delete/Set returns error when any operation is failing
This commit is contained in:
Amin Ben Romdhane
Vivek Kumar Dutta
parent
be4929300e
commit
591b7414c8
5 changed files with 139 additions and 78 deletions
145
dmdynamicjson.c
145
dmdynamicjson.c
|
|
@ -534,14 +534,26 @@ static int add_obj(char *refparam, struct dmctx *ctx, void *data, char **instanc
|
|||
if (file && section_type && dmmap_file) {
|
||||
struct uci_section *s = NULL, *dmmap_s = NULL;
|
||||
|
||||
dmuci_add_section(json_object_get_string(file), json_object_get_string(section_type), &s);
|
||||
dmuci_rename_section_by_section(s, sec_name);
|
||||
if (data) dmuci_set_value_by_section(s, "dm_parent", section_name((struct uci_section *)data));
|
||||
if (dmuci_add_section(json_object_get_string(file), json_object_get_string(section_type), &s))
|
||||
return -1;
|
||||
|
||||
dmuci_add_section_bbfdm(json_object_get_string(dmmap_file), json_object_get_string(section_type), &dmmap_s);
|
||||
dmuci_set_value_by_section(dmmap_s, "section_name", section_name(s));
|
||||
if (data) dmuci_set_value_by_section(dmmap_s, "dm_parent", section_name((struct uci_section *)data));
|
||||
dmuci_set_value_by_section(dmmap_s, buf_instance, *instance);
|
||||
if (dmuci_rename_section_by_section(s, sec_name))
|
||||
return -1;
|
||||
|
||||
if (dmuci_set_value_by_section(s, "dm_parent", section_name((struct uci_section *)data)))
|
||||
return -1;
|
||||
|
||||
if (dmuci_add_section_bbfdm(json_object_get_string(dmmap_file), json_object_get_string(section_type), &dmmap_s))
|
||||
return -1;
|
||||
|
||||
if (dmuci_set_value_by_section(dmmap_s, "section_name", section_name(s)))
|
||||
return -1;
|
||||
|
||||
if (dmuci_set_value_by_section(dmmap_s, "dm_parent", section_name((struct uci_section *)data)))
|
||||
return -1;
|
||||
|
||||
if (dmuci_set_value_by_section(dmmap_s, buf_instance, *instance))
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -595,14 +607,19 @@ static int delete_obj(char *refparam, struct dmctx *ctx, void *data, char *insta
|
|||
char *dm_parent = NULL;
|
||||
|
||||
dmuci_get_value_by_section_string(s, "dm_parent", &dm_parent);
|
||||
if (DM_STRLEN(dm_parent) && strcmp(section_name((struct uci_section *)data), dm_parent) == 0)
|
||||
dmuci_delete_by_section(s, NULL, NULL);
|
||||
if (DM_STRLEN(dm_parent) && strcmp(section_name((struct uci_section *)data), dm_parent) == 0) {
|
||||
if (dmuci_delete_by_section(s, NULL, NULL))
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
get_dmmap_section_of_config_section(json_object_get_string(dmmap_file), json_object_get_string(section_type), section_name((struct uci_section *)data), &dmmap_section);
|
||||
dmuci_delete_by_section(dmmap_section, NULL, NULL);
|
||||
if (dmuci_delete_by_section(dmmap_section, NULL, NULL))
|
||||
return -1;
|
||||
|
||||
if (dmuci_delete_by_section((struct uci_section *)data, NULL, NULL))
|
||||
return -1;
|
||||
|
||||
dmuci_delete_by_section((struct uci_section *)data, NULL, NULL);
|
||||
break;
|
||||
case DEL_ALL:
|
||||
uci_foreach_sections_safe(json_object_get_string(file), json_object_get_string(section_type), stmp, s) {
|
||||
|
|
@ -612,14 +629,18 @@ static int delete_obj(char *refparam, struct dmctx *ctx, void *data, char *insta
|
|||
char *dm_parent = NULL;
|
||||
|
||||
dmuci_get_value_by_section_string(ss, "dm_parent", &dm_parent);
|
||||
if (DM_STRLEN(dm_parent) && strcmp(section_name(s), dm_parent) == 0)
|
||||
dmuci_delete_by_section(ss, NULL, NULL);
|
||||
if (DM_STRLEN(dm_parent) && strcmp(section_name(s), dm_parent) == 0) {
|
||||
if (dmuci_delete_by_section(ss, NULL, NULL))
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
get_dmmap_section_of_config_section(json_object_get_string(dmmap_file), json_object_get_string(section_type), section_name(s), &dmmap_section);
|
||||
dmuci_delete_by_section(dmmap_section, NULL, NULL);
|
||||
if (dmuci_delete_by_section(dmmap_section, NULL, NULL))
|
||||
return -1;
|
||||
|
||||
dmuci_delete_by_section(s, NULL, NULL);
|
||||
if (dmuci_delete_by_section(s, NULL, NULL))
|
||||
return -1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -1293,7 +1314,7 @@ static int dm_validate_value(json_object *json_obj, char *value)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void uci_set_value(json_object *mapping_obj, int json_version, char *refparam, struct dmctx *ctx, const void *data, char *instance, char *value)
|
||||
static int uci_set_value(json_object *mapping_obj, int json_version, char *refparam, struct dmctx *ctx, const void *data, char *instance, char *value)
|
||||
{
|
||||
struct json_object *uci_obj = NULL;
|
||||
struct json_object *file = NULL;
|
||||
|
|
@ -1306,6 +1327,7 @@ static void uci_set_value(json_object *mapping_obj, int json_version, char *refp
|
|||
struct json_object *list_name = NULL;
|
||||
struct json_object *linker_jobj = NULL;
|
||||
char *linker = NULL;
|
||||
int res = 0;
|
||||
|
||||
json_object_object_get_ex(mapping_obj, "uci", &uci_obj);
|
||||
json_object_object_get_ex(uci_obj, "file", &file);
|
||||
|
|
@ -1337,11 +1359,16 @@ static void uci_set_value(json_object *mapping_obj, int json_version, char *refp
|
|||
|
||||
snprintf(buf, sizeof(buf), "dmmap_%s", json_object_get_string(file));
|
||||
get_dmmap_section_of_config_section(buf, json_object_get_string(type), section_name((struct uci_section *)data), &dmmap_section);
|
||||
dmuci_set_value_by_section(dmmap_section, "section_name", value);
|
||||
if (!dmmap_section)
|
||||
return -1;
|
||||
|
||||
if (dmuci_rename_section_by_section((struct uci_section *)data, value) == -1)
|
||||
dmuci_rename_section(json_object_get_string(file), uci_type, value);
|
||||
return;
|
||||
if (dmuci_set_value_by_section(dmmap_section, "section_name", value))
|
||||
return -1;
|
||||
|
||||
if ((res = dmuci_rename_section_by_section((struct uci_section *)data, value)))
|
||||
res = dmuci_rename_section(json_object_get_string(file), uci_type, value);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
if (option) {
|
||||
|
|
@ -1350,18 +1377,26 @@ static void uci_set_value(json_object *mapping_obj, int json_version, char *refp
|
|||
else
|
||||
linker = value;
|
||||
|
||||
if (dmuci_set_value_by_section((struct uci_section *)data, opt_temp, linker) == -1)
|
||||
dmuci_set_value(json_object_get_string(file), uci_type, opt_temp, linker);
|
||||
if ((res = dmuci_set_value_by_section((struct uci_section *)data, opt_temp, linker)))
|
||||
res = dmuci_set_value(json_object_get_string(file), uci_type, opt_temp, linker);
|
||||
} else {
|
||||
if (value != NULL) {
|
||||
if (dmuci_delete_by_section((struct uci_section *)data, opt_temp, NULL) == -1)
|
||||
dmuci_delete(json_object_get_string(file), uci_type, opt_temp, NULL);
|
||||
if ((res = dmuci_delete_by_section((struct uci_section *)data, opt_temp, NULL)))
|
||||
res = dmuci_delete(json_object_get_string(file), uci_type, opt_temp, NULL);
|
||||
|
||||
if (res)
|
||||
return -1;
|
||||
|
||||
char *p = strtok(value, ",");
|
||||
while (p) {
|
||||
strip_lead_trail_whitespace(p);
|
||||
if (dmuci_add_list_value_by_section((struct uci_section *)data, opt_temp, p) == -1)
|
||||
dmuci_add_list_value(json_object_get_string(file), uci_type, opt_temp, p);
|
||||
|
||||
if ((res = dmuci_add_list_value_by_section((struct uci_section *)data, opt_temp, p)))
|
||||
res = dmuci_add_list_value(json_object_get_string(file), uci_type, opt_temp, p);
|
||||
|
||||
if (res)
|
||||
return -1;
|
||||
|
||||
p = strtok(NULL, ",");
|
||||
}
|
||||
}
|
||||
|
|
@ -1373,22 +1408,31 @@ static void uci_set_value(json_object *mapping_obj, int json_version, char *refp
|
|||
else
|
||||
linker = value;
|
||||
|
||||
dmuci_set_value(json_object_get_string(file), json_object_get_string(section_name), opt_temp, linker);
|
||||
res = dmuci_set_value(json_object_get_string(file), json_object_get_string(section_name), opt_temp, linker);
|
||||
} else {
|
||||
if (value != NULL) {
|
||||
dmuci_delete(json_object_get_string(file), json_object_get_string(section_name), opt_temp, NULL);
|
||||
if (dmuci_delete(json_object_get_string(file), json_object_get_string(section_name), opt_temp, NULL))
|
||||
return -1;
|
||||
|
||||
char *p = strtok(value, ",");
|
||||
while (p) {
|
||||
strip_lead_trail_whitespace(p);
|
||||
dmuci_add_list_value(json_object_get_string(file), json_object_get_string(section_name), opt_temp, p);
|
||||
|
||||
if (dmuci_add_list_value(json_object_get_string(file), json_object_get_string(section_name), opt_temp, p))
|
||||
return -1;
|
||||
|
||||
p = strtok(NULL, ",");
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
res = -1;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static void ubus_set_value(json_object *mapping_obj, int json_version, char *refparam, struct dmctx *ctx, void *data, char *instance, char *value)
|
||||
static int ubus_set_value(json_object *mapping_obj, int json_version, char *refparam, struct dmctx *ctx, void *data, char *instance, char *value)
|
||||
{
|
||||
struct json_object *ubus_obj = NULL;
|
||||
struct json_object *object = NULL;
|
||||
|
|
@ -1398,6 +1442,7 @@ static void ubus_set_value(json_object *mapping_obj, int json_version, char *ref
|
|||
char buf_method[256] = {0};
|
||||
struct ubus_arg u_args[16] = {0};
|
||||
int u_args_size = 0;
|
||||
int res = 0;
|
||||
|
||||
int nbr_instances = get_number_of_instances(refparam);
|
||||
|
||||
|
|
@ -1415,12 +1460,14 @@ static void ubus_set_value(json_object *mapping_obj, int json_version, char *ref
|
|||
if (args)
|
||||
u_args_size = fill_ubus_arguments(ctx, data, instance, value, nbr_instances, json_version, args, u_args);
|
||||
|
||||
dmubus_call_set(buf_object, buf_method, u_args, u_args_size);
|
||||
res = dmubus_call_set(buf_object, buf_method, u_args, u_args_size);
|
||||
|
||||
free_ubus_arguments(u_args, u_args_size);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static void uci_v1_set_value(json_object *mapping_obj, int json_version, char *refparam, struct dmctx *ctx, void *data, char *instance, char *value)
|
||||
static int uci_v1_set_value(json_object *mapping_obj, int json_version, char *refparam, struct dmctx *ctx, void *data, char *instance, char *value)
|
||||
{
|
||||
struct json_object *data_s = NULL;
|
||||
struct json_object *key = NULL;
|
||||
|
|
@ -1428,28 +1475,28 @@ static void uci_v1_set_value(json_object *mapping_obj, int json_version, char *r
|
|||
json_object_object_get_ex(mapping_obj, "data", &data_s);
|
||||
json_object_object_get_ex(mapping_obj, "key", &key);
|
||||
|
||||
if (data == NULL || data_s == NULL || (data_s && strcmp(json_object_get_string(data_s), "@Parent") != 0))
|
||||
return;
|
||||
if (data == NULL || key == NULL || data_s == NULL || strcmp(json_object_get_string(data_s), "@Parent") != 0)
|
||||
return -1;
|
||||
|
||||
return dmuci_set_value_by_section((struct uci_section *)data, json_object_get_string(key), value);
|
||||
|
||||
if (key) {
|
||||
dmuci_set_value_by_section((struct uci_section *)data, json_object_get_string(key), value);
|
||||
}
|
||||
}
|
||||
|
||||
static void set_value_from_mapping(json_object *param_obj, int json_version, char *refparam, struct dmctx *ctx, void *data, char *instance, char *value)
|
||||
static int set_value_from_mapping(json_object *param_obj, int json_version, char *refparam, struct dmctx *ctx, void *data, char *instance, char *value)
|
||||
{
|
||||
struct json_object *type_obj = NULL, *mapping_arr = NULL, *mapping = NULL;
|
||||
int res = 0;
|
||||
|
||||
if (!param_obj)
|
||||
return;
|
||||
return -1;
|
||||
|
||||
json_object_object_get_ex(param_obj, "type", &type_obj);
|
||||
if (!type_obj)
|
||||
return;
|
||||
return -1;
|
||||
|
||||
char *type = json_object_get_string(type_obj);
|
||||
if (!type)
|
||||
return;
|
||||
return -1;
|
||||
|
||||
if (DM_LSTRCMP(type, "boolean") == 0) {
|
||||
value = dmuci_string_to_boolean(value) ? "1" : "0";
|
||||
|
|
@ -1469,16 +1516,21 @@ static void set_value_from_mapping(json_object *param_obj, int json_version, cha
|
|||
continue;
|
||||
|
||||
if (type && strcmp(json_object_get_string(type), "uci") == 0)
|
||||
uci_set_value(mapping, json_version, refparam, ctx, data, instance, value);
|
||||
res = uci_set_value(mapping, json_version, refparam, ctx, data, instance, value);
|
||||
else if (type && strcmp(json_object_get_string(type), "ubus") == 0)
|
||||
ubus_set_value(mapping, json_version, refparam, ctx, data, instance, value);
|
||||
res = ubus_set_value(mapping, json_version, refparam, ctx, data, instance, value);
|
||||
else if (type && strcmp(json_object_get_string(type), "uci_sec") == 0 && json_version == JSON_VERSION_1)
|
||||
uci_v1_set_value(mapping, json_version, refparam, ctx, data, instance, value);
|
||||
res = uci_v1_set_value(mapping, json_version, refparam, ctx, data, instance, value);
|
||||
else
|
||||
return;
|
||||
res = -1;
|
||||
|
||||
if (res)
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static int setvalue_param(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
|
||||
|
|
@ -1503,7 +1555,8 @@ static int setvalue_param(char *refparam, struct dmctx *ctx, void *data, char *i
|
|||
return FAULT_9007;
|
||||
break;
|
||||
case VALUESET:
|
||||
set_value_from_mapping(param_obj, json_version, refparam, ctx, data, instance, value);
|
||||
if (set_value_from_mapping(param_obj, json_version, refparam, ctx, data, instance, value))
|
||||
return FAULT_9007;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -336,11 +336,7 @@ struct uci_section *get_origin_section_from_config(char *package, char *section_
|
|||
struct uci_section *s = NULL;
|
||||
|
||||
uci_foreach_sections(package, section_type, s) {
|
||||
char sec_name[128] = {0};
|
||||
|
||||
dmuci_replace_invalid_characters_from_section_name(orig_section_name, sec_name, sizeof(sec_name));
|
||||
|
||||
if (strcmp(section_name(s), sec_name) == 0)
|
||||
if (strcmp(section_name(s), orig_section_name) == 0)
|
||||
return s;
|
||||
}
|
||||
|
||||
|
|
@ -353,12 +349,10 @@ struct uci_section *get_dup_section_in_dmmap(char *dmmap_package, char *section_
|
|||
|
||||
uci_path_foreach_sections(bbfdm, dmmap_package, section_type, s) {
|
||||
char *dmmap_sec_name = NULL;
|
||||
char sec_name[128] = {0};
|
||||
|
||||
dmuci_get_value_by_section_string(s, "section_name", &dmmap_sec_name);
|
||||
dmuci_replace_invalid_characters_from_section_name(dmmap_sec_name, sec_name, sizeof(sec_name));
|
||||
|
||||
if (DM_STRCMP(sec_name, orig_section_name) == 0)
|
||||
if (DM_STRCMP(dmmap_sec_name, orig_section_name) == 0)
|
||||
return s;
|
||||
}
|
||||
|
||||
|
|
@ -725,6 +719,35 @@ unsigned char isdigit_str(char *str)
|
|||
return ((*(str-1)) ? 0 : 1);
|
||||
}
|
||||
|
||||
bool special_char(char c)
|
||||
{
|
||||
if ((c >= 'a' && c <= 'z') ||
|
||||
(c >= 'A' && c <= 'Z') ||
|
||||
(c >= '0' && c <= '9') ||
|
||||
(c == '_'))
|
||||
return false;
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
bool special_char_exits(const char *str)
|
||||
{
|
||||
if (!DM_STRLEN(str))
|
||||
return false;
|
||||
|
||||
while (!special_char(*str++));
|
||||
|
||||
return (*(str-1)) ? true : false;
|
||||
}
|
||||
|
||||
void replace_special_char(char *str, char c)
|
||||
{
|
||||
for (int i = 0; i < DM_STRLEN(str); i++) {
|
||||
if (special_char(str[i]))
|
||||
str[i] = c;
|
||||
}
|
||||
}
|
||||
|
||||
static inline int isword_delim(char c)
|
||||
{
|
||||
if (c == ' ' ||
|
||||
|
|
|
|||
|
|
@ -226,6 +226,9 @@ __attribute__ ((deprecated)) int is_section_unnamed(char *section_name);
|
|||
__attribute__ ((deprecated)) void delete_sections_save_next_sections(char* dmmap_package, char *section_type, char *instancename, char *section_name, int instance, struct list_head *dup_list);
|
||||
__attribute__ ((deprecated)) void update_dmmap_sections(struct list_head *dup_list, char *instancename, char* dmmap_package, char *section_type);
|
||||
unsigned char isdigit_str(char *str);
|
||||
bool special_char(char c);
|
||||
bool special_char_exits(const char *str);
|
||||
void replace_special_char(char *str, char c);
|
||||
char *dm_strword(char *src, char *str);
|
||||
char **strsplit(const char* str, const char* delim, size_t* numtokens);
|
||||
char **strsplit_by_str(const char str[], char *delim);
|
||||
|
|
|
|||
|
|
@ -579,11 +579,11 @@ int dmuci_delete(char *package, char *section, char *option, char *value)
|
|||
int dmuci_rename_section(char *package, char *section, char *value)
|
||||
{
|
||||
struct uci_ptr ptr = {0};
|
||||
char sec_name[128] = {0};
|
||||
|
||||
dmuci_replace_invalid_characters_from_section_name(value, sec_name, sizeof(sec_name));
|
||||
if (special_char_exits(value))
|
||||
return -1;
|
||||
|
||||
if (dmuci_lookup_ptr(uci_ctx, &ptr, package, section, NULL, sec_name))
|
||||
if (dmuci_lookup_ptr(uci_ctx, &ptr, package, section, NULL, value))
|
||||
return -1;
|
||||
|
||||
if (uci_rename(uci_ctx, &ptr) != UCI_OK)
|
||||
|
|
@ -777,11 +777,11 @@ int dmuci_del_list_value_by_section(struct uci_section *s, char *option, char *v
|
|||
int dmuci_rename_section_by_section(struct uci_section *s, char *value)
|
||||
{
|
||||
struct uci_ptr up = {0};
|
||||
char sec_name[128] = {0};
|
||||
|
||||
dmuci_replace_invalid_characters_from_section_name(value, sec_name, sizeof(sec_name));
|
||||
if (special_char_exits(value))
|
||||
return -1;
|
||||
|
||||
if (dmuci_lookup_ptr_by_section(uci_ctx, &up, s, NULL, sec_name) == -1)
|
||||
if (dmuci_lookup_ptr_by_section(uci_ctx, &up, s, NULL, value) == -1)
|
||||
return -1;
|
||||
|
||||
if (uci_rename(uci_ctx, &up) != UCI_OK)
|
||||
|
|
@ -921,20 +921,3 @@ bool dmuci_string_to_boolean(char *value)
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
void dmuci_replace_invalid_characters_from_section_name(char *old_sec_name, char *new_sec_name, size_t len)
|
||||
{
|
||||
*new_sec_name = 0;
|
||||
|
||||
if (!DM_STRLEN(old_sec_name))
|
||||
return;
|
||||
|
||||
DM_STRNCPY(new_sec_name, old_sec_name, len);
|
||||
|
||||
for (int i = 0; i < DM_STRLEN(new_sec_name); i++) {
|
||||
|
||||
// Replace all {'.' or '-'} with '_'
|
||||
if (new_sec_name[i] == '.' || new_sec_name[i] == '-')
|
||||
new_sec_name[i] = '_';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -390,7 +390,6 @@ int dmuci_get_option_value_string_varstate(char *package, char *section, char *o
|
|||
int dmuci_set_value_varstate(char *package, char *section, char *option, char *value);
|
||||
|
||||
bool dmuci_string_to_boolean(char *value);
|
||||
void dmuci_replace_invalid_characters_from_section_name(char *old_sec_name, char *new_sec_name, size_t len);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue