Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200423233243.14937-1-pali@kernel.org>
In-Reply-To: <20200423233243.14937-1-pali@kernel.org>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Fri, 24 Apr 2020 10:26:28 -0700
Message-ID: <CABBYNZLC4kfqg8uWj3pq0Gg4f8aSumFW_fJfUck9AVSLpY9Urg@mail.gmail.com>
Subject: Re: [PATCH] device: Return error when ConnectProfile DBus method fails
To:     =?UTF-8?Q?Pali_Roh=C3=A1r?= <pali@kernel.org>
Cc:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Hi Pali,

On Thu, Apr 23, 2020 at 4:36 PM Pali Roh=C3=A1r <pali@kernel.org> wrote:
>
> Without this patch ConnectProfile DBus method does not return failure if
> profile connection failed and some other profile was already connected.
> This is not correct behavior as ConnectProfile DBus method should always
> return error when specified profile failed to connect. This patch fixes
> this it.
> ---
>  src/device.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index a8d95346a..7ab30705f 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -1584,6 +1584,7 @@ static void device_profile_connected(struct btd_dev=
ice *dev,
>                                         struct btd_profile *profile, int =
err)
>  {
>         struct btd_service *pending;
> +       bool report_error;
>         GSList *l;
>
>         DBG("%s %s (%d)", profile->name, strerror(-err), -err);
> @@ -1632,9 +1633,16 @@ done:
>
>         DBG("returning response to %s", dbus_message_get_sender(dev->conn=
ect));
>
> -       l =3D find_service_with_state(dev->services, BTD_SERVICE_STATE_CO=
NNECTED);
> +       if (err && dbus_message_is_method_call(dev->connect, DEVICE_INTER=
FACE,
> +                                       "ConnectProfile"))
> +               report_error =3D true;
> +       else if (err && !find_service_with_state(dev->services,
> +                                       BTD_SERVICE_STATE_CONNECTED))
> +               report_error =3D true;
> +       else
> +               report_error =3D false;
>
> -       if (err && l =3D=3D NULL) {
> +       if (report_error) {
>                 /* Fallback to LE bearer if supported */
>                 if (err =3D=3D -EHOSTDOWN && dev->le && !dev->le_state.co=
nnected) {
>                         err =3D device_connect_le(dev);
> --
> 2.20.1

Applied, notice that I did some changes to make it a little more
simple but the end result is the same.

--=20
Luiz Augusto von Dentz