Avoids queue dupplicated requests connects for the same device. Sources
can be triggered by auto connect or on demand connection request when a
given profile registers ATTIO connection callbacks.
---
src/device.c | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/device.c b/src/device.c
index b88aee4..35121b5 100644
--- a/src/device.c
+++ b/src/device.c
@@ -139,6 +139,7 @@ struct btd_device {
GSList *attios;
GSList *attios_offline;
guint attachid; /* Attrib server attach */
+ guint auto_id; /* Auto connect source id */
gboolean connected;
@@ -236,6 +237,9 @@ static void device_free(gpointer user_data)
if (device->discov_timer)
g_source_remove(device->discov_timer);
+ if (device->auto_id)
+ g_source_remove(device->auto_id);
+
DBG("%p", device);
g_free(device->authr);
@@ -1610,6 +1614,13 @@ static void attio_disconnected(gpointer data, gpointer user_data)
attio->dcfunc(attio->user_data);
}
+static void att_connect_dispatched(gpointer user_data)
+{
+ struct btd_device *device = user_data;
+
+ device->auto_id = 0;
+}
+
static void attrib_disconnected(gpointer user_data)
{
struct btd_device *device = user_data;
@@ -1694,7 +1705,10 @@ static void att_connect_cb(GIOChannel *io, GError *gerr, gpointer user_data)
device->browse = NULL;
browse_request_free(req, TRUE);
} else if (device->auto_connect)
- g_idle_add(att_connect, device);
+ device->auto_id = g_idle_add_full(
+ G_PRIORITY_DEFAULT_IDLE,
+ att_connect, device,
+ att_connect_dispatched);
return;
}
@@ -1936,6 +1950,9 @@ void device_set_auto_connect(struct btd_device *device, gboolean enable)
device->auto_connect = enable;
+ if (device->auto_id != 0)
+ return;
+
if (device->attrib) {
DBG("Already connected");
return;
@@ -1944,7 +1961,9 @@ void device_set_auto_connect(struct btd_device *device, gboolean enable)
if (device->attios == NULL && device->attios_offline == NULL)
return;
- g_idle_add(att_connect, device);
+ device->auto_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+ att_connect, device,
+ att_connect_dispatched);
}
void device_set_type(struct btd_device *device, device_type_t type)
@@ -2689,7 +2708,10 @@ guint btd_device_add_attio_callback(struct btd_device *device,
attio);
g_idle_add(notify_attios, device);
} else {
- g_idle_add(att_connect, device);
+ device->auto_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE,
+ att_connect, device,
+ att_connect_dispatched);
+
device->attios = g_slist_append(device->attios, attio);
}
--
1.7.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
