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 2/2] bap: Fix source+sink endpoint registration
Date:   Fri, 13 Oct 2023 13:05:37 +0300
Message-Id: <20231013100537.3867-3-claudia.rosu@nxp.com>
In-Reply-To: <20231013100537.3867-1-claudia.rosu@nxp.com>
References: <20231013100537.3867-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?PNsETQERsFCEAu2qnjRQ8zELdB0k5JLbskCDfU4AwOwQTXyG7okEY1NBhL1o?=
 =?us-ascii?Q?ZN6+VOOaIKADNvnJtOcdm4o6r/W9WFgblvIH2ysFG9UOUhWFu6cq3xE9aY+A?=
 =?us-ascii?Q?5dyDg3Gnwopljbv75ZdatvlnOXobwXm/ndAN/cOAahcCpl5cY3fhsMBa4YhX?=
 =?us-ascii?Q?AC1aaOT+wXTjBBLoYUGLn6Vdjp00kCuKBIsMsoFmGDFB+395w9/W6qgYofeo?=
 =?us-ascii?Q?KX1tRW/Ee0fwYRoPGKrrmqCLxUR5Pyh+iVHDThDJ9pacCBBi1rs2+pvQXnah?=
 =?us-ascii?Q?GLv9A5kHl9O7h3QnSRciNtZurJg5HT82vO5dLRndHPgYfCLM9GDZQXeRMIeW?=
 =?us-ascii?Q?gYYC5+UkVszpvuRzdiiQmsatQ9JPH3k0/7xF5daZyl7YVuRbVjFTHOVln4/8?=
 =?us-ascii?Q?pOLgSO2X9rnATqmjRtyRump/zUZFQ7VXDj5i4fR369v6XT7R7uFLkJ6sMm7I?=
 =?us-ascii?Q?aw5atiHqKekSaSlFQEJz7RJnOvGZTHoYHih4XXqL3qlBEacWDHbII6AMMXER?=
 =?us-ascii?Q?SWohqRbqsdG90RhrKVA9yuTkttsxvqhV3AM/FE1CjeKBz1DAblvutfykDqMv?=
 =?us-ascii?Q?J7yJYpddXXlBy6N2lwqFOpS7znwDHb6howWExkrL/kYo3rIqskHuHZ3qnzWC?=
 =?us-ascii?Q?QBCB6bYDLH3nX3J5SpBbeYHAAOHmgkTI6zZ5vVjPMxMwgS9b/mRrETm7c1o4?=
 =?us-ascii?Q?el08iec762r/NyrocwiiI99XHYCvGq5EHQp1JBARSnriEMWAN44UTewSk1Jq?=
 =?us-ascii?Q?nQf4N2bUvp3T64WlJoEL991/kEepFNFf/2AHP7vAiS78dc85Tbw/aiXEMvCo?=
 =?us-ascii?Q?RHEcCQ5GWzSIOWwHRNNu3dRAzz288Hyr/27GChQ6g8aTdY1Z6wR4GY27mYoG?=
 =?us-ascii?Q?qwsHhsu8bju4BWeMB0F8JmTsRF0ccgMNOESEsAazpJKE4iZ0xgbmW23H+Mji?=
 =?us-ascii?Q?5CPv53nKsgLjbvjTxPXeaVEpIqhan3EYMHS3Q2wZ/1Ltgjk8GmId/FM8fKb2?=
 =?us-ascii?Q?BMLwprXHXSvCRkmNeDELA+h1AwlpR6t3oJznQpN2brn/1AACuTyFISJyXbuu?=
 =?us-ascii?Q?5LETu8aGoLLMJSaknXacaZ698EyQ58FFdY20T5QOQ+a5mHqmmjlYLJBUrRGO?=
 =?us-ascii?Q?riHdDmV2DnR/w1Ujwk04kMM+7BAWjSgxnBZkNKgBw3QtQezYbWhVbCf9cWap?=
 =?us-ascii?Q?LXLn6ZFzAP5nv0b3AMk1fqzy/R/zDDY1URsdxx/sju7NZhcSESk3Rq8mYp6R?=
 =?us-ascii?Q?plZR5hLZ0hXL17f3FAQ/rMxwiQEYtf5WFYD3jkLn+hBXsDBdXJhPbbGcxviw?=
 =?us-ascii?Q?oe34ejV6PcFn+CJnQj7NwoVglfDRDI+YkkPCddAcvDrQU7Zq9Jxg4VH/lMwb?=
 =?us-ascii?Q?8aszgT+ERqhzGXJoc1+76dL25Vm6y0xSA2yotuWtRPQuZW6iKmzWXw2hIydc?=
 =?us-ascii?Q?wnESvZROXNCohQuQsflgPyEBHz+SpVWj2Fvu+/zPXAaG/B6pRSGoBNeV/wTn?=
 =?us-ascii?Q?z+lxXATpNRdSNb3y9hx2RBSlBo+PlC6Cts0TqySrfcOTZPWuEVNRYutbc4vQ?=
 =?us-ascii?Q?4QJQJtsyPJ/lE2U6MJLh4b/aSxw7J803BZnXzfF1?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6eab1099-a14d-4643-da13-08dbcbd412b0
X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9151.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2023 10:06:31.5308
 (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: m/aAHtt5HMc7067q527stAAEtqTu7NkQjPU/xUK6b60vXbMtOXZGj6RUgnm1XWMQLo0ZZ+8nEcBc3yHfF5d7TA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB9080
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]); Fri, 13 Oct 2023 03:06:44 -0700 (PDT)

Create new endpoint name for the simulated broadcast sink that is
created when registering a broadcast source endpoint.
This removes the ambiguity when having registered a local
broadcast sink and fixes the situation when multiple remote
endpoints are created when discovering a broadcast source.

---
 profiles/audio/bap.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index fa5cf1f54..cdb84d4bd 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -1053,6 +1053,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 	switch (bt_bap_pac_get_type(rpac)) {
 	case BT_BAP_BCAST_SOURCE:
 	case BT_BAP_BCAST_SINK:
+	case BT_BAP_SIMULATED_BCAST_SINK:
 		queue = data->bcast;
 		i = queue_length(data->bcast);
 		suffix = "bcast";
@@ -1075,6 +1076,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 
 	switch (bt_bap_pac_get_type(rpac)) {
 	case BT_BAP_BCAST_SINK:
+	case BT_BAP_SIMULATED_BCAST_SINK:
 		err = asprintf(&ep->path, "%s/pac_%s%d",
 				adapter_get_path(adapter), suffix, i);
 		ep->base = new0(struct iovec, 1);
@@ -1266,6 +1268,9 @@ static bool pac_found_bcast(struct bt_bap_pac *lpac, struct bt_bap_pac *rpac,
 
 	DBG("lpac %p rpac %p", lpac, rpac);
 
+	if (bt_bap_pac_get_type(lpac) == BT_BAP_SIMULATED_BCAST_SINK)
+		return true;
+
 	ep = ep_register_bcast(user_data, lpac, rpac);
 	if (!ep) {
 		error("Unable to register endpoint for pac %p", rpac);
@@ -1792,7 +1797,7 @@ static void bap_listen_io_broadcast(struct bap_data *data, struct bap_ep *ep,
 		error("%s", err->message);
 		g_error_free(err);
 	}
-
+	ep->io = io;
 	ep->data->listen_io = io;
 
 }
@@ -1958,12 +1963,8 @@ static void pac_added_broadcast(struct bt_bap_pac *pac, void *user_data)
 {
 	struct bap_data *data = user_data;
 
-	if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE)
-		bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SOURCE,
-						pac_found_bcast, data);
-	else if (bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SINK)
-		bt_bap_foreach_pac(data->bap, BT_BAP_BCAST_SINK,
-						pac_found_bcast, data);
+	bt_bap_foreach_pac(data->bap, bt_bap_pac_get_type(pac),
+				pac_found_bcast, data);
 }
 
 static bool ep_match_pac(const void *data, const void *match_data)
-- 
2.39.2