Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
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 v2 2/5] bap: Fix source+sink endpoint registration
Date:   Tue, 31 Oct 2023 17:55:32 +0200
Message-Id: <20231031155535.228994-3-silviu.barbulescu@nxp.com>
In-Reply-To: <20231031155535.228994-1-silviu.barbulescu@nxp.com>
References: <20231031155535.228994-1-silviu.barbulescu@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?963wjS3M8FnpRuLBJBgnzbDG645Z0LSSAzfOAN8M5IU69r0T0oYW8iGzfI35?=
 =?us-ascii?Q?/vxwVfQZb7BE8/76+8jArK7uqFgqhPsXAm81DUgc+MZFXlPo1rpgGVEPmS1/?=
 =?us-ascii?Q?R6qV79gY5YAGAFrZPRBgaGdU1fDun8SiYurbOF+aiq/rptqU3gTE4I7Fn9nX?=
 =?us-ascii?Q?F0GndCwh4VlsfGwunxa06CA42HOoh7LGlpA2Ww4nQB57b6i66Ic1iHRv7w5m?=
 =?us-ascii?Q?IinFuLA1cd7Lp54btLd5tDCpWY/Xk4xu0RGXMv7DmyW8dJFg3CRyY1GIoFz0?=
 =?us-ascii?Q?T50wOF949/XhKdUmaPTo40LeTidz30qqHtCWDh8EVUu/PuMN0F9WIMdgHMmV?=
 =?us-ascii?Q?o6gyEey4Hq3+koMgdkmHFAuPntRVFxkDISbpPpOrv/MZlTa+0h6zLg7ZDOQ0?=
 =?us-ascii?Q?zm48AJ98pn3tgFDEhEeQg1ocnDbpH79TzuMZvvcTVG4CBiDCjAUxjs4LZx5B?=
 =?us-ascii?Q?4VEGmo8E+NdB9VDc+ae//cI98eaFDuhTCseHVahb7PkQh6b+4Oh88Usob1LG?=
 =?us-ascii?Q?/bxTIk93Wrl0B8iWikJ2rofxlsXNasGweHwVL9NTjqSvf+9SBHs7qP1aYYyM?=
 =?us-ascii?Q?B9TJS5ilwbZNpWmVNIZ35kMZ9zcTDRPpZ8r5lvXdek+sJvnAWS6y4oCBCrkR?=
 =?us-ascii?Q?FPhp88XlvxdSdskahFFvcdHxYlckcj0fKZuxZgO4PIoeQWD+0sxYrebeZA8B?=
 =?us-ascii?Q?rV0QjbG/BWo3hg5t6XUw6OEKgPdYO2yADpdHgStCS6vytR/mAkgLxVcgNhon?=
 =?us-ascii?Q?Ui9ZIjjnNadm3kawW81YMbu1pui/CyGkAF2/74UFaQSOuBvCx71k9QgIeVVH?=
 =?us-ascii?Q?eTe0uE0MpjTVeLX/roBPHUkZGpw/vcdF4IXfZNR3GJrbFjt1m+T1fXBaMf9z?=
 =?us-ascii?Q?IlFtafVnzbDu5hw3BY63vbtVRSspXP7RVippbml8b2eYasyhPDi+xKQMtENG?=
 =?us-ascii?Q?19rnKqNnAqocYaAXNzZAumMJkWY/0h2bHat0Ce8jwGH2BgrENuGtNkYH3kVW?=
 =?us-ascii?Q?QzDVfuzLIasZtmQ9wcGHXTdsxwmNwCRSshJuF8f5k+jJ6YQAnKUuC6fOu0nk?=
 =?us-ascii?Q?0Ux4iTMKTdedrc17Wfx7arpq8EyC1JHp8rgNgkiUyZYnQpUep7w4Mnh2Kd+V?=
 =?us-ascii?Q?VmqsA/hU7pnfpPsPDaZiWEWK/w3D7u6N3Ldqm4stUVLOsL4aigQRqP4ZQt4r?=
 =?us-ascii?Q?yAPIq6I+ROx9MkDHB6+S05L53aBZgYpUeGHEijAs+MEmZ80QBw22OYX2NuIg?=
 =?us-ascii?Q?amnB6WdowqeInr4U9INH6/IFIw2FUjKeawZhFc16C1aMoeY3Rbvu3pxe5jMc?=
 =?us-ascii?Q?4JW7XUNQ1FA3cjFULhCfWSHQtejgklgXQpePjQGe02cnRXEjU3rOEBPowJdr?=
 =?us-ascii?Q?hZfN+VAoAVjORuHGFZtti8UDTFNR1SCzU3IKOflOGzdwhFe8IGmiHt7aGRtV?=
 =?us-ascii?Q?Lf7Xg0H7Atd6BChDDusIWILzje2RTSOnDrA066YlVTekWcf0kj986aEQirqa?=
 =?us-ascii?Q?HLbYZ2u2fxsMfy4QK5WBMMNtslvgTywpNCvEWSWhmV3iwAgP8iC1kGQt21pR?=
 =?us-ascii?Q?B9s79XBkbgTv6pnSHRzLerN2CmI+FJNt66Otn1yA9sW3+0/P3I2qZHPFK9AG?=
 =?us-ascii?Q?uA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e1a9f8f-a71c-463f-8fc5-08dbda29d92d
X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6331.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2023 15:55:47.6372
 (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: o14Msj4BPrv03sU8YVhGzNObR2PY7qsLYWUh+FJzuxdSXGXul1UcTeG9pe1IWh61uLaPaD9w717/kQQ9s0o/zVZ9zDp1jW7axfpI1vto2Is=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7440
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Tue, 31 Oct 2023 08:55:55 -0700 (PDT)

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

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

diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index b74498c4c..a84181e1a 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -1050,7 +1050,7 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 	const char *suffix;
 	struct match_ep match = { lpac, rpac };
 
-	switch (bt_bap_pac_get_type(rpac)) {
+	switch (bt_bap_pac_get_type(lpac)) {
 	case BT_BAP_BCAST_SOURCE:
 	case BT_BAP_BCAST_SINK:
 		queue = data->bcast;
@@ -1073,13 +1073,13 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 	if (device)
 		ep->data->device = device;
 
-	switch (bt_bap_pac_get_type(rpac)) {
-	case BT_BAP_BCAST_SINK:
+	switch (bt_bap_pac_get_type(lpac)) {
+	case BT_BAP_BCAST_SOURCE:
 		err = asprintf(&ep->path, "%s/pac_%s%d",
 				adapter_get_path(adapter), suffix, i);
 		ep->base = new0(struct iovec, 1);
 		break;
-	case BT_BAP_BCAST_SOURCE:
+	case BT_BAP_BCAST_SINK:
 		err = asprintf(&ep->path, "%s/pac_%s%d",
 				device_get_path(device), suffix, i);
 		ep->base = new0(struct iovec, 1);
@@ -1101,7 +1101,10 @@ static struct bap_ep *ep_register_bcast(struct bap_data *data,
 		ep_free(ep);
 		return NULL;
 	}
-	bt_bap_pac_set_user_data(rpac, ep->path);
+	if (rpac)
+		bt_bap_pac_set_user_data(rpac, ep->path);
+	else
+		bt_bap_pac_set_user_data(lpac, ep->path);
 
 	DBG("ep %p lpac %p rpac %p path %s", ep, ep->lpac, ep->rpac, ep->path);
 
@@ -1792,7 +1795,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 +1961,12 @@ 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);
+	if (bt_bap_pac_bcast_is_local(data->bap, pac) &&
+		(bt_bap_pac_get_type(pac) == BT_BAP_BCAST_SOURCE))
+		pac_found_bcast(pac, NULL, user_data);
+	else
+		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