2013-12-23 15:07:25

by Andrei Emeltchenko

Subject: [PATCHv2] btdev: Return Command Status for Authentication Requested

From: Andrei Emeltchenko <[email protected]>

Add support for "Authentication Requested" command
---
emulator/btdev.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/emulator/btdev.c b/emulator/btdev.c
index d0dff74..b1e804b 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -268,6 +268,7 @@ static void set_bredr_commands(struct btdev *btdev)
btdev->commands[0] |= 0x80; /* Cancel Create Connection */
btdev->commands[1] |= 0x01; /* Accept Connection Request */
btdev->commands[1] |= 0x02; /* Reject Connection Request */
+ btdev->commands[1] |= 0x80; /* Authentication Requested */
btdev->commands[2] |= 0x08; /* Remote Name Request */
btdev->commands[2] |= 0x10; /* Cancel Remote Name Request */
btdev->commands[2] |= 0x20; /* Read Remote Supported Features */
@@ -1191,6 +1192,12 @@ static void default_cmd(struct btdev *btdev, uint16_t opcode,
cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
break;

+ case BT_HCI_CMD_AUTH_REQUESTED:
+ if (btdev->type == BTDEV_TYPE_LE)
+ return;
+ cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
+ break;
+
case BT_HCI_CMD_REMOTE_NAME_REQUEST:
if (btdev->type == BTDEV_TYPE_LE)
goto unsupported;
--
1.8.3.2

2013-12-23 17:06:51

by Johan Hedberg

Subject: Re: [PATCHv2] btdev: Return Command Status for Authentication Requested

Hi Andrei,

On Mon, Dec 23, 2013, Andrei Emeltchenko wrote:
> Add support for "Authentication Requested" command
> ---
> emulator/btdev.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/emulator/btdev.c b/emulator/btdev.c
> index d0dff74..b1e804b 100644
> --- a/emulator/btdev.c
> +++ b/emulator/btdev.c
> @@ -268,6 +268,7 @@ static void set_bredr_commands(struct btdev *btdev)
> btdev->commands[0] |= 0x80; /* Cancel Create Connection */
> btdev->commands[1] |= 0x01; /* Accept Connection Request */
> btdev->commands[1] |= 0x02; /* Reject Connection Request */
> + btdev->commands[1] |= 0x80; /* Authentication Requested */
> btdev->commands[2] |= 0x08; /* Remote Name Request */
> btdev->commands[2] |= 0x10; /* Cancel Remote Name Request */
> btdev->commands[2] |= 0x20; /* Read Remote Supported Features */
> @@ -1191,6 +1192,12 @@ static void default_cmd(struct btdev *btdev, uint16_t opcode,
> cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
> break;
>
> + case BT_HCI_CMD_AUTH_REQUESTED:
> + if (btdev->type == BTDEV_TYPE_LE)
> + return;

I think this should be "goto unsupported;" instead of a direct return.

Johan

2014-01-03 18:35:14

by Marcel Holtmann

Subject: Re: [PATCHv2] btdev: Return Command Status for Authentication Requested

Hi Johan,

>> Add support for "Authentication Requested" command
>> ---
>> emulator/btdev.c | 7 +++++++
>> 1 file changed, 7 insertions(+)
>>
>> diff --git a/emulator/btdev.c b/emulator/btdev.c
>> index 93361cd..0349f8a 100644
>> --- a/emulator/btdev.c
>> +++ b/emulator/btdev.c
>> @@ -269,6 +269,7 @@ static void set_bredr_commands(struct btdev *btdev)
>> btdev->commands[0] |= 0x80; /* Cancel Create Connection */
>> btdev->commands[1] |= 0x01; /* Accept Connection Request */
>> btdev->commands[1] |= 0x02; /* Reject Connection Request */
>> + btdev->commands[1] |= 0x80; /* Authentication Requested */
>> btdev->commands[2] |= 0x08; /* Remote Name Request */
>> btdev->commands[2] |= 0x10; /* Cancel Remote Name Request */
>> btdev->commands[2] |= 0x20; /* Read Remote Supported Features */
>> @@ -1202,6 +1203,12 @@ static void default_cmd(struct btdev *btdev, uint16_t opcode,
>> cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
>> break;
>>
>> + case BT_HCI_CMD_AUTH_REQUESTED:
>> + if (btdev->type == BTDEV_TYPE_LE)
>> + goto unsupported;
>> + cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
>> + break;
>> +
>> case BT_HCI_CMD_REMOTE_NAME_REQUEST:
>> if (btdev->type == BTDEV_TYPE_LE)
>> goto unsupported;
>
> I'd rather wait with this one until you've got a full set of patches
> that also implement the link key request event and the rest of the
> pairing procedure (if the link key request is followed by a negative
> link key reply).

since we do not install btvirt, I am fine if we even have incomplete functionality in it. However in this case we need to track if pairing is active. And also timeout the pairing. Otherwise everything will be blocked after one attempt.

So at minimum we need to store the current auth request state + start a timeout to make it timeout and send the auth failed event.

Regards

Marcel

2014-01-03 14:00:46

by Johan Hedberg

Subject: Re: [PATCHv2] btdev: Return Command Status for Authentication Requested

Hi Andrei,

On Fri, Jan 03, 2014, Andrei Emeltchenko wrote:
> Add support for "Authentication Requested" command
> ---
> emulator/btdev.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/emulator/btdev.c b/emulator/btdev.c
> index 93361cd..0349f8a 100644
> --- a/emulator/btdev.c
> +++ b/emulator/btdev.c
> @@ -269,6 +269,7 @@ static void set_bredr_commands(struct btdev *btdev)
> btdev->commands[0] |= 0x80; /* Cancel Create Connection */
> btdev->commands[1] |= 0x01; /* Accept Connection Request */
> btdev->commands[1] |= 0x02; /* Reject Connection Request */
> + btdev->commands[1] |= 0x80; /* Authentication Requested */
> btdev->commands[2] |= 0x08; /* Remote Name Request */
> btdev->commands[2] |= 0x10; /* Cancel Remote Name Request */
> btdev->commands[2] |= 0x20; /* Read Remote Supported Features */
> @@ -1202,6 +1203,12 @@ static void default_cmd(struct btdev *btdev, uint16_t opcode,
> cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
> break;
>
> + case BT_HCI_CMD_AUTH_REQUESTED:
> + if (btdev->type == BTDEV_TYPE_LE)
> + goto unsupported;
> + cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
> + break;
> +
> case BT_HCI_CMD_REMOTE_NAME_REQUEST:
> if (btdev->type == BTDEV_TYPE_LE)
> goto unsupported;

I'd rather wait with this one until you've got a full set of patches
that also implement the link key request event and the rest of the
pairing procedure (if the link key request is followed by a negative
link key reply).

Johan

2014-01-03 13:45:54

by Andrei Emeltchenko

Subject: [PATCHv2] btdev: Return Command Status for Authentication Requested

From: Andrei Emeltchenko <[email protected]>

Add support for "Authentication Requested" command
---
emulator/btdev.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 93361cd..0349f8a 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -269,6 +269,7 @@ static void set_bredr_commands(struct btdev *btdev)
btdev->commands[0] |= 0x80; /* Cancel Create Connection */
btdev->commands[1] |= 0x01; /* Accept Connection Request */
btdev->commands[1] |= 0x02; /* Reject Connection Request */
+ btdev->commands[1] |= 0x80; /* Authentication Requested */
btdev->commands[2] |= 0x08; /* Remote Name Request */
btdev->commands[2] |= 0x10; /* Cancel Remote Name Request */
btdev->commands[2] |= 0x20; /* Read Remote Supported Features */
@@ -1202,6 +1203,12 @@ static void default_cmd(struct btdev *btdev, uint16_t opcode,
cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
break;

+ case BT_HCI_CMD_AUTH_REQUESTED:
+ if (btdev->type == BTDEV_TYPE_LE)
+ goto unsupported;
+ cmd_status(btdev, BT_HCI_ERR_SUCCESS, opcode);
+ break;
+
case BT_HCI_CMD_REMOTE_NAME_REQUEST:
if (btdev->type == BTDEV_TYPE_LE)
goto unsupported;
--
1.8.3.2