A folk is trying to qualify bluez and told that the following test would fail :
TP/BNEP/CTRL/BV-19-C. I searched the spec, errata and list archive. I haven't
found any informations or previous patch related to this test.
So I wrote a fix, but I think it shouldn't go upstream before it has been
validated and the folk cannot do that before next month. If anybody has access
to a test system sooner, please let me know.
This version is now restyled as per Luiz comments !
Frédéric Dalleau (1):
network: Reply to extensions at connection setup
network/server.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
--
1.7.5.4
Hi Frederic,
On Thu, May 31, 2012 at 3:09 PM, Dalleau, Frederic
<[email protected]> wrote:
> Luiz,
>
> On Thu, May 31, 2012 at 12:38 PM, Luiz Augusto von Dentz
> <[email protected]> wrote:
>> Hi Fr?d?ric,
>> Perhaps you can have a macro for getting just the header type without
>> the extension bit e.g. BNEP_HEADER(type) ((type) & ~BNEP_EXT_HEADER)
>>
>
> Why not, but in this case, it would make sense to also define a macro
> for reading the extension bit
> Something like : #define BNEP_EXTENDED(type) ((type) & BNEP_EXT_HEADER)
Yep, anything that makes it more obvious what it is doing is a good
idea to have.
--
Luiz Augusto von Dentz
Luiz,
On Thu, May 31, 2012 at 12:38 PM, Luiz Augusto von Dentz
<[email protected]> wrote:
> Hi Fr?d?ric,
> Perhaps you can have a macro for getting just the header type without
> the extension bit e.g. BNEP_HEADER(type) ((type) & ~BNEP_EXT_HEADER)
>
Why not, but in this case, it would make sense to also define a macro
for reading the extension bit
Something like : #define BNEP_EXTENDED(type) ((type) & BNEP_EXT_HEADER)
Is that ok for you?
Fr?d?ric
Hi Fr?d?ric,
On Thu, May 31, 2012 at 11:30 AM, Fr?d?ric Dalleau
<[email protected]> wrote:
> - ? ? ? if (req->type == BNEP_CONTROL &&
> + ? ? ? if ((req->type & ~BNEP_EXT_HEADER) == BNEP_CONTROL &&
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?req->ctrl > BNEP_FILTER_MULT_ADDR_RSP) {
> ? ? ? ? ? ? ? ?uint8_t pkt[3];
>
> @@ -390,7 +416,8 @@ static gboolean bnep_setup(GIOChannel *chan,
> ? ? ? ? ? ? ? ?return FALSE;
> ? ? ? ?}
>
> - ? ? ? if (req->type != BNEP_CONTROL || req->ctrl != BNEP_SETUP_CONN_REQ)
> + ? ? ? if ((req->type & ~BNEP_EXT_HEADER) != BNEP_CONTROL ||
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? req->ctrl != BNEP_SETUP_CONN_REQ)
> ? ? ? ? ? ? ? ?return FALSE;
>
Perhaps you can have a macro for getting just the header type without
the extension bit e.g. BNEP_HEADER(type) ((type) & ~BNEP_EXT_HEADER)
--
Luiz Augusto von Dentz
TP/BNEP/CTRL/BV-19-C is about extension in the BNEP_SETUP_CONN_REQ
control message. BNEP_SETUP_CONN_REQ is handled by bluetoothd before
giving control to kernel. Current bluez do not reply at all if an
extension is added to BNEP_SETUP_CONN_REQ. This patch fixes it by
sending COMMAND_NOT_UNDERSTOOD reply.
The test sends the following message :
> ACL data: handle 11 flags 0x02 dlen 37
L2CAP(d): cid 0x0040 len 33 [psm 15]
BNEP: Control(0x01|1)
Setup Req(0x01) size 0x02 dst 0x1116(NAP) src 0x1115(PANU)
Ext Control(0x00|1) len 0x07
Filter NetType Set(0x03) len 0x0004
0x8600 - 0x86dd
Ext Control(0x00|0) len 0x0f
Filter MultAddr Set(0x05) len 0x000c
03:00:00:20:00:00 - 03:00:00:20:00:00
A reply must be provided to each of the extensions, the patch triggers
the following answer:
< ACL data: handle 12 flags 0x00 dlen 8
L2CAP(d): cid 0x0040 len 4 [psm 15]
BNEP: Control(0x01|0)
Setup Rsp(0x02) res 0x0000
< ACL data: handle 12 flags 0x00 dlen 7
L2CAP(d): cid 0x0040 len 3 [psm 15]
BNEP: Control(0x01|0)
Not Understood(0x00) type 0x03
< ACL data: handle 12 flags 0x00 dlen 7
L2CAP(d): cid 0x0040 len 3 [psm 15]
BNEP: Control(0x01|0)
Not Understood(0x00) type 0x05
The following command can be used for testing:
printf "\x81\x01\x02\x11\x16\x11\x15\x80\x07\x03\x00\x04\x86\x00"\
"\x86\xdd\x00\x0f\x05\x00\x0c\x03\x00\x00\x20\x00\x00\x03\x00\x00"\
"\x20\x00\x00" > BNEP_CTRL_19.bin
./l2test -n -P 15 bb:dd:aa:dd:dd:rr -B BNEP_CTRL_19.bin -y
---
network/server.c | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/network/server.c b/network/server.c
index e39769a..49cead6 100644
--- a/network/server.c
+++ b/network/server.c
@@ -348,6 +348,32 @@ static void setup_destroy(void *user_data)
session_free(setup);
}
+static void parse_extensions(uint8_t *packet, int size, int sk)
+{
+ struct bnep_setup_conn_req *req = (void *) packet;
+ struct bnep_ext_hdr *ehdr;
+ int l;
+
+ l = sizeof(*req) + 2 * req->uuid_size;
+
+ while (l < size - (int) sizeof(*ehdr)) {
+ uint8_t pkt[3];
+
+ ehdr = (struct bnep_ext_hdr *) (packet + l);
+
+ pkt[0] = BNEP_CONTROL;
+ pkt[1] = BNEP_CMD_NOT_UNDERSTOOD;
+ pkt[2] = ehdr->len;
+
+ send(sk, pkt, sizeof(pkt), 0);
+
+ if (!(ehdr->type & BNEP_EXT_HEADER))
+ return;
+
+ l += sizeof(*ehdr) + ehdr->len;
+ }
+}
+
static gboolean bnep_setup(GIOChannel *chan,
GIOCondition cond, gpointer user_data)
{
@@ -377,7 +403,7 @@ static gboolean bnep_setup(GIOChannel *chan,
/* Highest known Control command ID
* is BNEP_FILTER_MULT_ADDR_RSP = 0x06 */
- if (req->type == BNEP_CONTROL &&
+ if ((req->type & ~BNEP_EXT_HEADER) == BNEP_CONTROL &&
req->ctrl > BNEP_FILTER_MULT_ADDR_RSP) {
uint8_t pkt[3];
@@ -390,7 +416,8 @@ static gboolean bnep_setup(GIOChannel *chan,
return FALSE;
}
- if (req->type != BNEP_CONTROL || req->ctrl != BNEP_SETUP_CONN_REQ)
+ if ((req->type & ~BNEP_EXT_HEADER) != BNEP_CONTROL ||
+ req->ctrl != BNEP_SETUP_CONN_REQ)
return FALSE;
rsp = bnep_setup_decode(req, &dst_role, &src_role);
@@ -427,6 +454,9 @@ static gboolean bnep_setup(GIOChannel *chan,
reply:
send_bnep_ctrl_rsp(sk, rsp);
+ if (req->type & BNEP_EXT_HEADER)
+ parse_extensions(packet, n, sk);
+
return FALSE;
}
--
1.7.5.4