This patch adds -l option which allows to create listening l2cap socket
without any send or receive action after connection is done.
This is useful to trigger LOCAL BUSY mode in PTS ERTM testing.
---
tools/l2test.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/tools/l2test.c b/tools/l2test.c
index 67ca70a..9fd3c46 100644
--- a/tools/l2test.c
+++ b/tools/l2test.c
@@ -70,6 +70,7 @@ enum {
CSENDRECV,
INFOREQ,
PAIRING,
+ LNRCV,
};
static unsigned char *buf;
@@ -1036,6 +1037,12 @@ static void send_and_recv_mode(int sk)
return;
}
+static void not_receive_mode(int sk) {
+
+ syslog(LOG_INFO, "Connected and not receiving !");
+ while (1) {};
+}
+
static void reconnect_mode(char *svr)
{
while (1) {
@@ -1290,6 +1297,7 @@ static void usage(void)
"\t-d listen and dump incoming data\n"
"\t-x listen, then send, then dump incoming data\n"
"\t-t listen, then send and receive at the same time\n"
+ "\t-l listen, then do nothing (don't receive, don't send)\n"
"\t-q connect, then send and receive at the same time\n"
"\t-s connect and send\n"
"\t-u connect and receive\n"
@@ -1335,7 +1343,7 @@ int main(int argc, char *argv[])
bacpy(&bdaddr, BDADDR_ANY);
- while ((opt = getopt(argc, argv, "rdscuwmntqxyzpb:a:"
+ while ((opt = getopt(argc, argv, "rdlscuwmntqxyzpb:a:"
"i:P:I:O:J:B:N:L:W:C:D:X:F:Q:Z:Y:H:K:V:RUGAESMT")) != EOF) {
switch (opt) {
case 'r':
@@ -1360,6 +1368,10 @@ int main(int argc, char *argv[])
mode = DUMP;
break;
+ case 'l':
+ mode = LNRCV;
+ break;
+
case 'c':
mode = RECONNECT;
need_addr = 1;
@@ -1646,6 +1658,10 @@ int main(int argc, char *argv[])
case PAIRING:
do_pairing(argv[optind]);
exit(0);
+
+ case LNRCV:
+ do_listen(not_receive_mode);
+ break;
}
syslog(LOG_INFO, "Exit");
--
1.8.4
Hi Johan,
On 13 August 2014 11:22, Johan Hedberg <[email protected]> wrote:
> Hi Lukasz,
>
> On Wed, Aug 13, 2014, Lukasz Rymanowski wrote:
>> +static void not_receive_mode(int sk) {
>> +
>> + syslog(LOG_INFO, "Connected and not receiving !");
>> + while (1) {};
>> +}
>
> A busy-loop taking up all CPU time doesn't seem very nice. Shouldn't you
> instead be at least polling for HUP/ERR events? That's what the
> do_listen function seems to expect to have happened when the handler
> returns.
>
You are right, even it is test tool. Anyway, we don't need that patch
at all as wrote in other email.
> Johan
Lukasz
Hi,
On 13 August 2014 11:11, Lukasz Rymanowski <[email protected]> wrote:
> This patch adds -l option which allows to create listening l2cap socket
> without any send or receive action after connection is done.
>
> This is useful to trigger LOCAL BUSY mode in PTS ERTM testing.
> ---
> tools/l2test.c | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/tools/l2test.c b/tools/l2test.c
> index 67ca70a..9fd3c46 100644
> --- a/tools/l2test.c
> +++ b/tools/l2test.c
> @@ -70,6 +70,7 @@ enum {
> CSENDRECV,
> INFOREQ,
> PAIRING,
> + LNRCV,
> };
>
> static unsigned char *buf;
> @@ -1036,6 +1037,12 @@ static void send_and_recv_mode(int sk)
> return;
> }
>
> +static void not_receive_mode(int sk) {
> +
> + syslog(LOG_INFO, "Connected and not receiving !");
> + while (1) {};
> +}
> +
> static void reconnect_mode(char *svr)
> {
> while (1) {
> @@ -1290,6 +1297,7 @@ static void usage(void)
> "\t-d listen and dump incoming data\n"
> "\t-x listen, then send, then dump incoming data\n"
> "\t-t listen, then send and receive at the same time\n"
> + "\t-l listen, then do nothing (don't receive, don't send)\n"
> "\t-q connect, then send and receive at the same time\n"
> "\t-s connect and send\n"
> "\t-u connect and receive\n"
> @@ -1335,7 +1343,7 @@ int main(int argc, char *argv[])
>
> bacpy(&bdaddr, BDADDR_ANY);
>
> - while ((opt = getopt(argc, argv, "rdscuwmntqxyzpb:a:"
> + while ((opt = getopt(argc, argv, "rdlscuwmntqxyzpb:a:"
> "i:P:I:O:J:B:N:L:W:C:D:X:F:Q:Z:Y:H:K:V:RUGAESMT")) != EOF) {
> switch (opt) {
> case 'r':
> @@ -1360,6 +1368,10 @@ int main(int argc, char *argv[])
> mode = DUMP;
> break;
>
> + case 'l':
> + mode = LNRCV;
> + break;
> +
> case 'c':
> mode = RECONNECT;
> need_addr = 1;
> @@ -1646,6 +1658,10 @@ int main(int argc, char *argv[])
> case PAIRING:
> do_pairing(argv[optind]);
> exit(0);
> +
> + case LNRCV:
> + do_listen(not_receive_mode);
> + break;
> }
>
> syslog(LOG_INFO, "Exit");
> --
> 1.8.4
>
You can ignore this patch. Just find out that using optiion -r with a
delay (-K) and small receive buffer (-H) I can pass PTS test.
BR
Lukasz
Hi Lukasz,
On Wed, Aug 13, 2014, Lukasz Rymanowski wrote:
> +static void not_receive_mode(int sk) {
> +
> + syslog(LOG_INFO, "Connected and not receiving !");
> + while (1) {};
> +}
A busy-loop taking up all CPU time doesn't seem very nice. Shouldn't you
instead be at least polling for HUP/ERR events? That's what the
do_listen function seems to expect to have happened when the handler
returns.
Johan