michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: samples: Fix iso_connected_benchmark disconnect

Browse source 
The disconnect handling of ACL connects in the sample was done
incorrect, and caused a call to bt_conn_unref with a NULL
pointer.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2021-08-04 12:05:04 +02:00 • committed by Anas Nashif
commit 891d838140
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
samples/bluetooth/iso_connected_benchmark/src/main.c
View file

@ -409,6 +409,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
LOG_INF("Disconnected: %s (reason 0x%02x)", addr, reason); LOG_INF("Disconnected: %s (reason 0x%02x)", addr, reason);
bt_conn_unref(default_conn);
default_conn = NULL; default_conn = NULL;
k_sem_give(&sem_disconnected); k_sem_give(&sem_disconnected);
@ -847,7 +848,11 @@ static int cleanup(void)
return err; return err;
} }
bt_conn_unref(default_conn); err = k_sem_take(&sem_disconnected, K_FOREVER);
if (err != 0) {
LOG_ERR("failed to take sem_disconnected: %d", err);
return err;
}
} /* else ACL already disconnected */ } /* else ACL already disconnected */
return err; return err;
@ -894,8 +899,6 @@ static int run_central(void)
return err; return err;
} }
bt_conn_unref(default_conn);
for (int i = 0; i < cig_create_param.num_cis; i++) { for (int i = 0; i < cig_create_param.num_cis; i++) {
err = k_sem_take(&sem_iso_disconnected, K_FOREVER); err = k_sem_take(&sem_iso_disconnected, K_FOREVER);
if (err != 0) { if (err != 0) {
@ -978,8 +981,6 @@ static int run_peripheral(void)
return err; return err;
} }
bt_conn_unref(default_conn);
for (int i = 0; i < cig_create_param.num_cis; i++) { for (int i = 0; i < cig_create_param.num_cis; i++) {
err = k_sem_take(&sem_iso_disconnected, K_FOREVER); err = k_sem_take(&sem_iso_disconnected, K_FOREVER);
if (err != 0) { if (err != 0) {