2020-03-28 00:34:55

by Sonny Sasaka

Subject: [PATCH] core/device: Handle Just-Works auto-accept

The kernel starts to always request confirmation to BlueZ daemon for
Just-Works pairing. In this patch the daemon does auto-accept if the
client has clearly indicated a pairing intent by calling the Pair()
D-Bus API.
---
src/device.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/device.c b/src/device.c
index 69f98e488..db14cc129 100644
--- a/src/device.c
+++ b/src/device.c
@@ -6168,12 +6168,22 @@ int device_confirm_passkey(struct btd_device *device, uint8_t type,

auth->passkey = passkey;

- if (confirm_hint)
+ if (confirm_hint) {
+ if (device->bonding != NULL) {
+ /* We know the client has indicated the intent to pair
+ * with the peer device, so we can auto-accept. */
+ btd_adapter_confirm_reply(device->adapter,
+ &device->bdaddr,
+ type, TRUE);
+ return 0;
+ }
+
err = agent_request_authorization(auth->agent, device,
confirm_cb, auth, NULL);
- else
+ } else {
err = agent_request_confirmation(auth->agent, device, passkey,
confirm_cb, auth, NULL);
+ }

if (err < 0) {
if (err == -EINPROGRESS) {
--
2.17.1

2020-03-31 06:31:23

by Luiz Augusto von Dentz

Subject: Re: [PATCH] core/device: Handle Just-Works auto-accept

Hi Sonny,

On Fri, Mar 27, 2020 at 5:36 PM Sonny Sasaka <[email protected]> wrote:
>
> The kernel starts to always request confirmation to BlueZ daemon for
> Just-Works pairing. In this patch the daemon does auto-accept if the
> client has clearly indicated a pairing intent by calling the Pair()
> D-Bus API.
> ---
> src/device.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index 69f98e488..db14cc129 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -6168,12 +6168,22 @@ int device_confirm_passkey(struct btd_device *device, uint8_t type,
>
> auth->passkey = passkey;
>
> - if (confirm_hint)
> + if (confirm_hint) {
> + if (device->bonding != NULL) {
> + /* We know the client has indicated the intent to pair
> + * with the peer device, so we can auto-accept. */
> + btd_adapter_confirm_reply(device->adapter,
> + &device->bdaddr,
> + type, TRUE);
> + return 0;
> + }
> +
> err = agent_request_authorization(auth->agent, device,
> confirm_cb, auth, NULL);
> - else
> + } else {
> err = agent_request_confirmation(auth->agent, device, passkey,
> confirm_cb, auth, NULL);
> + }
>
> if (err < 0) {
> if (err == -EINPROGRESS) {
> --
> 2.17.1
>
Applied.

--
Luiz Augusto von Dentz

2020-03-31 17:23:39

by Sonny Sasaka

Subject: Re: [PATCH] core/device: Handle Just-Works auto-accept

Thanks, Luiz.

On Mon, Mar 30, 2020 at 11:30 PM Luiz Augusto von Dentz
<[email protected]> wrote:
>
> Hi Sonny,
>
> On Fri, Mar 27, 2020 at 5:36 PM Sonny Sasaka <[email protected]> wrote:
> >
> > The kernel starts to always request confirmation to BlueZ daemon for
> > Just-Works pairing. In this patch the daemon does auto-accept if the
> > client has clearly indicated a pairing intent by calling the Pair()
> > D-Bus API.
> > ---
> > src/device.c | 14 ++++++++++++--
> > 1 file changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/device.c b/src/device.c
> > index 69f98e488..db14cc129 100644
> > --- a/src/device.c
> > +++ b/src/device.c
> > @@ -6168,12 +6168,22 @@ int device_confirm_passkey(struct btd_device *device, uint8_t type,
> >
> > auth->passkey = passkey;
> >
> > - if (confirm_hint)
> > + if (confirm_hint) {
> > + if (device->bonding != NULL) {
> > + /* We know the client has indicated the intent to pair
> > + * with the peer device, so we can auto-accept. */
> > + btd_adapter_confirm_reply(device->adapter,
> > + &device->bdaddr,
> > + type, TRUE);
> > + return 0;
> > + }
> > +
> > err = agent_request_authorization(auth->agent, device,
> > confirm_cb, auth, NULL);
> > - else
> > + } else {
> > err = agent_request_confirmation(auth->agent, device, passkey,
> > confirm_cb, auth, NULL);
> > + }
> >
> > if (err < 0) {
> > if (err == -EINPROGRESS) {
> > --
> > 2.17.1
> >
> Applied.
>
> --
> Luiz Augusto von Dentz