Commit 756f5f94 authored by Emil Gydesen's avatar Emil Gydesen Committed by Carles Cufi
Browse files

Bluetooth: BAP: Disallow bt_bap_stream_stop when CIS is not connected 

When the CIS for a BAP stream is not connected, we cannot truly
be in the disabling state (the only state the stop operation
can be performed by the unicast client).

The reason for this is that if the CIS is disconnected, then
the ASCS server shall transition to the QoS Configured state
regardless of whether it has received a receiver stop ready
command from the unicast client.

Signed-off-by: default avatarEmil Gydesen <emil.gydesen@nordicsemi.no>
parent 7f820d59

include/zephyr/bluetooth/audio/bap.h

+10 −0
Changes for include/zephyr/bluetooth/audio/bap.h: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1090,6 +1090,16 @@ int bt_bap_stream_start(struct bt_bap_stream *stream); 
 *

 * @param stream Stream object

 *

 * @retval 0 Success

 * @retval -EINVAL The @p stream does not have an endpoint or a connection, of the stream's

 *                 connection's role is not @p BT_HCI_ROLE_CENTRAL

 * @retval -EBADMSG The state of the @p stream endpoint is not @ref BT_BAP_EP_STATE_DISABLING

 * @retval -EALREADY The CIS state of the @p is not in a connected state, and thus is already

 *                   stopping

 * @retval -EBUSY The @p stream is busy with another operation

 * @retval -ENOTCONN The @p stream ACL connection is not connected

 * @retval -ENOMEM No memory to send request

 * @retval -ENOEXEC The request was rejected by GATT

 * @return 0 in case of success or negative value in case of error.

 */

int bt_bap_stream_stop(struct bt_bap_stream *stream);

subsys/bluetooth/audio/bap_unicast_client.c

+34 −1
Changes for subsys/bluetooth/audio/bap_unicast_client.c: 34 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3482,6 +3482,7 @@ int bt_bap_unicast_client_disable(struct bt_bap_stream *stream) 
int bt_bap_unicast_client_stop(struct bt_bap_stream *stream)

{

	struct bt_bap_ep *ep = stream->ep;

	enum bt_iso_state iso_state;

	struct net_buf_simple *buf;

	struct bt_ascs_start_op *req;

	int err;
@@ -3494,6 +3495,27 @@ int bt_bap_unicast_client_stop(struct bt_bap_stream *stream) 
		return -ENOTCONN;

	}



	/* ASCS_v1.0 3.2 ASE state machine transitions

	 *

	 * If the server detects link loss of a CIS for an ASE in the Streaming state or the

	 * Disabling state, the server shall immediately transition that ASE to the QoS Configured

	 * state.

	 *

	 * This effectively means that if an ASE no longer has a connected CIS, the server shall

	 * bring it to the QoS Configured state. That means that we, as a unicast client, should not

	 * attempt to stop it

	 */

	if (ep->iso == NULL) {

		LOG_DBG("Stream endpoint does not have a CIS, server will stop the ASE");

		return -EALREADY;

	}



	iso_state = ep->iso->chan.state;

	if (iso_state != BT_ISO_STATE_CONNECTED && iso_state != BT_ISO_STATE_CONNECTING) {

		LOG_DBG("Stream endpoint CIS is not connected, server will stop the ASE");

		return -EALREADY;

	}



	buf = bt_bap_unicast_client_ep_create_pdu(stream->conn, BT_ASCS_STOP_OP);

	if (buf == NULL) {

		LOG_DBG("Could not create PDU");
@@ -3513,7 +3535,18 @@ int bt_bap_unicast_client_stop(struct bt_bap_stream *stream) 
		}

		req->num_ases++;



		return bt_bap_unicast_client_ep_send(stream->conn, ep, buf);

		err = bt_bap_unicast_client_ep_send(stream->conn, ep, buf);

		if (err != 0) {

			/* Return expected error directly */

			if (err == -ENOTCONN || err == -ENOMEM) {

				return err;

			}



			LOG_DBG("bt_bap_unicast_client_ep_send failed with unexpected error %d",

				err);



			return -ENOEXEC;

		}

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE