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: <20200426210247.757-1-pali@kernel.org>
In-Reply-To: <20200426210247.757-1-pali@kernel.org>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Mon, 27 Apr 2020 09:44:50 -0700
Message-ID: <CABBYNZ+whHfHr27X8RgBpYv1980itzwTQmO03oR=DJDbgx78tQ@mail.gmail.com>
Subject: Re: [PATCH] device: Return error when ConnectProfile DBus method
 fails (second fix)
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 Sun, Apr 26, 2020 at 2:05 PM Pali Roh=C3=A1r <pali@kernel.org> wrote:
>
> This is fixup of commit 3aa815a31017e8793b030b04ef704ce85455b9aa. There i=
s
> another place which needs to distinguish between Connect and ConnectProfi=
le
> DBus method.
> ---
>  src/device.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/src/device.c b/src/device.c
> index 229579378..7b0eb256e 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -1861,7 +1861,9 @@ static DBusMessage *connect_profiles(struct btd_dev=
ice *dev, uint8_t bdaddr_type
>         dev->pending =3D create_pending_list(dev, uuid);
>         if (!dev->pending) {
>                 if (dev->svc_refreshed) {
> -                       if (find_service_with_state(dev->services,
> +                       if (dbus_message_is_method_call(msg, DEVICE_INTER=
FACE,
> +                                                       "Connect") &&
> +                               find_service_with_state(dev->services,
>                                                 BTD_SERVICE_STATE_CONNECT=
ED))

Perhaps it would be better to have a helper function that checks this for u=
s.

>                                 return dbus_message_new_method_return(msg=
);
>                         else
> --
> 2.20.1
>


--=20
Luiz Augusto von Dentz