Hi Simon,
On Tue, Jul 25, 2023 at 1:56 AM Simon Mikuda
<simon.mikuda@xxxxxxxxxxxxxxxxxxx> wrote:
>
> If discovery was requesed from pair request we will report successfull
> pairing even if there was an error during discovery.
> ---
> src/device.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index 446e978ee..35c46e451 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -6309,6 +6309,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
> struct bonding_req *bonding = device->bonding;
> struct authentication_req *auth = device->authr;
> struct bearer_state *state = get_state(device, bdaddr_type);
> + int err;
>
> DBG("bonding %p status 0x%02x", bonding, status);
>
> @@ -6358,8 +6359,16 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
> DBG("Proceeding with service discovery");
> /* If we are initiators remove any discovery timer and just
> * start discovering services directly */
> - device_discover_services(device, bdaddr_type, bonding->msg);
> -
> + err = device_discover_services(device, bdaddr_type, bonding->msg);
> + if (err) {
> + if (device->pending_paired) {
> + g_dbus_emit_property_changed(dbus_conn, device->path,
> + DEVICE_INTERFACE, "Paired");
> + device->pending_paired = false;
> + }
> + /* Disregard browse errors in case of Pair */
> + g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_TYPE_INVALID);
> + }
> bonding_request_free(bonding);
> } else if (!state->svc_resolved) {
> if (!device->browse && !device->discov_timer &&
> --
> 2.34.1
This looks like a fix so I'd recommend sending it separately rewording
the commit to something like: device: Fix returning discovery error
for Device.Pair...
--
Luiz Augusto von Dentz
