diff mbox series

[BlueZ] iso-tester: Introduce tests for Disconnect/Reconnect

Message ID 20220815190401.1176081-1-luiz.dentz@gmail.com
State New
Headers show
Series [BlueZ] iso-tester: Introduce tests for Disconnect/Reconnect | expand

Commit Message

Luiz Augusto von Dentz Aug. 15, 2022, 7:04 p.m. UTC
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This introduces a test that do use shutdown to disconnect an ISO socket
and then another one that attempts to reconnect it again to emulate
upper profile transitions.
---
 tools/iso-tester.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

Comments

bluez.test.bot@gmail.com Aug. 15, 2022, 9:27 p.m. UTC | #1
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=667762

---Test result---

Test Summary:
CheckPatch                    PASS      1.21 seconds
GitLint                       PASS      0.71 seconds
Prep - Setup ELL              PASS      32.82 seconds
Build - Prep                  PASS      0.83 seconds
Build - Configure             PASS      10.46 seconds
Build - Make                  PASS      962.41 seconds
Make Check                    PASS      13.13 seconds
Make Check w/Valgrind         PASS      342.14 seconds
Make Distcheck                PASS      289.07 seconds
Build w/ext ELL - Configure   PASS      10.59 seconds
Build w/ext ELL - Make        PASS      98.66 seconds
Incremental Build w/ patches  PASS      0.00 seconds
Scan Build                    PASS      582.45 seconds



---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org Aug. 16, 2022, 11:20 p.m. UTC | #2
Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Mon, 15 Aug 2022 12:04:01 -0700 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> This introduces a test that do use shutdown to disconnect an ISO socket
> and then another one that attempts to reconnect it again to emulate
> upper profile transitions.
> ---
>  tools/iso-tester.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 80 insertions(+)

Here is the summary with links:
  - [BlueZ] iso-tester: Introduce tests for Disconnect/Reconnect
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=9c3f35d6fd12

You are awesome, thank you!
diff mbox series

Patch

diff --git a/tools/iso-tester.c b/tools/iso-tester.c
index df46bc953f37..e4950ead7c69 100644
--- a/tools/iso-tester.c
+++ b/tools/iso-tester.c
@@ -136,6 +136,7 @@  struct test_data {
 	unsigned int io_id[2];
 	uint8_t client_num;
 	int step;
+	bool reconnect;
 };
 
 struct iso_client_data {
@@ -146,6 +147,7 @@  struct iso_client_data {
 	bool server;
 	bool bcast;
 	bool defer;
+	bool disconnect;
 };
 
 static void mgmt_debug(const char *str, void *user_data)
@@ -611,6 +613,18 @@  static const struct iso_client_data connect_16_2_1_send_recv = {
 	.recv = &send_16_2_1,
 };
 
+static const struct iso_client_data disconnect_16_2_1 = {
+	.qos = QOS_16_2_1,
+	.expect_err = 0,
+	.disconnect = true,
+};
+
+static const struct iso_client_data reconnect_16_2_1 = {
+	.qos = QOS_16_2_1,
+	.expect_err = 0,
+	.disconnect = true,
+};
+
 static const struct iso_client_data bcast_16_2_1_send = {
 	.qos = QOS_OUT_16_2_1,
 	.expect_err = 0,
@@ -1142,6 +1156,49 @@  static void iso_send(struct test_data *data, GIOChannel *io)
 		iso_recv(data, io);
 }
 
+static void setup_connect(struct test_data *data, uint8_t num, GIOFunc func);
+static gboolean iso_connect_cb(GIOChannel *io, GIOCondition cond,
+							gpointer user_data);
+
+static gboolean iso_disconnected(GIOChannel *io, GIOCondition cond,
+							gpointer user_data)
+{
+	struct test_data *data = user_data;
+
+	data->io_id[0] = 0;
+
+	if (cond & G_IO_HUP) {
+		tester_print("Successfully disconnected");
+
+		if (data->reconnect) {
+			data->reconnect = false;
+			setup_connect(data, 0, iso_connect_cb);
+			return FALSE;
+		}
+
+		tester_test_passed();
+	} else
+		tester_test_failed();
+
+	return FALSE;
+}
+
+static void iso_shutdown(struct test_data *data, GIOChannel *io)
+{
+	int sk, cl;
+
+	sk = g_io_channel_unix_get_fd(io);
+	cl = dup(sk);
+
+	data->io_id[0] = g_io_add_watch(io, G_IO_HUP, iso_disconnected, data);
+
+	/* Shutdown clone fd so the original fd don't HUP immediately and
+	 * properly wait for socket to be closed.
+	 */
+	shutdown(cl, SHUT_RDWR);
+	close(cl);
+}
+
 static gboolean iso_connect(GIOChannel *io, GIOCondition cond,
 							gpointer user_data)
 {
@@ -1195,6 +1252,8 @@  static gboolean iso_connect(GIOChannel *io, GIOCondition cond,
 			iso_send(data, io);
 		else if (isodata->recv)
 			iso_recv(data, io);
+		else if (isodata->disconnect)
+			iso_shutdown(data, io);
 		else
 			tester_test_passed();
 	}
@@ -1306,6 +1365,19 @@  static void test_connect(const void *test_data)
 	setup_connect(data, 0, iso_connect_cb);
 }
 
+static void setup_reconnect(struct test_data *data, uint8_t num, GIOFunc func)
+{
+	data->reconnect = true;
+	setup_connect(data, num, func);
+}
+
+static void test_reconnect(const void *test_data)
+{
+	struct test_data *data = tester_get_data();
+
+	setup_reconnect(data, 0, iso_connect_cb);
+}
+
 static void test_defer(const void *test_data)
 {
 	struct test_data *data = tester_get_data();
@@ -1726,6 +1798,14 @@  int main(int argc, char *argv[])
 							setup_powered,
 							test_connect);
 
+	test_iso("ISO Disconnect - Success", &disconnect_16_2_1,
+							setup_powered,
+							test_connect);
+
+	test_iso("ISO Reconnect - Success", &reconnect_16_2_1,
+							setup_powered,
+							test_reconnect);
+
 	test_iso("ISO Broadcaster - Success", &bcast_16_2_1_send, setup_powered,
 							test_bcast);
 	test_iso("ISO Broadcaster BIG 0x01 - Success", &bcast_1_16_2_1_send,