Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
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 2/2] bap: Fix source+sink endpoint registration
Date:   Thu, 19 Oct 2023 16:54:43 +0300
Message-Id: <20231019135443.3806-3-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?kvKYmbf0mP23XigH42l8DNMLlAejtn+TTsYr0raU8OE4vKvkseKWpN/MA59n?=
 =?us-ascii?Q?H+5xlxVtzp8neqkMkJ/lqp73MLrua7BKDV/Ax+ZR8IyaMjIti5fAIYD3XTbn?=
 =?us-ascii?Q?a2zKjBAQS23ZyfSLFJajsxmH+6BO6Ot+PUagbpHCb4Qg6PB6d6VUS4Jll5bv?=
 =?us-ascii?Q?0LBMI28pfFK2zf5S2+AKRSl6F3clkWpbcvMlMC5XAc4qVNYi+B4mdDha09Wm?=
 =?us-ascii?Q?8te30g3ehDNYybhCmNreEYy7GqHR/ZAp19mJJ+vosD5cq48aB1tJnY27lKRo?=
 =?us-ascii?Q?tuIBLlhCaJ1b+FqS/fYmA+y4QdLYk/KkoYITJ6iQYhqyCVWyvTMK5RPTX1fR?=
 =?us-ascii?Q?FIJXVQSpZ0+sgF+CA2QPaW7X1zw5g5xQ2nGMbayXDF+s4Y35LVt89WFc2Qd+?=
 =?us-ascii?Q?sEqp4iMJKwrCZm4p/TYPV4GNDF6+F6VqVP+TB6m/MhrPMgyDU+IKp4JWoO7H?=
 =?us-ascii?Q?Yg5DWsXXvZLhitg8efcRnoi6Y86ahXVuyVtMV9ZcHBBMWgduFW3JBWuY8z9y?=
 =?us-ascii?Q?nwCpHm8mKWOrCQPZFc8XsyyN54ISOLKU+D/C7xR/1ff3T5/dsHhsU62YCGxN?=
 =?us-ascii?Q?pSRM8wSgRM0DE1Re7PEvi97aEZ7BUz9tyR7XkknzGYxdtnY5n6azLejbJm/z?=
 =?us-ascii?Q?g/mGxxfdEFzgL1/KYuLsAOb7aA9PZGoTexKHPf0UXTOG2ej5+qcWYm1c3+gx?=
 =?us-ascii?Q?d5kU+7b4kdq1+mHso0wlDSDBhFAo+IDnDcKSIovp4eH0Q1G4PPDYutjLdjoH?=
 =?us-ascii?Q?LDIb0ZU1bZahIVdo9SFjuT3Wg0QxugqbcJbnZip6LtvHdOjcni/oMfHGQ6H1?=
 =?us-ascii?Q?GGbIOb6rYJTrGIwAcl+DJo+GOLVtZtKZtNh8VG0Si56zrqmXLyOWYGLU1ZNI?=
 =?us-ascii?Q?2XbAjF3uVH5bc/hq33AoMQhvV9T5sm1TCx92v/DOooG46OZK1cdb16dSK/zd?=
 =?us-ascii?Q?mGyr1dDDR1VlG7xsg8Eo50FSlDcRsTpZFNZrhY+FEveAVPfr+KWu+5P6arSI?=
 =?us-ascii?Q?jrBWysxe5G8/+EeV/FnFHF0M88BOxI0jgzKvWMgnKrC+yrCiNSfl78wZyqDP?=
 =?us-ascii?Q?yDsplPu8fU6fsWQiboYJpPKuTKRamcO5P5X4fqek3Ad7V3wE52op4NtCS+CW?=
 =?us-ascii?Q?CcaJDH/TtvHmlMuGEhModSvcleKbI1gaItFizcIsrzPRBc6Pz2se4CdmrFJb?=
 =?us-ascii?Q?fw8dHrF5BWzyt3/rNfNNjbBGUh23SOHUGw/sk6iZjIMGCvPfKrHr7rYXX6UM?=
 =?us-ascii?Q?eVMAwECxsqrasMeyu9nNW0t2e23oTchrkg5grzLnPCwwrYuxsTNx5eloAmVg?=
 =?us-ascii?Q?NMZLccFkKuT0QozqhyOTsQcyzIR/DPwOcUgQARJYYu7QaYH2TG1prh+l2JNJ?=
 =?us-ascii?Q?lXGKpv2hbEMeQm01ERQF43ZAXrnVSb6u/Vprt151u2hXsRrD6QE15q/Aay3N?=
 =?us-ascii?Q?c5tpcOykyPySiNWvNV2Em4UsP+29Z2Po7UWVVXkVJzXJMYqxPECmmGDZhJDo?=
 =?us-ascii?Q?EgQBoAY2+GEi3+y7GGQ8hWbMQICHTfCEfQQhuLdSysRbZAvDtQNo/GeLbbh/?=
 =?us-ascii?Q?Yx+ubLQ4Jn6r0XtSzG33VKUN2LtKfoaivnipWVSX?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 014b260c-4ec1-4303-9ea2-08dbd0aaff73
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:55:05.3427
 (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: Z/M7bpUdTq1+RLVpi9X8dl/+oxo0ksxqwZRlIItAPTT0y0N9k4ohSovKdwCijmJf/vD2e7JacOpt/tTIkvbE9Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7515
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=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]); Thu, 19 Oct 2023 06:55:15 -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.

---
 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 fa5cf1f54..be30d0efd 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