Skip to content

nimble/host: Fix the iso connection handle type #2217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MariuszSkamra wants to merge 3 commits into
base: master
Choose a base branch
from
+41 −25
Open

nimble/host: Fix the iso connection handle type #2217

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c3e6ad
nimble/host: Fix the iso connection handle type
MariuszSkamra Apr 29, 2026
5af99a7
nimble/host: Fix uninitialized ISO conn handle
MariuszSkamra Apr 29, 2026
cdb4bfb
nimble/host: Refactor ble_iso_big_conn_handles_init
MariuszSkamra Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 41 additions & 25 deletions nimble/host/src/ble_iso.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,6 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif

#define ble_iso_big_conn_handles_init(_big, _handles, _num_handles) \
do { \
struct ble_iso_conn *conn = SLIST_FIRST(&ble_iso_conns); \
\
for (uint8_t i = 0; i < (_num_handles); i++) { \
while (conn != NULL) { \
if (conn->type == BLE_ISO_CONN_BIS) { \
struct ble_iso_bis *bis; \
\
bis = CONTAINER_OF(conn, struct ble_iso_bis, conn); \
if (bis->big == (_big)) { \
conn->handle = le16toh((_handles)[i]); \
conn = SLIST_NEXT(conn, next); \
break; \
} \
} \
\
conn = SLIST_NEXT(conn, next); \
} \
} \
} while (0);

enum ble_iso_conn_type {
BLE_ISO_CONN_BIS,
};
Expand All @@ -73,7 +51,7 @@ struct ble_iso_big {
struct ble_iso_conn {
SLIST_ENTRY(ble_iso_conn) next;
enum ble_iso_conn_type type;
uint8_t handle;
uint16_t handle;

struct ble_iso_rx_data_info rx_info;
struct os_mbuf *rx_buf;
Expand All @@ -96,6 +74,43 @@ static struct os_mempool ble_iso_bis_pool;
static os_membuf_t ble_iso_bis_mem[
OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_ISO_MAX_BISES), sizeof (struct ble_iso_bis))];

static int
ble_iso_big_conn_handles_set(struct ble_iso_big *big, const uint8_t *handles,
uint8_t num_handles)
{
struct ble_iso_conn *conn;
uint8_t assigned = 0;

assert(big != NULL);
assert(handles != NULL);
assert(num_handles > 0);

SLIST_FOREACH(conn, &ble_iso_conns, next) {
struct ble_iso_bis *bis;

if (assigned == num_handles) {
break;
}

if (conn->type != BLE_ISO_CONN_BIS) {
continue;
}

bis = CONTAINER_OF(conn, struct ble_iso_bis, conn);
if (bis->big != big) {
continue;
}

assert(conn->handle == BLE_HS_CONN_HANDLE_NONE);
conn->handle = get_le16(&handles[assigned * sizeof(uint16_t)]);
assigned++;
}

assert(assigned == num_handles);

return 0;
}

static void
ble_iso_conn_append(struct ble_iso_conn *conn)
{
Expand Down Expand Up @@ -184,6 +199,7 @@ ble_iso_bis_alloc(struct ble_iso_big *big)

memset(new_bis, 0, sizeof *new_bis);
new_bis->conn.type = BLE_ISO_CONN_BIS;
new_bis->conn.handle = BLE_HS_CONN_HANDLE_NONE;
new_bis->big = big;

ble_iso_conn_append(&new_bis->conn);
Expand Down Expand Up @@ -359,7 +375,7 @@ ble_iso_rx_create_big_complete(const struct ble_hci_ev_le_subev_create_big_compl
/* XXX: Should we destroy the group? */
}

ble_iso_big_conn_handles_init(big, ev->conn_handle, ev->num_bis);
ble_iso_big_conn_handles_set(big, (const uint8_t *)ev->conn_handle, ev->num_bis);

big->max_pdu = ev->max_pdu;

Expand Down Expand Up @@ -642,7 +658,7 @@ ble_iso_rx_big_sync_established(const struct ble_hci_ev_le_subev_big_sync_establ
/* XXX: Should we destroy the group? */
}

ble_iso_big_conn_handles_init(big, ev->conn_handle, ev->num_bis);
ble_iso_big_conn_handles_set(big, (const uint8_t *)ev->conn_handle, ev->num_bis);

event.big_sync_established.desc.big_handle = ev->big_handle;
event.big_sync_established.desc.transport_latency_big =
Expand Down
Loading