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

bbfdmd: append first 'obj_path' entry to requested path to select which micro-service to call

Browse source
This commit is contained in:
Amin Ben Romdhane 2025-10-22 16:58:40 +02:00 • committed by Vivek Dutta
parent 165deef400
commit 5bf5ca62ed
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bbfdmd/ubus/bbfdmd.c
View file

@ -248,7 +248,7 @@ static void bbfdm_handle_schema_request(struct ubus_context *ctx, struct ubus_re
static const struct blobmsg_policy bbfdm_policy[] = {
[BBFDM_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
[BBFDM_VALUE] = { .name = "value", .type = BLOBMSG_TYPE_STRING },
[BBFDM_OBJ_PATH] = { .name = "obj_path", .type = BLOBMSG_TYPE_TABLE },
[BBFDM_INPUT] = { .name = "optional", .type = BLOBMSG_TYPE_TABLE}
};
@ -329,6 +329,7 @@ static int bbfdm_handler_sync(struct ubus_context *ctx, struct ubus_object *obj,
unsigned int requested_proto = BBFDMD_BOTH;
bool raw_format = false;
struct blob_buf bb = {0};
int pos = 0;
if (blobmsg_parse(bbfdm_policy, __BBFDM_MAX, tb, blob_data(msg), blob_len(msg))) {
BBFDM_WARNING("Failed to parse input message");
@ -342,13 +343,26 @@ static int bbfdm_handler_sync(struct ubus_context *ctx, struct ubus_object *obj,
BBFDM_INFO("ubus method|%s|, name|%s|", method, obj->name);
snprintf(requested_path, sizeof(requested_path), "%s", blobmsg_get_string(tb[BBFDM_PATH]));
pos = snprintf(requested_path, sizeof(requested_path), "%s", blobmsg_get_string(tb[BBFDM_PATH]));
memset(&bb, 0, sizeof(struct blob_buf));
blob_buf_init(&bb, 0);
fill_optional_input(tb[BBFDM_INPUT], &requested_proto, &raw_format);
if (tb[BBFDM_OBJ_PATH]) {
/* If 'obj_path' is provided, extend the requested_path
* by appending the name of the first entry in 'obj_path' table
*/
struct blob_attr *attr;
attr = (struct blob_attr *)blobmsg_data(tb[BBFDM_OBJ_PATH]);
if (attr) {
const char *extra_path = blobmsg_name(attr);
snprintf(requested_path + pos, sizeof(requested_path) - pos, "%s", extra_path ? extra_path : "");
}
}
list_for_each_entry(service, &registered_services, list) {
if (service->is_blacklisted)

2
bbfdmd/ubus/get.h
View file

@ -14,7 +14,7 @@
enum {
BBFDM_PATH,
BBFDM_VALUE,
BBFDM_OBJ_PATH,
BBFDM_INPUT,
__BBFDM_MAX
};