mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bbf: Operate commands exposed from json file not working properly

Browse source
This commit is contained in:
Amin Ben Ramdhane 2022-02-18 14:36:06 +01:00
parent 1e22e16628
commit 9197f483bc
2 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dmdynamicjson.c
View file

@ -827,6 +827,8 @@ static int ubus_set_operate(json_object *mapping_obj, int json_version, char *re
struct json_object *ubus_obj = NULL;
struct json_object *object = NULL;
struct json_object *method = NULL;
struct json_object *args = NULL;
struct json_object *in_args = NULL;
struct json_object *res = NULL;
char buf_object[256] = {0};
char buf_method[256] = {0};
@ -836,6 +838,7 @@ static int ubus_set_operate(json_object *mapping_obj, int json_version, char *re
json_object_object_get_ex(mapping_obj, "ubus", &ubus_obj);
json_object_object_get_ex(ubus_obj, "object", &object);
json_object_object_get_ex(ubus_obj, "method", &method);
json_object_object_get_ex(ubus_obj, "args", &args);
if (object)
resolve_all_symbols(ctx, data, instance, "", nbr_instances, json_version, json_object_get_string(object), buf_object, sizeof(buf_object));
@ -843,7 +846,23 @@ static int ubus_set_operate(json_object *mapping_obj, int json_version, char *re
if (method)
resolve_all_symbols(ctx, data, instance, "", nbr_instances, json_version, json_object_get_string(method), buf_method, sizeof(buf_method));
dmubus_operate_blob_set(buf_object, buf_method, value, &res);
if (args) {
struct ubus_arg u_args[16] = {0};
int u_args_size = fill_ubus_arguments(ctx, data, instance, "", nbr_instances, json_version, args, u_args);
if (u_args_size != 0) {
in_args = json_object_new_object();
for (int i = 0; i < u_args_size; i++)
json_object_object_add(in_args, u_args[i].key, json_object_new_string(u_args[i].val));
}
}
dmubus_operate_blob_set(buf_object, buf_method, in_args, &res);
if (in_args)
json_object_put(in_args);
if (res) {
json_object_object_foreach(res, key, val) {

23
test/files/etc/bbfdm/json/index.json
View file

@ -108,6 +108,29 @@
}
}
]
},
"Reboot()": {
"type": "command",
"async": true,
"version" : "2.12",
"protocols": [
"usp"
],
"input": {},
"output": {},
"mapping": [
{
"type" : "ubus",
"ubus" : {
"object" : "proxd",
"method" : "get",
"args":{
"path": "Device.ProxiedDevice.{i}.MiniHub.{i}.DeviceInfo.",
"action": "Reboot()"
}
}
}
]
}
}
}