Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
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 v2 1/2] bap: Fix source+sink endpoint registration
Date:   Thu, 19 Oct 2023 16:54:42 +0300
Message-Id: <20231019135443.3806-2-claudia.rosu@nxp.com>
In-Reply-To: <20231019135443.3806-1-claudia.rosu@nxp.com>
References: <20231019135443.3806-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?KMCRbCYoWbga8t4JS3K8Kki/AjUSr+hy8ahXp1TOjlbp1hG2i8ylSHN3qoCf?=
 =?us-ascii?Q?O4r3yb6DKPhiNAOosp1FSjuWdGYyXIjzE3h4rW8ObmYtArDXQkazaucohYAg?=
 =?us-ascii?Q?d+Tz3YIQpmN4B3yqKv7vpYetg1tRwBG02KNQCrKiA4XY8t/Gq/C9oiG8Ljid?=
 =?us-ascii?Q?BvEz8H/i3GuK7S/4lqCVbp/i5TrB/bs+S2zXJAVpf5nrDxT9h/cl912pCb3r?=
 =?us-ascii?Q?hnVQ0lWx0TXOWJcvG/Ov3VYvJ8jR4k43+cH8Vp5HdDCWUXK0uyCttPiU8Eui?=
 =?us-ascii?Q?BX8lIHeO/Gmm19vmbPbvD7mBZ1YSyGyEcJKVVsYDFoHJnEKm5pKstsZsVKpL?=
 =?us-ascii?Q?YYWG6Nefh/dFoBWTKp8GEIq/pN8Sm3miXWvQioOoICQ1+yAvIyzT/w6Keanu?=
 =?us-ascii?Q?+VcXmP4TrMVAebct445FRqaA5faug8e2JhR36zYSoxPTcsaawrcr2AyW2z6A?=
 =?us-ascii?Q?W/QSSveczPlSMHF81HmlubFyhT/DCWa5nvgt0eAK5eacAQEV9DrhxFyrpy//?=
 =?us-ascii?Q?D2wFA7bKEGing4pnEhL5qlN1lEYuuyvsi61t72lrTLvs7jivr138KGQTMRzr?=
 =?us-ascii?Q?MvxA8id5SRFUnX8PTNKwUYmSWy68gzmVenXEqr2X8BFzMq5pmvqzyE22Yw3h?=
 =?us-ascii?Q?t8Qz9N2mxLWIAJWURvlbwNJepWK/h1G7n2b8m5Y0GXeo7TVGpf2M8U7ZG9ao?=
 =?us-ascii?Q?m0ezsO/3CovL+/VwpNta3yU32AEU9268XOKog/j6bjz25mwTni6LPvLqiZvW?=
 =?us-ascii?Q?AOSrQyLwEl73TP/Wf0neWVszL7hzQSPIqr/Me+fHSGL7d2PcumnRDEYQTWDK?=
 =?us-ascii?Q?S1zvR1GTYvaMO8tgn6iFfraaYqgcuzJMzIjlFGlsG80f5jSlV/tuclSpb8iQ?=
 =?us-ascii?Q?Mhd/s2gyqoceJ8Bzt2ml8DW1HNotjQoyUcxh77Y3bEHezb9n+1uxA5z5pE6i?=
 =?us-ascii?Q?f9pm4esbu2IdC7dMYMbZpBk68hSxL8WLtPV0SWQ9V/t4eV5iOTT6xWTj/JaV?=
 =?us-ascii?Q?VTqU/rr4bQBmd8KgZWRIhYafp6uK0h3MLyQqxBj4fez1I5XQugUblyX1IPho?=
 =?us-ascii?Q?O5dTR834btm4yeYScBPNMA6EWbn/rufI8OLtwlbgO1hxlryaBQpt/bvz1XXE?=
 =?us-ascii?Q?sH8RGmgTW4CJyFMRia85xyi9jKdxS0LaTj031R9Ml+juJ1j2gdXt+v5Dj2th?=
 =?us-ascii?Q?T3Tgx1O238nsvBHX7M8HotrvpGzYnjrLXHQ4crauP9FkKkyVK6fN52oeBc3q?=
 =?us-ascii?Q?7YcxvIX381pnMXJKXm/GI6d0vykwIRTwkAMyl+qjKatez7UWS94c80gjnsIR?=
 =?us-ascii?Q?7i2vEm0nSq1hX17f0Jf6o7Ma08/ZDSGGn8C8A2XVVmmY8tRmTDT/sKYVRnTB?=
 =?us-ascii?Q?DunUge1MEzqWIZwedUqUEs/nZRifL9HUbzaQSjUA+aAgAL+9mxjBkB9AtSYp?=
 =?us-ascii?Q?W9mxneHM5HyVMRwPRyuPza467Y2bs8Hg39PlpBXwqvVmkWJpvxv4Fe1StZFm?=
 =?us-ascii?Q?5l3DTOg9ZYHzaVC09YPD8AbVK9NKndeLkEQg5CVDz7ZEOK5SFPXOVxMwCJ0q?=
 =?us-ascii?Q?+G+dR+IHzJ7nkFr+Sly0GouI7ZLWMirQQu9CX88I?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 73d78354-de01-429b-2bd5-08dbd0aafb77
X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9151.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 13:54:58.6758
 (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: iMUsoNKdc+2C7z5OHrg6K+Ng6kjY2o0nYzGe0/TiJaEo96XK2XEXmQvb4IiGyJlZmRibYSu4bD2mXyWK2iul5Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8729
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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 19 Oct 2023 06:55:08 -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 925501c48..665cd76b0 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -644,7 +644,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;
 }
@@ -1500,12 +1500,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;
 	}
 
@@ -2682,7 +2682,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)
@@ -2710,15 +2710,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);
@@ -4482,21 +4473,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);
 	}
 }
 
@@ -4541,6 +4523,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;
@@ -4549,7 +4545,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)
@@ -4708,7 +4707,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) {
@@ -4745,7 +4748,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;
@@ -4927,12 +4932,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;
 	}
@@ -5465,10 +5470,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 ebe4dbf7d..edc88c834 100644
--- a/src/shared/bap.h
+++ b/src/shared/bap.h
@@ -320,3 +320,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