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

Flags array is missing in get commands

Browse source
This commit is contained in:
Amin Ben Romdhane 2025-02-24 13:58:50 +01:00
parent 35faf181a9
commit 0ad7ad1021
2 changed files with 37 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
bbfdmd/ubus/get.c
View file

@ -41,16 +41,42 @@ static void free_linker_entries(struct async_request_context *ctx)
}
}
static void fill_blob_param(struct blob_buf *bb, const char *path, const char *data, const char *type)
static bool is_reference_value(struct blob_attr *flags)
{
struct blob_attr *flag = NULL;
int rem = 0;
if (!flags || blobmsg_type(flags) != BLOBMSG_TYPE_ARRAY)
return false;
blobmsg_for_each_attr(flag, flags, rem) {
if (strcmp(blobmsg_get_string(flag), "Reference") == 0)
return true;
}
return false;
}
static void fill_blob_param(struct blob_buf *bb, struct blob_attr *path, const char *data, struct blob_attr *type, struct blob_attr *flags)
{
if (!bb || !path || !data || !type)
return;
void *table = blobmsg_open_table(bb, NULL);
blobmsg_add_string(bb, "path", path);
if (path) {
blobmsg_add_field(bb, blobmsg_type(path), blobmsg_name(path), blobmsg_data(path), blobmsg_len(path));
}
blobmsg_add_string(bb, "data", data);
blobmsg_add_string(bb, "type", type);
if (type) {
blobmsg_add_field(bb, blobmsg_type(type), blobmsg_name(type), blobmsg_data(type), blobmsg_len(type));
}
if (flags) {
blobmsg_add_field(bb, blobmsg_type(flags), blobmsg_name(flags), blobmsg_data(flags), blobmsg_len(flags));
}
blobmsg_close_table(bb, table);
}
@ -140,22 +166,18 @@ static void prepare_and_send_response(struct async_request_context *ctx)
{ "path", BLOBMSG_TYPE_STRING },
{ "data", BLOBMSG_TYPE_STRING },
{ "type", BLOBMSG_TYPE_STRING },
{ "reference", BLOBMSG_TYPE_BOOL },
{ "flags", BLOBMSG_TYPE_ARRAY },
};
blobmsg_parse(policy, 4, fields, blobmsg_data(attr), blobmsg_len(attr));
bool is_reference = fields[3] ? blobmsg_get_u8(fields[3]) : false;
if (is_reference) {
if (is_reference_value(fields[3])) {
char buffer[1024] = {0};
char *path = fields[0] ? blobmsg_get_string(fields[0]) : "";
char *data = fields[1] ? blobmsg_get_string(fields[1]) : "";
char *type = fields[2] ? blobmsg_get_string(fields[2]) : "";
resolve_reference_path(ctx, data, buffer, sizeof(buffer));
fill_blob_param(&bb, path, buffer, type);
fill_blob_param(&bb, fields[0], buffer, fields[2], fields[3]);
} else {
blobmsg_add_blob(&bb, attr);
}

10
libbbfdm-api/legacy/dmbbf.c
View file

@ -662,18 +662,18 @@ static void bb_add_flags_arr(struct blob_buf *bb, uint32_t dm_flags)
if (!bb || !dm_flags)
return;
//void *flags_arr = blobmsg_open_array(bb, "flags");
void *flags_arr = blobmsg_open_array(bb, "flags");
if (dm_flags & DM_FLAG_REFERENCE)
blobmsg_add_u8(bb, "reference", true);
/*if (dm_flags & DM_FLAG_UNIQUE)
blobmsg_add_string(bb, NULL, "Reference");
if (dm_flags & DM_FLAG_UNIQUE)
blobmsg_add_string(bb, NULL, "Unique");
if (dm_flags & DM_FLAG_LINKER)
blobmsg_add_string(bb, NULL, "Linker");
if (dm_flags & DM_FLAG_SECURE)
blobmsg_add_string(bb, NULL, "Secure");*/
blobmsg_add_string(bb, NULL, "Secure");
//blobmsg_close_array(bb, flags_arr);
blobmsg_close_array(bb, flags_arr);
}
void fill_blob_param(struct blob_buf *bb, const char *path, const char *data, const char *type, uint32_t dm_flags)