Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230725084431.640332-1-simon.mikuda@streamunlimited.com> <20230725084431.640332-7-simon.mikuda@streamunlimited.com>
In-Reply-To: <20230725084431.640332-7-simon.mikuda@streamunlimited.com>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Thu, 27 Jul 2023 11:46:32 -0700
Message-ID: <CABBYNZ+R2HFUiMY5xhLVPsWO20qM=+3h6_RVW=ar-gPq-oZTPA@mail.gmail.com>
Subject: Re: [PATCH BlueZ 6/8] device: Handle error from discover services
 request after pair
To:     Simon Mikuda <simon.mikuda@streamunlimited.com>
Cc:     linux-bluetooth@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Simon,

On Tue, Jul 25, 2023 at 1:56=E2=80=AFAM Simon Mikuda
<simon.mikuda@streamunlimited.com> 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 *dev=
ice, uint8_t bdaddr_type,
>         struct bonding_req *bonding =3D device->bonding;
>         struct authentication_req *auth =3D device->authr;
>         struct bearer_state *state =3D 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 *de=
vice, uint8_t bdaddr_type,
>                 DBG("Proceeding with service discovery");
>                 /* If we are initiators remove any discovery timer and ju=
st
>                  * start discovering services directly */
> -               device_discover_services(device, bdaddr_type, bonding->ms=
g);
> -
> +               err =3D device_discover_services(device, bdaddr_type, bon=
ding->msg);
> +               if (err) {
> +                       if (device->pending_paired) {
> +                               g_dbus_emit_property_changed(dbus_conn, d=
evice->path,
> +                                               DEVICE_INTERFACE, "Paired=
");
> +                               device->pending_paired =3D false;
> +                       }
> +                       /* Disregard browse errors in case of Pair */
> +                       g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_T=
YPE_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...

--=20
Luiz Augusto von Dentz