bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: PACS: Do not use conn struct directly

Browse Source 
Instead of using the bt_conn struct directly, only
access the field via the public API. This ensures that
changes to the struct won't affect PACS, unless it also
affects the public API.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2025-01-31 12:19:18 +01:00 committed by Benjamin Cabé
parent 80f62dd6af
commit 3e9b45440f
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
subsys/bluetooth/audio/pacs.c
View File

@ -25,7 +25,6 @@
#include <zephyr/bluetooth/conn.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/bluetooth/uuid.h>
#include <zephyr/device.h>
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
@ -38,8 +37,7 @@
#include <zephyr/sys/util.h>
#include <zephyr/sys/util_macro.h>
#include "../host/conn_internal.h"
#include "../host/hci_core.h"
#include "host/hci_core.h"
#include "common/bt_str.h"
#include "audio_internal.h"
@ -102,11 +100,11 @@ struct pacs_client {
#endif /* CONFIG_BT_PAC_SRC */
/* Pending notification flags */
ATOMIC_DEFINE(flags, PACS_FLAG_NUM);
ATOMIC_DEFINE(flags, FLAG_NUM);
};
static struct pacs {
ATOMIC_DEFINE(flags, BT_ADV_NUM_FLAGS);
ATOMIC_DEFINE(flags, PACS_FLAG_NUM);
struct pacs_client clients[CONFIG_BT_MAX_PAIRED];
} pacs;
@ -272,7 +270,7 @@ static ssize_t available_contexts_read(struct bt_conn *conn,
pacs_get_available_contexts_for_conn(conn, BT_AUDIO_DIR_SOURCE)),
};
LOG_DBG("conn %p attr %p buf %p len %u offset %u", conn, attr, buf, len, offset);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", (void *)conn, attr, buf, len, offset);
return bt_gatt_attr_read(conn, attr, buf, len, offset, &context,
sizeof(context));
@ -317,7 +315,7 @@ static ssize_t supported_context_read(struct bt_conn *conn,
.src = sys_cpu_to_le16(supported_context_get(BT_AUDIO_DIR_SOURCE)),
};
LOG_DBG("conn %p attr %p buf %p len %u offset %u", conn, attr, buf, len, offset);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", (void *)conn, attr, buf, len, offset);
return bt_gatt_attr_read(conn, attr, buf, len, offset, &context,
sizeof(context));
@ -384,7 +382,7 @@ static ssize_t snk_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
ssize_t ret_val;
int err;
LOG_DBG("conn %p attr %p buf %p len %u offset %u", conn, attr, buf, len, offset);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", (void *)conn, attr, buf, len, offset);
err = k_sem_take(&read_buf_sem, READ_BUF_SEM_TIMEOUT);
if (err != 0) {
@ -420,7 +418,7 @@ static ssize_t snk_loc_read(struct bt_conn *conn,
{
uint32_t location = sys_cpu_to_le32(pacs_snk_location);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", conn, attr, buf, len, offset);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", (void *)conn, attr, buf, len, offset);
return bt_gatt_attr_read(conn, attr, buf, len, offset, &location,
sizeof(location));
@ -491,7 +489,7 @@ static ssize_t src_read(struct bt_conn *conn, const struct bt_gatt_attr *attr,
ssize_t ret_val;
int err;
LOG_DBG("conn %p attr %p buf %p len %u offset %u", conn, attr, buf, len, offset);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", (void *)conn, attr, buf, len, offset);
err = k_sem_take(&read_buf_sem, READ_BUF_SEM_TIMEOUT);
if (err != 0) {
@ -527,7 +525,7 @@ static ssize_t src_loc_read(struct bt_conn *conn,
{
uint32_t location = sys_cpu_to_le32(pacs_src_location);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", conn, attr, buf, len, offset);
LOG_DBG("conn %p attr %p buf %p len %u offset %u", (void *)conn, attr, buf, len, offset);
return bt_gatt_attr_read(conn, attr, buf, len, offset, &location,
sizeof(location));
@ -1162,15 +1160,24 @@ static void pacs_bond_deleted(uint8_t id, const bt_addr_le_t *peer)
}
static void pacs_security_changed(struct bt_conn *conn, bt_security_t level,
enum bt_security_err err)
enum bt_security_err sec_err)
{
struct bt_conn_info info;
int err;
LOG_DBG("%s changed security level to %d", bt_addr_le_str(bt_conn_get_dst(conn)), level);
if (err != 0 || conn->encrypt == 0) {
if (sec_err != BT_SECURITY_ERR_SUCCESS || level <= BT_SECURITY_L1) {
return;
}
if (!bt_addr_le_is_bonded(conn->id, &conn->le.dst)) {
err = bt_conn_get_info(conn, &info);
if (err < 0) {
__ASSERT_NO_MSG(false);
return;
}
if (!bt_addr_le_is_bonded(info.id, info.le.dst)) {
return;
}
@ -1225,7 +1232,7 @@ static void pacs_disconnected(struct bt_conn *conn, uint8_t reason)
#endif /* CONFIG_BT_PAC_SRC */
}
static struct bt_conn_cb conn_callbacks = {
BT_CONN_CB_DEFINE(conn_callbacks) = {
.security_changed = pacs_security_changed,
.disconnected = pacs_disconnected,
};
@ -1295,7 +1302,6 @@ int bt_pacs_cap_register(enum bt_audio_dir dir, struct bt_pacs_cap *cap)
sys_slist_append(pac, &cap->_node);
if (!callbacks_registered) {
bt_conn_cb_register(&conn_callbacks);
bt_conn_auth_info_cb_register(&auth_callbacks);
callbacks_registered = true;