michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: PBP: Fix parsing and return issue with bt_pbp_parse_announcement

Browse source 
bt_pbp_parse_announcement was defined as uint8_t return value function,
but returned errno values, so it was modified to return an int instead.
The return values are also now more granular and documented.

The function also triggered a coverity issue with the way that it
parsed the data->data, as it would be marked as tainted. This should
be fixed by using the net_buf_simple API, which also improves on
some other parts of the code.

Finally the meta argument for the function was changed from an
unknown sized buffer, where the caller somehow had to know the
size of the metadata before calling the parsing function, to
an output pointer. This also omits the requirement for the
caller to always copy the metadata, where now it just
gets a pointer to the metadata in the bt_data struct. The application
can now always decide whether to continue to parse the metadata or
to copy it, using the pointer and the return value of the function.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2024-01-22 10:15:49 +01:00 • committed by Anas Nashif
commit 01d0f1a566
4 changed files with 49 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

19
samples/bluetooth/public_broadcast_sink/src/main.c
View file

@ -29,7 +29,6 @@
#define INVALID_BROADCAST_ID 0xFFFFFFFF
static bool pbs_found;
static uint8_t meta[CONFIG_BT_AUDIO_CODEC_CAP_MAX_METADATA_SIZE];
static K_SEM_DEFINE(sem_pa_synced, 0U, 1U);
static K_SEM_DEFINE(sem_base_received, 0U, 1U);
@ -160,11 +159,11 @@ static void sync_broadcast_pa(const struct bt_le_scan_recv_info *info,
static bool scan_check_and_sync_broadcast(struct bt_data *data, void *user_data)
{
enum bt_pbp_announcement_feature source_features;
uint32_t *broadcast_id = user_data;
struct bt_uuid_16 adv_uuid;
enum bt_pbp_announcement_feature source_features = 0U;
memset(meta, 0, ARRAY_SIZE(meta));
uint8_t *tmp_meta = NULL;
int ret;
if (data->type != BT_DATA_SVC_DATA16) {
return true;
@ -179,16 +178,18 @@ static bool scan_check_and_sync_broadcast(struct bt_data *data, void *user_data)
return true;
}
if (!bt_uuid_cmp(&adv_uuid.uuid, BT_UUID_PBA)) {
bt_pbp_parse_announcement(data, &source_features, meta);
ret = bt_pbp_parse_announcement(data, &source_features, &tmp_meta);
if (ret >= 0) {
if (!(source_features & BT_PBP_ANNOUNCEMENT_FEATURE_HIGH_QUALITY)) {
/* This is a Standard Quality Public Broadcast Audio stream */
printk("This is a Standard Quality Public Broadcast Audio stream\n");
pbs_found = false;
return true;
return false;
}
printk("Found Suitable Public Broadcast Announcement\n");
printk("Found Suitable Public Broadcast Announcement with %d octets of metadata\n",
ret);
pbs_found = true;
/**
@ -198,8 +199,6 @@ static bool scan_check_and_sync_broadcast(struct bt_data *data, void *user_data)
if (*broadcast_id == INVALID_BROADCAST_ID) {
return true;
}
return false;
}
return true;