Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   Claudia Draghicescu <claudia.rosu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     iulia.tanasescu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com,
        Claudia Draghicescu <claudia.rosu@nxp.com>
Subject: [PATCH BlueZ v3 1/2] bap: Fix source+sink endpoint registration
Date:   Wed, 25 Oct 2023 12:18:52 +0300
Message-Id: <20231025091853.18647-2-claudia.rosu@nxp.com>
In-Reply-To: <20231025091853.18647-1-claudia.rosu@nxp.com>
References: <20231025091853.18647-1-claudia.rosu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?G7Mkf9qwuLEhBtMGMz3eSx3ZEBk8OEfz1SgDyFzuNy9pWXXZLfUItIHJEZlF?=
 =?us-ascii?Q?YNiczi8a2eVbzLVp3hC2LQv0/i+UT8eX6qSfss47Ci8lvDJiRWIeU3hqbBcE?=
 =?us-ascii?Q?GFus8GnkQFXW1Cfzqvane808JPpNQgs+X0NGiYJmTQz3xB1zOj5vmhx5Szqx?=
 =?us-ascii?Q?r8yneE3smayoW/x1A3XaTl7I0H0IjEE7HPXJJCN4UxBu8BI5FXQk0JCldmNo?=
 =?us-ascii?Q?GTaGRXtk3DsHQYi6h5yz11dSUH+nybl3EPwFGnMW1R34eBi+SIIBPWP+F+XO?=
 =?us-ascii?Q?efCgyw9JRuhx5X7F2yGcbC1JguBKpTvqqIV0E2R//AI3WNK0jdERJfTcsati?=
 =?us-ascii?Q?2JuiVtv5eCksKenR1Bw3u0rPxyOMip7jkUs+8+NrczJA+wUv2Yx3qzDUirmU?=
 =?us-ascii?Q?y5EXpyq8HnIRpz6fTvsAo4B0NEFqWvSKy9LyvCcdbEwkKrUajQtYWAYJcQkZ?=
 =?us-ascii?Q?rH9C+E4qj3XuCRYpjEernpi22ERLp1Nd2hTfgOkxYl+haLccBbC85j9mPSEC?=
 =?us-ascii?Q?3i3Mq7kxZPtG2e7SIhrh5EYQrRlumwakHrUc7a6opgxhNnCHKClLWGpxSLoS?=
 =?us-ascii?Q?j5YZWFVQdGeg5NmHW0L1Dr+rJSyeUnhFA0xG9wbM1bx66+KufQALnsV+ydtc?=
 =?us-ascii?Q?4y5g7PMRuPozIB/juAlOgLr/KHuIYyB3H1cilrSkUCsacy0h2oAY/jT7609S?=
 =?us-ascii?Q?Gk609VyNtqmd84+AeKdAk6ypel4cgraylxTSZ69MomdJKsCGht0fEtHIqMY6?=
 =?us-ascii?Q?qtAMJJbqhhw5Z7QQWppFDIPi0upQrBVhaglQ45wKBQw0X5VMajR6P+vbRUp3?=
 =?us-ascii?Q?Qk5dJwhhuxX8okQRoScTbBtNtl13qLQOH0VxTJpKIX6iQfCEns3E+F7dQHPn?=
 =?us-ascii?Q?5kh6vwbuu871PkYtaLCF48JlSFSlSWn0N/DKL5bkvGXRfmdduWioFP+A6/C8?=
 =?us-ascii?Q?5sUXovyqgiQq917/lP+dX/f/rsTGhWAQM30+Zt+E6zY8SXNN0sLdKkiWUDDB?=
 =?us-ascii?Q?XQky6GJKTQm49ML1ejZOa1amtKZbDYjT2SdubbqNFdo34Klj0c/JVV1ecVo8?=
 =?us-ascii?Q?OC3WfoaFVqm5WIHu/KrCqidiUlTHuwqBzkRWcdp+JFImUpfSDXqGoBAIYvZG?=
 =?us-ascii?Q?HfHYOZxamljl/1WrQqVEzG25Edj4/JpuoHcwG1dJvJ2NkVngZ4XFXr6lZJQe?=
 =?us-ascii?Q?k08my6hDJ4zmylHcHz5CDuIp3QWz4XDvz1lD65J6DwdWlutTVG106C2s1vYs?=
 =?us-ascii?Q?2xcWvtOtuqsmrok5YNHh1wAxTZGbjlW6YRJZPs0Vsjrnjt+0uxqKkkf7bLdX?=
 =?us-ascii?Q?xY/NH9NgofFAbNU3yQCSxS5hduRwzpNoH5lEQC80kGf1RppuaIPBMefz/lMr?=
 =?us-ascii?Q?bPozE/l8PPfM8mGJUHMlYmPqf015MX7aMkyQQslNOgJ2/iXTAdDQWHxehyS3?=
 =?us-ascii?Q?nW52LKoGXCkjCxC8v4N+v7ZDj0OhYlAmI5sgyNx/uENxsI9GmVceaFmv80ip?=
 =?us-ascii?Q?PxtDxUkrOOtPRkIToQjrH3IKjDOII9Tye4Zl0P+jTrB/10dAdbG1k34iM6Ok?=
 =?us-ascii?Q?k3CycI6KzWysgqFg8VjcUuf8jSsj33tpJuc0TmSW?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ab08bcbe-b0f6-40bb-0d2c-08dbd53b71ac
X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9151.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 09:19:09.1070
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: vOITkWWrpbXHKZYnb2puzO/wgnznIg0GnRRna3CNHTZRoTmABRLSUb5U3+ff8jfIHXlbwjzWnf3x9IH12IpR7g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9369
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 25 Oct 2023 02:19:16 -0700 (PDT)

Fix the case when registering both sink and source endpoints,
the register endpoint method call results in 2 remote endpoints
for each scanned broadcast source.
Remove the need of a remote pac when creating a broadcast stream.

---
 src/shared/bap.c | 73 ++++++++++++++++++++++++------------------------
 src/shared/bap.h |  3 ++
 2 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/src/shared/bap.c b/src/shared/bap.c
index 13bbcf793..54ad713f2 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -629,7 +629,7 @@ static struct bt_bap_endpoint *bap_endpoint_new_broadcast(struct bt_bap_db *bdb,
 	if (type == BT_BAP_BCAST_SINK)
 		ep->dir = BT_BAP_BCAST_SOURCE;
 	else
-		ep->dir = BT_BAP_BCAST_SINK;
+		ep->dir = 0;
 
 	return ep;
 }
@@ -1485,12 +1485,12 @@ static void ep_config_cb(struct bt_bap_stream *stream, int err)
 		return;
 
 	if (bt_bap_stream_get_type(stream) == BT_BAP_STREAM_TYPE_BCAST) {
-		if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
+		if (!bt_bap_stream_io_dir(stream))
 			stream_set_state_broadcast(stream,
-						BT_BAP_STREAM_STATE_QOS);
+				BT_BAP_STREAM_STATE_QOS);
 		else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
 			stream_set_state_broadcast(stream,
-						BT_BAP_STREAM_STATE_CONFIG);
+				BT_BAP_STREAM_STATE_CONFIG);
 		return;
 	}
 
@@ -2622,7 +2622,7 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
 					struct iovec *metadata)
 {
 	struct bt_bap_db *bdb;
-	struct bt_bap_pac *pac, *pac_broadcast_sink;
+	struct bt_bap_pac *pac;
 	struct bt_bap_codec codec;
 
 	if (!db)
@@ -2650,15 +2650,6 @@ struct bt_bap_pac *bt_bap_add_vendor_pac(struct gatt_db *db,
 		break;
 	case BT_BAP_BCAST_SOURCE:
 		bap_add_broadcast_source(pac);
-		if (queue_isempty(bdb->broadcast_sinks)) {
-			/* When adding a local broadcast source, add also a
-			 * local broadcast sink
-			 */
-			pac_broadcast_sink = bap_pac_new(bdb, name,
-					BT_BAP_BCAST_SINK, &codec, qos,
-					data, metadata);
-			bap_add_broadcast_sink(pac_broadcast_sink);
-		}
 		break;
 	case BT_BAP_BCAST_SINK:
 		bap_add_broadcast_sink(pac);
@@ -4416,21 +4407,12 @@ void bt_bap_foreach_pac(struct bt_bap *bap, uint8_t type,
 							func, user_data);
 	case BT_BAP_SOURCE:
 		return bap_foreach_pac(bap->ldb->sinks, bap->rdb->sources,
-							   func, user_data);
+							func, user_data);
 	case BT_BAP_BCAST_SOURCE:
-		if (queue_isempty(bap->rdb->broadcast_sources)
-			&& queue_isempty(bap->rdb->broadcast_sinks))
-			return bap_foreach_pac(bap->ldb->broadcast_sources,
-					bap->ldb->broadcast_sinks,
-					func, user_data);
-
-		return bap_foreach_pac(bap->ldb->broadcast_sinks,
-					bap->rdb->broadcast_sources,
-					func, user_data);
 	case BT_BAP_BCAST_SINK:
 		return bap_foreach_pac(bap->ldb->broadcast_sinks,
-					bap->rdb->broadcast_sources,
-					func, user_data);
+						bap->rdb->broadcast_sources,
+						func, user_data);
 	}
 }
 
@@ -4475,6 +4457,20 @@ void *bt_bap_pac_get_user_data(struct bt_bap_pac *pac)
 	return pac->user_data;
 }
 
+bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac)
+{
+	if (!bap->ldb)
+		return false;
+
+	if (queue_find(bap->ldb->broadcast_sinks, NULL, pac))
+		return true;
+
+	if (queue_find(bap->ldb->broadcast_sources, NULL, pac))
+		return true;
+
+	return false;
+}
+
 static bool find_ep_unused(const void *data, const void *user_data)
 {
 	const struct bt_bap_endpoint *ep = data;
@@ -4483,7 +4479,10 @@ static bool find_ep_unused(const void *data, const void *user_data)
 	if (ep->stream)
 		return false;
 
-	return ep->dir == match->rpac->type;
+	if (match->rpac)
+		return ep->dir == match->rpac->type;
+	else
+		return true;
 }
 
 static bool find_ep_pacs(const void *data, const void *user_data)
@@ -4642,7 +4641,11 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap,
 	struct bt_bap_endpoint *ep;
 	struct match_pac match;
 
-	if (!bap || !bap->rdb || queue_isempty(bap->remote_eps))
+	if (!bap)
+		return NULL;
+
+	if (!rpac && (lpac->type != BT_BAP_BCAST_SOURCE)
+		&& queue_isempty(bap->remote_eps))
 		return NULL;
 
 	if (lpac && rpac) {
@@ -4679,7 +4682,9 @@ struct bt_bap_stream *bt_bap_stream_new(struct bt_bap *bap,
 			return NULL;
 
 		bt_bap_foreach_pac(bap, type, match_pac, &match);
-		if (!match.lpac || !match.rpac)
+		if (!match.lpac)
+			return NULL;
+		if (!match.rpac && (match.lpac->type != BT_BAP_BCAST_SOURCE))
 			return NULL;
 
 		lpac = match.lpac;
@@ -4861,12 +4866,12 @@ unsigned int bt_bap_stream_enable(struct bt_bap_stream *stream,
 		queue_foreach(stream->links, bap_stream_enable_link, metadata);
 		break;
 	case BT_BAP_STREAM_TYPE_BCAST:
-		if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SINK)
+		if (!bt_bap_stream_io_dir(stream))
 			stream_set_state_broadcast(stream,
-						BT_BAP_STREAM_STATE_CONFIG);
+				BT_BAP_STREAM_STATE_CONFIG);
 		else if (bt_bap_stream_io_dir(stream) == BT_BAP_BCAST_SOURCE)
 			stream_set_state_broadcast(stream,
-						BT_BAP_STREAM_STATE_STREAMING);
+				 BT_BAP_STREAM_STATE_STREAMING);
 
 		return 1;
 	}
@@ -5399,10 +5404,6 @@ bool bt_bap_new_bcast_source(struct bt_bap *bap, const char *name)
 	struct bt_bap_endpoint *ep;
 	struct bt_bap_pac *pac_broadcast_source;
 
-	/* Add the remote source only if a local sink endpoint was registered */
-	if (queue_isempty(bap->ldb->broadcast_sinks))
-		return false;
-
 	/* Add the remote source only if a local sink endpoint was registered */
 	if (queue_isempty(bap->ldb->broadcast_sinks))
 		return false;
diff --git a/src/shared/bap.h b/src/shared/bap.h
index 23edbf4c6..2c8f9208e 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -317,3 +317,6 @@ void bt_bap_update_bcast_source(struct bt_bap_pac *pac,
 					struct bt_bap_codec *codec,
 					struct iovec *data,
 					struct iovec *metadata);
+
+bool bt_bap_pac_bcast_is_local(struct bt_bap *bap, struct bt_bap_pac *pac);
+
-- 
2.39.2