Skip to content

Bluetooth: BAP: Fix bad state check for broadcast sink #80955

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

Merged
mmahadevan108 merged 1 commit into from
Nov 8, 2024
Merged

Bluetooth: BAP: Fix bad state check for broadcast sink #80955

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 12 additions & 17 deletions subsys/bluetooth/audio/bap_broadcast_sink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,31 +295,30 @@ static void broadcast_sink_iso_recv(struct bt_iso_chan *chan,
}
}

/** Gets the "highest" state of all BIS in the broadcast sink */
static enum bt_bap_ep_state broadcast_sink_get_state(struct bt_bap_broadcast_sink *sink)
static bool broadcast_sink_is_in_state(struct bt_bap_broadcast_sink *sink,
enum bt_bap_ep_state state)
{
enum bt_bap_ep_state state = BT_BAP_EP_STATE_IDLE;
struct bt_bap_stream *stream;

if (sink == NULL) {
LOG_DBG("sink is NULL");

return state;
return state == BT_BAP_EP_STATE_IDLE;
}

if (sys_slist_is_empty(&sink->streams)) {
LOG_DBG("Sink does not have any streams");

return state;
return state == BT_BAP_EP_STATE_IDLE;
}

SYS_SLIST_FOR_EACH_CONTAINER(&sink->streams, stream, _node) {
if (stream->ep != NULL) {
state = MAX(state, stream->ep->status.state);
if (stream->ep != NULL && stream->ep->status.state != state) {
return false;
}
}

return state;
return true;
}

static void broadcast_sink_iso_connected(struct bt_iso_chan *chan)
Expand Down Expand Up @@ -362,7 +361,7 @@ static void broadcast_sink_iso_connected(struct bt_iso_chan *chan)
LOG_WRN("No callback for started set");
}

if (broadcast_sink_get_state(sink) != BT_BAP_EP_STATE_STREAMING) {
if (broadcast_sink_is_in_state(sink, BT_BAP_EP_STATE_STREAMING)) {
update_recv_state_big_synced(sink);
}
}
Expand Down Expand Up @@ -1291,7 +1290,6 @@ int bt_bap_broadcast_sink_sync(struct bt_bap_broadcast_sink *sink, uint32_t inde

int bt_bap_broadcast_sink_stop(struct bt_bap_broadcast_sink *sink)
{
enum bt_bap_ep_state state;
int err;

CHECKIF(sink == NULL) {
Expand All @@ -1304,9 +1302,8 @@ int bt_bap_broadcast_sink_stop(struct bt_bap_broadcast_sink *sink)
return -EALREADY;
}

state = broadcast_sink_get_state(sink);
if (state != BT_BAP_EP_STATE_STREAMING && state != BT_BAP_EP_STATE_QOS_CONFIGURED) {
LOG_DBG("Broadcast sink %p invalid state: %u", sink, state);
if (broadcast_sink_is_in_state(sink, BT_BAP_EP_STATE_IDLE)) {
LOG_DBG("Broadcast sink %p in idle state", sink);
return -EBADMSG;
}

Expand All @@ -1324,16 +1321,14 @@ int bt_bap_broadcast_sink_stop(struct bt_bap_broadcast_sink *sink)

int bt_bap_broadcast_sink_delete(struct bt_bap_broadcast_sink *sink)
{
enum bt_bap_ep_state state;

CHECKIF(sink == NULL) {
LOG_DBG("sink is NULL");
return -EINVAL;
}

state = broadcast_sink_get_state(sink);
if (state != BT_BAP_EP_STATE_IDLE) {
LOG_DBG("Broadcast sink %p invalid state: %u", sink, state);
if (!broadcast_sink_is_in_state(sink, BT_BAP_EP_STATE_IDLE)) {
LOG_DBG("Broadcast sink %p not in idle state", sink);
return -EBADMSG;
}

Expand Down
Loading