01d0f1a566
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>
88 lines
2.2 KiB
C
88 lines
2.2 KiB
C
/*
|
|
* Copyright 2023 NXP
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/sys/byteorder.h>
|
|
#include <zephyr/types.h>
|
|
#include <zephyr/bluetooth/bluetooth.h>
|
|
#include <zephyr/bluetooth/audio/audio.h>
|
|
#include <zephyr/bluetooth/audio/pbp.h>
|
|
#include <zephyr/logging/log.h>
|
|
#include <zephyr/sys/check.h>
|
|
|
|
LOG_MODULE_REGISTER(bt_pbp, CONFIG_BT_PBP_LOG_LEVEL);
|
|
|
|
int bt_pbp_get_announcement(const uint8_t meta[], size_t meta_len,
|
|
enum bt_pbp_announcement_feature features,
|
|
struct net_buf_simple *pba_data_buf)
|
|
{
|
|
CHECKIF(pba_data_buf == NULL) {
|
|
LOG_DBG("No buffer provided for advertising data!\n");
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
CHECKIF((meta == NULL && meta_len != 0) || (meta != NULL && meta_len == 0)) {
|
|
LOG_DBG("Invalid metadata combination: %p %zu", meta, meta_len);
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
CHECKIF(pba_data_buf->size < (meta_len + BT_PBP_MIN_PBA_SIZE)) {
|
|
LOG_DBG("Buffer size needs to be at least %d!\n", meta_len + BT_PBP_MIN_PBA_SIZE);
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
/* Fill Announcement data */
|
|
net_buf_simple_add_le16(pba_data_buf, BT_UUID_PBA_VAL);
|
|
net_buf_simple_add_u8(pba_data_buf, features);
|
|
net_buf_simple_add_u8(pba_data_buf, meta_len);
|
|
net_buf_simple_add_mem(pba_data_buf, meta, meta_len);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int bt_pbp_parse_announcement(struct bt_data *data, enum bt_pbp_announcement_feature *features,
|
|
uint8_t **meta)
|
|
{
|
|
struct bt_uuid_16 adv_uuid;
|
|
struct net_buf_simple buf;
|
|
uint8_t meta_len = 0;
|
|
void *uuid;
|
|
|
|
CHECKIF(!data || !features || !meta) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (data->type != BT_DATA_SVC_DATA16) {
|
|
return -ENOENT;
|
|
}
|
|
|
|
if (data->data_len < BT_PBP_MIN_PBA_SIZE) {
|
|
return -EMSGSIZE;
|
|
}
|
|
|
|
net_buf_simple_init_with_data(&buf, (void *)data->data, data->data_len);
|
|
uuid = net_buf_simple_pull_mem(&buf, BT_UUID_SIZE_16);
|
|
|
|
(void)bt_uuid_create(&adv_uuid.uuid, uuid, BT_UUID_SIZE_16); /* cannot fail */
|
|
|
|
if (bt_uuid_cmp(&adv_uuid.uuid, BT_UUID_PBA)) {
|
|
return -ENOENT;
|
|
}
|
|
|
|
/* Copy source features, metadata length and metadata from the Announcement */
|
|
*features = net_buf_simple_pull_u8(&buf);
|
|
meta_len = net_buf_simple_pull_u8(&buf);
|
|
if (buf.len < meta_len) {
|
|
return -EBADMSG;
|
|
}
|
|
|
|
*meta = (uint8_t *)net_buf_simple_pull_mem(&buf, meta_len);
|
|
|
|
return meta_len;
|
|
}
|