Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-189-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
From: Silviu Florian Barbulescu <silviu.barbulescu@nxp.com>
To: linux-bluetooth@vger.kernel.org
Cc: claudia.rosu@nxp.com,
	mihai-octavian.urzica@nxp.com,
	silviu.barbulescu@nxp.com,
	vlad.pruteanu@nxp.com,
	andrei.istodorescu@nxp.com,
	luiz.dentz@gmail.com,
	iulia.tanasescu@nxp.com
Subject: [PATCH BlueZ v5 1/5] shared/bap: Fix source+sink endpoint registration
Date: Thu, 23 Nov 2023 17:10:29 +0200
Message-Id: <20231123151033.22898-2-silviu.barbulescu@nxp.com>
In-Reply-To: <20231123151033.22898-1-silviu.barbulescu@nxp.com>
References: <20231123151033.22898-1-silviu.barbulescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?UY8+fOThK9hiGpdSfs3dt8sG0qUPu5SbHhGXLVsX3Ti/1ymRX9Ae95TFVhmK?=
 =?us-ascii?Q?rk+1p1fKY1fdiFj51IYpsDmy+zpRDjmFz56u337TUUsLZ45S+DvpdFOhA8iL?=
 =?us-ascii?Q?K390AF1/iD4MCWfclXvZKJzcvVadukMeqd+JgaKkGDTyMFBXhtsCJf4zW09G?=
 =?us-ascii?Q?LLRKrRWBG9XItvYS3XsT4Vv5xpJERczPbK9PL0mgO4o4myWt4B+cCPLaXKYW?=
 =?us-ascii?Q?rZqoLMxNvdE7qvwVUENcI/+fdPmgrgLXEuK1h3genqrX08bznxH6WhoVp7iH?=
 =?us-ascii?Q?URJo9WnMpWKPhZkSbRFjvJoMRmMgN8etI6DozpAXUstdYAzhTCsCcm+QT0xK?=
 =?us-ascii?Q?wf8UbahopZMli2hx1Top19ta4urj6+OUanj63g+LEm1bE3G2L9v8G+LSyLtn?=
 =?us-ascii?Q?GhdPvwTGdfhZwful97cvJ6TYKm3Po8kfxGm1UIN2/YjIGX9IevJLAZ6gs+NQ?=
 =?us-ascii?Q?lpohxv8Cl0Z4wy3yAXRYEbKMgjTMt2nwKy2Gw0vPsBYEulmUpnTIYf9vIB9+?=
 =?us-ascii?Q?XeOk92h7jePHXzRSlwx5DYqwTZGolZzEtlCW2Za+PLXdFu3wlk1c0+kftYUE?=
 =?us-ascii?Q?amuol6jdobshNhecB4SlQMhfAixNIcB6lqeGWrcdKsaXWYLs2xOKCN0piSFE?=
 =?us-ascii?Q?Ai3RoUF/66xIJsmkxad0IAc5NrrYOiHF84bxdhKXqsP1WmRvTjmEerJvFWPM?=
 =?us-ascii?Q?2K9NxEbRLcFl7xrOQuKCeu1NxtTrHEhEGZx99yoD/mfavpp85IiFsiAIxMRE?=
 =?us-ascii?Q?1W3nNpJhs/8RGopbVl8jh2TuCB+Np5hkPB/vDs2NGpMnwsS1o3C8bT+ogRFH?=
 =?us-ascii?Q?i+p83S17CSNJvg9QOrZK/8toDVo6y1HORaAccMYfgnMI9UF4NYFPRVPBJWT8?=
 =?us-ascii?Q?Z0cK4FcIF/5dfslW/HFxlWrAmthDAph+mqjPvjkDmL6N6Oog9BETE91S8eFX?=
 =?us-ascii?Q?FBTmClixapnVcXGhjL/AKeX0Z1KtxZH/0NGMpYZH0JTXDAA6Ee5kNiOaFGda?=
 =?us-ascii?Q?zBJf125ilOvqcZ46B5vlK82mBk0K1gItHKuT9hHw/NG7BC/L/Pj3QaijNswW?=
 =?us-ascii?Q?szifCX+IsvDKvMLDW4wL/W4LWh3repPyuoU55XwY2GNvlMRt7pAFeMVnEw6j?=
 =?us-ascii?Q?E1jl290q6era6JuS29RAGhkvmpBapPXOiUBwBy+exuK85Nwmo+jSll8G8+ry?=
 =?us-ascii?Q?RBE5BxMvsEKB9ElKxhRMWaOu1g5mqjiCxbpgMKqy4Zi195ioxggRL3T2Uf4L?=
 =?us-ascii?Q?rD6uvue/AlNeFh2DLW8q9KKTOafJYK8Y0h34vGyAeKfXwFtk/aH3S6NJBNEn?=
 =?us-ascii?Q?hIyut+STfdgjldQU7iBIUHNW5z/Uo1Kgdy9Wu6mXrk5RQYNjXJoduFn7UDmW?=
 =?us-ascii?Q?i6+fHH+yhbAYSivKlYhozj+TheoTNcuYx+F8AO217EO5U99alT74AIvQcD6k?=
 =?us-ascii?Q?VqJJFXlL5UjUXsLWKIe2hSEqfkKVQysCOJ4LIGOys3V7IaoviXNW9ag90+NU?=
 =?us-ascii?Q?peuF33euE3OmJKvQToghl0HQ0UKv0V8cPji97EapQ47gI00g2o6Cy3NFWfba?=
 =?us-ascii?Q?BrhLCaWeofODbh1NaV7Ns1ZcHgQZsUEYaUKQJHLWzqKcpOg9sLdCnBZgV9qD?=
 =?us-ascii?Q?Dg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7cc3dc02-8cd2-47ae-9613-08dbec365af5
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB10073.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Nov 2023 15:10:40.3012
 (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: E0YMQLljn9IrzT1ZXPvd4B55hrXh21txTHsUhUfvVJRPwF6np4ETM+Lc9pltwwrgpD50hdmg9Xl/iXGlmiq92tU0eVIfZ9poI7rkFwUx29k=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6928

From: Claudia Draghicescu <claudia.rosu@nxp.com>

When registering both sink and source endpoints,
the register endpoint method call results in 2 remote endpoints for each
scanned broadcast source

---
 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..d8a3adde6 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 && (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