2019-06-07 07:15:30

by Bastien Nocera

[permalink] [raw]
Subject: [PATCH 1/2] sixaxis: Fix another problem with already setup devices

If the device went through any kind of pairing once, it might have been
set as trusted. Make sure to set the device as untrusted before starting
the cable pairing authorization so that we don't exit early from
process_auth_queue() (which considers trusted devices to be paired).
---
plugins/sixaxis.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
index fed68d2d8..12638829b 100644
--- a/plugins/sixaxis.c
+++ b/plugins/sixaxis.c
@@ -365,6 +365,7 @@ static bool setup_device(int fd, const char *sysfs_path,

btd_device_device_set_name(device, cp->name);
btd_device_set_pnpid(device, cp->source, cp->vid, cp->pid, cp->version);
+ btd_device_set_trusted(device, false);
btd_device_set_temporary(device, true);

closure = g_new0(struct authentication_closure, 1);
--
2.21.0


2019-06-13 15:40:48

by Szymon Janc

[permalink] [raw]
Subject: Re: [PATCH 1/2] sixaxis: Fix another problem with already setup devices

Hi Bastien,

On Friday, 7 June 2019 08:54:10 CEST Bastien Nocera wrote:
> If the device went through any kind of pairing once, it might have been
> set as trusted. Make sure to set the device as untrusted before starting
> the cable pairing authorization so that we don't exit early from
> process_auth_queue() (which considers trusted devices to be paired).
> ---
> plugins/sixaxis.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
> index fed68d2d8..12638829b 100644
> --- a/plugins/sixaxis.c
> +++ b/plugins/sixaxis.c
> @@ -365,6 +365,7 @@ static bool setup_device(int fd, const char *sysfs_path,
>
> btd_device_device_set_name(device, cp->name);
> btd_device_set_pnpid(device, cp->source, cp->vid, cp->pid, cp-
>version);
> + btd_device_set_trusted(device, false);
> btd_device_set_temporary(device, true);
>
> closure = g_new0(struct authentication_closure, 1);

Both patches applied, thanks.


--
pozdrawiam
Szymon Janc