From: Andrzej Kaczmarek Date: Wed, 4 Jun 2014 15:14:44 +0000 (+0200) Subject: core: Fix cleaning pending services when ACL connection failed X-Git-Tag: submit/tizen/20140606.095742~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4fa360402bd58c73d31ec629fc4816ef24a9d160;p=platform%2Fupstream%2Fbluez.git core: Fix cleaning pending services when ACL connection failed In case ACL connection failed to establish, all pending services shall be always removed. At the moment it's only done in case there's pending Connect message which does not take into account reconnect scenario, i.e. service connection was triggered by reconnection timeout and there is no pending message. In such case, when reconnection failed there will be some services on pending list and subsequent reconnect attempts will fail with EBUSY immediately. Change-Id: I785bd791c8623a4452310d410e3dbb524e9976ec Signed-off-by: Sebastian Chlad --- diff --git a/src/device.c b/src/device.c index 8222610..a9b644b 100644 --- a/src/device.c +++ b/src/device.c @@ -1220,6 +1220,9 @@ static void device_profile_connected(struct btd_device *dev, return; done: + g_slist_free(dev->pending); + dev->pending = NULL; + if (!dev->connect) return; @@ -1241,9 +1244,6 @@ done: g_dbus_send_reply(dbus_conn, dev->connect, DBUS_TYPE_INVALID); } - g_slist_free(dev->pending); - dev->pending = NULL; - dbus_message_unref(dev->connect); dev->connect = NULL; }