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

Add support for linker in json plugin v2

Browse source
This commit is contained in:
Vivek Kumar Dutta 2024-03-07 12:21:25 +05:30
parent 1228d2bc75
commit 45a5ba0c08
1 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libbbfdm-api/plugin/json_plugin.c
View file

@ -875,23 +875,35 @@ static char *ubus_get_value(json_object *mapping_obj, int json_version, char *re
static char *uci_v1_get_value(json_object *mapping_obj, char *refparam, struct dmctx *ctx, void *data, char *instance)
{
struct json_object *data_s = NULL;
struct json_object *key = NULL;
struct json_object *key = NULL, *linker_jobj = NULL;
char *value = "";
json_object_object_get_ex(mapping_obj, "data", &data_s);
json_object_object_get_ex(mapping_obj, "key", &key);
json_object_object_get_ex(mapping_obj, "linker_obj", &linker_jobj);
if (data == NULL || data_s == NULL || (data_s && strcmp(json_object_get_string(data_s), "@Parent") != 0))
goto end;
if (key) {
if (strcmp(json_object_get_string(key), "@Name") == 0) {
dmuci_get_section_name(section_name(((struct dm_data *)data)->config_section), &value);
} else if (strstr(refparam, ".Alias")) {
bbf_get_alias(ctx, ((struct dm_data *)data)->dmmap_section, json_object_get_string(key), instance, &value);
} else {
dmuci_get_value_by_section_string(((struct dm_data *)data)->config_section, json_object_get_string(key), &value);
char *res = NULL;
dmuci_get_value_by_section_string(((struct dm_data *)data)->config_section, json_object_get_string(key), &res);
if (linker_jobj) {
char *link = json_object_get_string(linker_jobj);
char *linker = NULL;
linker = replace_str(link, "{BBF_VENDOR_PREFIX}", BBF_VENDOR_PREFIX, NULL, 0);
adm_entry_get_reference_param(ctx, linker, res, &value);
FREE(linker);
} else {
value = res;
}
}
}
@ -903,19 +915,31 @@ static char *ubus_v1_get_value(json_object *mapping_obj, char *refparam, struct
{
struct json_object *data_json = NULL;
struct json_object *key = NULL;
struct json_object *linker_jobj = NULL;
char *value = "";
json_object_object_get_ex(mapping_obj, "data", &data_json);
json_object_object_get_ex(mapping_obj, "key", &key);
json_object_object_get_ex(mapping_obj, "linker_obj", &linker_jobj);
if (data == NULL || data_json == NULL || (data_json && strcmp(json_object_get_string(data_json), "@Parent") != 0))
goto end;
if (key) {
char key_name[128] = {32};
char key_name[128] = {32}, *res = NULL;
json_object *json_obj = get_requested_json_obj(((struct dm_data *)data)->json_object, instance, json_object_get_string(key), key_name, sizeof(key_name));
value = dmjson_get_value(json_obj, 1, key_name);
res = dmjson_get_value(json_obj, 1, key_name);
if (linker_jobj) {
char *link = json_object_get_string(linker_jobj);
char *linker = NULL;
linker = replace_str(link, "{BBF_VENDOR_PREFIX}", BBF_VENDOR_PREFIX, NULL, 0);
adm_entry_get_reference_param(ctx, linker, res, &value);
FREE(linker);
} else {
value = res;
}
}
end: