Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
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 v3 2/2] bap: Fix source+sink endpoint registration
Date:   Wed, 25 Oct 2023 12:18:53 +0300
Message-Id: <20231025091853.18647-3-claudia.rosu@nxp.com>
In-Reply-To: <20231025091853.18647-1-claudia.rosu@nxp.com>
References: <20231025091853.18647-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?vI42RjoXlaD4gTJZteyQ/BcHenpaQIzy5NgDGotUCQckkuDlJDzmDd99LE8C?=
 =?us-ascii?Q?o7KPuUFaqjt1poWU3kP4YjzOOIWixd8iBELkc2+d+XJ2j9beFzhJOK+JERSp?=
 =?us-ascii?Q?vf1YsuiST2+tPwGp3XKjzvxzkRQ5JxNQHtSVCvvRwPEn7nJV7zHv4UeD4sxH?=
 =?us-ascii?Q?rUPqcGqrjEMaaUerqGJj+yxtGvDZC+Z3QShODtrNKKnTH+0b8Abx1bI2ZsWq?=
 =?us-ascii?Q?Q1kEwwjECBjHRYgjxlKEtmIBgxh/VB1yq9A5q/JsxhGqAvx5QKPMGdP8osYG?=
 =?us-ascii?Q?4YizBTgXgwXx3O+/Tn77gBIMVIdf7qtJYc6sgtg+NGmh1+PN6mZtfEucNfUE?=
 =?us-ascii?Q?r5pL1bOvDhqoa7RaPdOoy3YMXX2AxIsOcZuQnkhkppgdYFsmxRWNM2rr65mE?=
 =?us-ascii?Q?SsymxUqDeJL0dRMBMLjslWHIkh0krsZCS3R9LHncikno2hL5B38LAI1uGptw?=
 =?us-ascii?Q?TS6wW8+bN/Hz9rtesg8bD3expXHUZNt8pNIx0cq5qPhnPm2rvE37+RcHohdr?=
 =?us-ascii?Q?x14qzuWSOOjgCXr0oKqosvpFLGBTd/jAq3J4VN/L1TyAAp6pCNQfK5yuJjqV?=
 =?us-ascii?Q?L2Nj57aSZErVFoPJyMnDGZHI9XNLlRqBNMWGLD1ZN5B462cWPW+bKEVwWnHb?=
 =?us-ascii?Q?kWyrNo01l4GAnKzpvdgy5flvukTOwQBKImqttFXjgj11Obo5+YFka0lH8lA7?=
 =?us-ascii?Q?VeszKMKItEKC9FPy6UBNVt6kq8OsWjxGEMnRfFr2fmshgWindHdzcO3FjfqC?=
 =?us-ascii?Q?Rm7zzxtazcO6RgMuLxHErAUIn/8cyD2ATMr5kIZM5LHNWFwAHrtWmkc+IN4m?=
 =?us-ascii?Q?M8fk4Q0a5WZ1kBscbFjdJEqXvjmH5FMavjWWE1BAg5/fYD8kBJSrmf5ec8dS?=
 =?us-ascii?Q?uNAe+en9+dy6qG+nKDnKv2jYFg2PVznGiy++dgzwn0FnANSYRlDvS5B8zs1w?=
 =?us-ascii?Q?ezKZOecxRQZ3nUfXlDTeU+sfItCgJMhVSXGUrlyBZgW3PVUq8atTwDUJw//L?=
 =?us-ascii?Q?NcuLDDnu/uofphJbKR+EMMzAMN58JNkD9asPPRTO35Oclm/IyqrQm7KjmYWo?=
 =?us-ascii?Q?RBfaBcjkXzsKRnXbOrwAIhXEg0BXZA5Dvs8U6ocY2EKslrd3Fm1tuOejZQ1a?=
 =?us-ascii?Q?JQM1OKLgzJh5BUbszFh/4WRBeUM5Fr6aV0FQPhtnTVUse5n2Me69r8zBh5sT?=
 =?us-ascii?Q?sfbMcMlbMT9Vy1pEdwhbRC8mz79WJfLqw+Yv+Qow9Xwb1JTgPYVSZm2J/c36?=
 =?us-ascii?Q?35Tf6XsLyHF6AV6EbNVesXZ1xy2lAbcg6LGd0RrNkpq0ckRb2EQEo6yMzDv7?=
 =?us-ascii?Q?wDWID9ImpjurEYi/UYPMzUgrlif7m9W46oWh9aVW0LohmoZsl6MDRFwsOBbl?=
 =?us-ascii?Q?Os3yXLEkS8rQ6pzSARmjapB5wWWK4CiQPYaNagYnfZqD51dKChJnqaI8fDG5?=
 =?us-ascii?Q?/JqpDXuXS/AFVB63bqZkzOsRkRIs+AQjWiuYbDoZevfucfeLg9A3DHk/1BDg?=
 =?us-ascii?Q?iVHBiK5b9Qjo7pTMeoyqreAAOR79oQcqV9Pwghk9HisSH9QXD6F9F4STG/Vy?=
 =?us-ascii?Q?0jd4ZwwtVHxL7FOaLRTANaw62SNQADPgkXH2hnVw?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7933af0d-b3ea-46d4-d736-08dbd53b74be
X-MS-Exchange-CrossTenant-AuthSource: GV1PR04MB9151.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 09:19:14.2860
 (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: uvqeF8RPf36CgHexADD+xcEhHs9FqLU4eRNp2/84Z91kBu/wwWO1dHrhfZm07ejCX35RIg/i3QlU0+bk9MYIng==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9369
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]); Wed, 25 Oct 2023 02:19:23 -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 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