* [PATCH BlueZ] core/device: Fix not connecting services properly
@ 2016-08-12 8:26 Luiz Augusto von Dentz
2016-08-15 10:13 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2016-08-12 8:26 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Device.Connect shall check if the service discovery is pending or no
service have been connected yet before switching to LE otherwise these
services may never be connected.
---
src/device.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/device.c b/src/device.c
index 6c6be92..c103bb2 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1779,9 +1779,18 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
struct btd_device *dev = user_data;
uint8_t bdaddr_type;
- if (dev->bredr_state.connected)
- bdaddr_type = dev->bdaddr_type;
- else if (dev->le_state.connected && dev->bredr)
+ if (dev->bredr_state.connected) {
+ /*
+ * Check if services have been resolved and there is at list
+ * one connected before switching to connect LE.
+ */
+ if (dev->bredr_state.svc_resolved &&
+ find_service_with_state(dev->services,
+ BTD_SERVICE_STATE_CONNECTED))
+ bdaddr_type = dev->bdaddr_type;
+ else
+ bdaddr_type = BDADDR_BREDR;
+ } else if (dev->le_state.connected && dev->bredr)
bdaddr_type = BDADDR_BREDR;
else
bdaddr_type = select_conn_bearer(dev);
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH BlueZ] core/device: Fix not connecting services properly
2016-08-12 8:26 [PATCH BlueZ] core/device: Fix not connecting services properly Luiz Augusto von Dentz
@ 2016-08-15 10:13 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2016-08-15 10:13 UTC (permalink / raw)
To: linux-bluetooth@vger.kernel.org
Hi,
On Fri, Aug 12, 2016 at 11:26 AM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> Device.Connect shall check if the service discovery is pending or no
> service have been connected yet before switching to LE otherwise these
> services may never be connected.
> ---
> src/device.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/src/device.c b/src/device.c
> index 6c6be92..c103bb2 100644
> --- a/src/device.c
> +++ b/src/device.c
> @@ -1779,9 +1779,18 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg,
> struct btd_device *dev = user_data;
> uint8_t bdaddr_type;
>
> - if (dev->bredr_state.connected)
> - bdaddr_type = dev->bdaddr_type;
> - else if (dev->le_state.connected && dev->bredr)
> + if (dev->bredr_state.connected) {
> + /*
> + * Check if services have been resolved and there is at list
> + * one connected before switching to connect LE.
> + */
> + if (dev->bredr_state.svc_resolved &&
> + find_service_with_state(dev->services,
> + BTD_SERVICE_STATE_CONNECTED))
> + bdaddr_type = dev->bdaddr_type;
> + else
> + bdaddr_type = BDADDR_BREDR;
> + } else if (dev->le_state.connected && dev->bredr)
> bdaddr_type = BDADDR_BREDR;
> else
> bdaddr_type = select_conn_bearer(dev);
> --
> 2.7.4
Applied.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-08-15 10:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-12 8:26 [PATCH BlueZ] core/device: Fix not connecting services properly Luiz Augusto von Dentz
2016-08-15 10:13 ` Luiz Augusto von Dentz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).