Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-2856-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Iulia Tanasescu <iulia.tanasescu@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 <iulia.tanasescu@nxp.com>
Subject: [PATCH BlueZ 2/2] iso-tester: Separate iso_defer_accept into dedicated functions
Date: Wed, 27 Mar 2024 18:10:19 +0200
Message-Id: <20240327161019.3078-3-iulia.tanasescu@nxp.com>
In-Reply-To: <20240327161019.3078-1-iulia.tanasescu@nxp.com>
References: <20240327161019.3078-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?OnyegGJstlI6dR6yNaMlOwb4oIJEcRLDmOdm9diyr7sxcIMgGROK6sz9Qswg?=
 =?us-ascii?Q?sNHxF2Jz3cbGm7Xfibtds3jRgzFNVZRSpSeFsv3kH6Uwr6WL7rV1mEnIW5e2?=
 =?us-ascii?Q?ZwF5c0rmAZmB53n+uhsU93oTOLjn7dtWMirUZXei2MVsxZZUXjb+1lNfKlkV?=
 =?us-ascii?Q?YrCPnetB0jDhvejyZnm9KqsXEL9yCD+dFbh11UH15rUgvyLG900VIVAZE7K3?=
 =?us-ascii?Q?tj7YxGp1mvL6a/wJe3/8FsWtq10vxZpmikVJAHW6jzxDjdLdbO1FsPA0MfBa?=
 =?us-ascii?Q?N/VRLGp2iVWaWv5C3Q/Xf7xz73BvRvZIdMuZZPjf/b/KIfEcKOws2v1ZsRIF?=
 =?us-ascii?Q?arxDD1TkunyPsHL6dRlF0hpSUdYNqBdiKexQJEAsK+HvtWA9k/yEvIhONKJX?=
 =?us-ascii?Q?/dUlG/uFENwN9KOEatEatV7uRwqGgOd+5nvQE+9Vs2rLNQkXyMbOXqeslXk1?=
 =?us-ascii?Q?M9z6o9BVILI5IpfgXfsjfzvZEL1olWc98l2iNbUqbiTj1sgEGTMa7ckvT5RB?=
 =?us-ascii?Q?xP1WmhJ5oC3uhCqB/6cT34Zyx24vNs0eXSzg44ICPHByfUPOiGe8GRS4Yepx?=
 =?us-ascii?Q?9vxLuVCgCLQs+jgpUyn6ZrYbf7qZeEiV8mKoTpSB3/aBcJUcQ7U8GphVJvOu?=
 =?us-ascii?Q?mAGSsRuQ+YTRAFUjRj6XLinuxcSe4EOqZHLdPiYdWe63K7NO/Zi4OV+Atefl?=
 =?us-ascii?Q?W+l5NDzHM3zuPsZPmvcUqlft4s9F9NQtltw7wOXXcsJow8lGM2u+s6p++iLY?=
 =?us-ascii?Q?e1LN7OHD3j61d2pPUq1b9tSZF2GeixIhYyx66SUzzXeDkXbtSJPD+VJGgddZ?=
 =?us-ascii?Q?lAi7eJYKISTbwSvpA6Di+3kl6lUzybhRppRr4Gm+ZkHBHUJHr6HuXzF2o8tY?=
 =?us-ascii?Q?CFe5ONc1e1saFzggAeEZ+QjMj04oiO5HqKtJVH1u1kh8hwsZw3qYYer2OojM?=
 =?us-ascii?Q?+t4jlhRvtGUNXMYPp42hXRMcjVlG7fDEJKZcCzXzkDeF7RGcMDhA3Ggy9O+f?=
 =?us-ascii?Q?i56ZYaK5LtGial1FB5zFRY68IKvDEcIrgI4wBc2TZKdQEj9k6PkygDUdovTx?=
 =?us-ascii?Q?ATxJTb4FExrUBSuCAKIPIDwhvHxVrfzXV/pG+9NCTsjzV9a+cJ0dPHV0FLDs?=
 =?us-ascii?Q?yTGu9nyJCpxjIC9fwzH+69kAqapMIyCLeBfFzOBqlRcqJOVfosVzDukM0kAk?=
 =?us-ascii?Q?lxltByEIfpKE0i9KA7ttwKRD5tZLulmdEeL29NhIU2sgQUrMwou1TJtS9E87?=
 =?us-ascii?Q?8jjq7970uDcscarJMxc4ZcY9VaTGpNTrBBRMQLXQpEcrjZwUVetDlmE5uZ7c?=
 =?us-ascii?Q?gS9WyGfM5ZB3FgpnC2LBz3R+soDWIjEj237d5RtSVKxD9k/M5Bmku7/K72Wa?=
 =?us-ascii?Q?C/Rs8rColAqta9wvHwaAvUd/iTVr8BiVF0i66ZhstryFpfTKpQVUVwOQbnY0?=
 =?us-ascii?Q?tp8BLComSDzWn9HOeH7iyFdVPBypc8pCgWMKgDPcKLqgEnSV1EZWW7bhy9Ds?=
 =?us-ascii?Q?YswWDMo7Egkdf/kBX76MzXgnNv/oR5HMxuF51dje1Sl/qqaft8T8Fgi0ZjO6?=
 =?us-ascii?Q?iZq50jM45y3cFk07ISjTBLPEAyZzecsK3p9IXeQucJSrSMvj+6mzIPJP0p8q?=
 =?us-ascii?Q?/A=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6315a400-973e-439f-1725-08dc4e786c0b
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 16:10:29.6629
 (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+dJpPz25sNb94iW0nTG9kLy5tQVO4WKjnqodzdnmxuVkqONADstw+18JTYCSBAT33y/472clMcwB6RkaXrEAQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9566

This separates the iso_defer_accept function into dedicated ones for
unicast/broadcast, since the flow is different for each scenario:
For unicast, POLLOUT is checked on socket before calling read and
adding a G_IO_OUT watch. Checking for POLLOUT is not necessary for
broadcast, since currently this event is never generated on the
child socket. Instead, G_IO_IN is generated after BIG sync is
established and a BIS socket is ready to be accepted.
---
 tools/iso-tester.c | 45 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/tools/iso-tester.c b/tools/iso-tester.c
index 1864b9e9d..60afef301 100644
--- a/tools/iso-tester.c
+++ b/tools/iso-tester.c
@@ -4,7 +4,7 @@
  *  BlueZ - Bluetooth protocol stack for Linux
  *
  *  Copyright (C) 2022  Intel Corporation.
- *  Copyright 2023 NXP
+ *  Copyright 2023-2024 NXP
  *
  */
 
@@ -489,6 +489,8 @@ struct iso_client_data {
 	bool pa_bind;
 };
 
+typedef bool (*iso_defer_accept_t)(struct test_data *data, GIOChannel *io);
+
 static void mgmt_debug(const char *str, void *user_data)
 {
 	const char *prefix = user_data;
@@ -2582,11 +2584,10 @@ static void setup_listen(struct test_data *data, uint8_t num, GIOFunc func)
 	}
 }
 
-static bool iso_defer_accept(struct test_data *data, GIOChannel *io)
+static bool iso_defer_accept_bcast(struct test_data *data, GIOChannel *io)
 {
 	int sk;
 	char c;
-	struct pollfd pfd;
 	const struct iso_client_data *isodata = data->test_data;
 	struct sockaddr_iso *addr = NULL;
 
@@ -2610,6 +2611,31 @@ static bool iso_defer_accept(struct test_data *data, GIOChannel *io)
 		free(addr);
 	}
 
+	if (read(sk, &c, 1) < 0) {
+		tester_warn("read: %s (%d)", strerror(errno), errno);
+		return false;
+	}
+
+	tester_print("Accept deferred setup");
+
+	data->io_queue = queue_new();
+	if (data->io_queue)
+		queue_push_tail(data->io_queue, io);
+
+	data->io_id[0] = g_io_add_watch(io, G_IO_IN,
+				iso_accept_cb, NULL);
+
+	return true;
+}
+
+static bool iso_defer_accept_ucast(struct test_data *data, GIOChannel *io)
+{
+	int sk;
+	char c;
+	struct pollfd pfd;
+
+	sk = g_io_channel_unix_get_fd(io);
+
 	memset(&pfd, 0, sizeof(pfd));
 	pfd.fd = sk;
 	pfd.events = POLLOUT;
@@ -2632,12 +2658,8 @@ static bool iso_defer_accept(struct test_data *data, GIOChannel *io)
 	if (data->io_queue)
 		queue_push_tail(data->io_queue, io);
 
-	if (isodata->bcast)
-		data->io_id[0] = g_io_add_watch(io, G_IO_IN,
-					iso_accept_cb, NULL);
-	else
-		data->io_id[0] = g_io_add_watch(io, G_IO_OUT,
-					iso_connect_cb, NULL);
+	data->io_id[0] = g_io_add_watch(io, G_IO_OUT,
+				iso_connect_cb, NULL);
 
 	return true;
 }
@@ -2648,6 +2670,9 @@ static gboolean iso_accept_cb(GIOChannel *io, GIOCondition cond,
 	struct test_data *data = tester_get_data();
 	const struct iso_client_data *isodata = data->test_data;
 	int sk, new_sk;
+	iso_defer_accept_t iso_accept = isodata->bcast ?
+						iso_defer_accept_bcast :
+						iso_defer_accept_ucast;
 
 	data->io_id[0] = 0;
 
@@ -2676,7 +2701,7 @@ static gboolean iso_accept_cb(GIOChannel *io, GIOCondition cond,
 				return false;
 		}
 
-		if (!iso_defer_accept(data, io)) {
+		if (!iso_accept(data, io)) {
 			tester_warn("Unable to accept deferred setup");
 			tester_test_failed();
 		}
-- 
2.39.2