From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v2 2/2] l2cap-tester: Add tests for connection timeout
Date: Thu, 14 Sep 2023 14:10:03 -0700 [thread overview]
Message-ID: <20230914211003.3339238-2-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20230914211003.3339238-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds the following tests which attempts to use SO_SNDTIMEO so the
socket times out before the connection completes:
L2CAP BR/EDR Client - Timeout
L2CAP LE Client - Timeout
L2CAP Ext-Flowctl Client - Timeout
---
tools/l2cap-tester.c | 82 ++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 80 insertions(+), 2 deletions(-)
diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c
index f4810e3eacea..461f2c27c456 100644
--- a/tools/l2cap-tester.c
+++ b/tools/l2cap-tester.c
@@ -52,6 +52,7 @@ struct l2cap_data {
uint16_t cid;
uint8_t mode;
int expect_err;
+ int timeout;
uint8_t send_cmd_code;
const void *send_cmd;
@@ -275,6 +276,11 @@ static const struct l2cap_data client_connect_close_test = {
.client_psm = 0x1001,
};
+static const struct l2cap_data client_connect_timeout_test = {
+ .client_psm = 0x1001,
+ .timeout = 1
+};
+
static const struct l2cap_data client_connect_ssp_success_test_1 = {
.client_psm = 0x1001,
.server_psm = 0x1001,
@@ -446,6 +452,11 @@ static const struct l2cap_data le_client_connect_close_test_1 = {
.client_psm = 0x0080,
};
+static const struct l2cap_data le_client_connect_timeout_test_1 = {
+ .client_psm = 0x0080,
+ .timeout = 1,
+};
+
static const struct l2cap_data le_client_connect_adv_success_test_1 = {
.client_psm = 0x0080,
.server_psm = 0x0080,
@@ -691,6 +702,12 @@ static const struct l2cap_data ext_flowctl_client_connect_close_test_1 = {
.mode = BT_MODE_EXT_FLOWCTL,
};
+static const struct l2cap_data ext_flowctl_client_connect_timeout_test_1 = {
+ .client_psm = 0x0080,
+ .mode = BT_MODE_EXT_FLOWCTL,
+ .timeout = 1,
+};
+
static const struct l2cap_data ext_flowctl_client_connect_adv_success_test_1 = {
.client_psm = 0x0080,
.server_psm = 0x0080,
@@ -793,6 +810,11 @@ static void setup_powered_client_callback(uint8_t status, uint16_t length,
tester_print("Controller powered on");
+ if (l2data && l2data->timeout) {
+ tester_setup_complete();
+ return;
+ }
+
bthost = hciemu_client_get_host(data->hciemu);
bthost_set_cmd_complete_cb(bthost, client_cmd_complete, user_data);
@@ -1133,9 +1155,11 @@ static gboolean socket_closed_cb(GIOChannel *io, GIOCondition cond,
else
err = -sk_err;
- if (-err != l2data->expect_err)
+ if (!l2data->timeout && -err != l2data->expect_err) {
+ tester_print("err %d != %d expected_err", -err,
+ l2data->expect_err);
tester_test_failed();
- else
+ } else
tester_test_passed();
return FALSE;
@@ -1517,6 +1541,50 @@ static void test_connect_close(const void *test_data)
shutdown(sk, SHUT_RDWR);
}
+static void test_connect_timeout(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+ const struct l2cap_data *l2data = data->test_data;
+ GIOChannel *io;
+ int sk;
+ struct timeval sndto;
+ socklen_t len;
+
+ sk = create_l2cap_sock(data, 0, l2data->cid, l2data->sec_level,
+ l2data->mode);
+ if (sk < 0) {
+ if (sk == -ENOPROTOOPT)
+ tester_test_abort();
+ else
+ tester_test_failed();
+ return;
+ }
+
+ memset(&sndto, 0, sizeof(sndto));
+
+ sndto.tv_sec = l2data->timeout;
+ len = sizeof(sndto);
+ if (setsockopt(sk, SOL_SOCKET, SO_SNDTIMEO, &sndto, len) < 0) {
+ tester_print("Can't set SO_SNDTIMEO: %s (%d)", strerror(errno),
+ errno);
+ close(sk);
+ tester_test_failed();
+ return;
+ }
+
+ if (connect_l2cap_sock(data, sk, l2data->client_psm,
+ l2data->cid) < 0) {
+ close(sk);
+ tester_test_failed();
+ return;
+ }
+
+ io = g_io_channel_unix_new(sk);
+ g_io_channel_set_close_on_unref(io, TRUE);
+ data->io_id = g_io_add_watch(io, G_IO_HUP, socket_closed_cb, NULL);
+ g_io_channel_unref(io);
+}
+
static void test_connect_reject(const void *test_data)
{
struct test_data *data = tester_get_data();
@@ -2189,6 +2257,10 @@ int main(int argc, char *argv[])
&client_connect_close_test,
setup_powered_client,
test_connect_close);
+ test_l2cap_bredr("L2CAP BR/EDR Client - Timeout",
+ &client_connect_timeout_test,
+ setup_powered_client,
+ test_connect_timeout);
test_l2cap_bredr("L2CAP BR/EDR Client SSP - Success 1",
&client_connect_ssp_success_test_1,
@@ -2259,6 +2331,9 @@ int main(int argc, char *argv[])
test_l2cap_le("L2CAP LE Client - Close",
&le_client_connect_close_test_1,
setup_powered_client, test_connect_close);
+ test_l2cap_le("L2CAP LE Client - Timeout",
+ &le_client_connect_timeout_test_1,
+ setup_powered_client, test_connect_timeout);
test_l2cap_le("L2CAP LE Client, Direct Advertising - Success",
&le_client_connect_adv_success_test_1,
setup_powered_client, test_connect);
@@ -2307,6 +2382,9 @@ int main(int argc, char *argv[])
test_l2cap_le("L2CAP Ext-Flowctl Client - Close",
&ext_flowctl_client_connect_close_test_1,
setup_powered_client, test_connect_close);
+ test_l2cap_le("L2CAP Ext-Flowctl Client - Timeout",
+ &ext_flowctl_client_connect_timeout_test_1,
+ setup_powered_client, test_connect_timeout);
test_l2cap_le("L2CAP Ext-Flowctl Client, Direct Advertising - Success",
&ext_flowctl_client_connect_adv_success_test_1,
setup_powered_client, test_connect);
--
2.41.0
next prev parent reply other threads:[~2023-09-14 21:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 21:10 [PATCH v2 1/2] l2cap-tester: Add tests for closing socket before connection completes Luiz Augusto von Dentz
2023-09-14 21:10 ` Luiz Augusto von Dentz [this message]
2023-09-14 22:57 ` [v2,1/2] " bluez.test.bot
2023-09-15 19:50 ` [PATCH v2 1/2] " patchwork-bot+bluetooth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230914211003.3339238-2-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.