From 9dde2d57035062ecec1a699aa7e7b7e0adb411cc Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Thu, 9 Feb 2012 12:56:05 -0300 Subject: [PATCH] device: Fix trying to connect if already connected --- src/device.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/device.c b/src/device.c index 3b59d7fd1..f2df9defe 100644 --- a/src/device.c +++ b/src/device.c @@ -1970,9 +1970,15 @@ int device_browse_primary(struct btd_device *device, DBusConnection *conn, req = g_new0(struct browse_req, 1); req->device = btd_device_ref(device); - adapter_get_address(adapter, &src); + device->browse = req; + + if (device->attrib) { + gatt_discover_primary(device->attrib, NULL, primary_cb, req); + goto done; + } + sec_level = secure ? BT_IO_SEC_HIGH : BT_IO_SEC_LOW; attcb = g_new0(struct att_callbacks, 1); @@ -1994,11 +2000,10 @@ int device_browse_primary(struct btd_device *device, DBusConnection *conn, return -EIO; } +done: if (conn) req->conn = dbus_connection_ref(conn); - device->browse = req; - if (msg) { const char *sender = dbus_message_get_sender(msg); -- 2.11.0