From: Inga Stotland <inga.stotland@intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: brian.gix@intel.com, Inga Stotland <inga.stotland@intel.com>
Subject: [PATCH BlueZ] mesh: Fix logic when cleaning up incomplete provisioning
Date: Fri, 18 Jan 2019 22:53:18 -0800 [thread overview]
Message-ID: <20190119065318.9203-1-inga.stotland@intel.com> (raw)
Do not call acceptor_cancel() if the provisioning has been completed,
either fail or success. Acceptor automatically takes care of cleanup
on completion, either successful or not.
---
mesh/mesh.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/mesh/mesh.c b/mesh/mesh.c
index a1c26e77c..881b6ed73 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -354,8 +354,6 @@ static void free_pending_join_call(bool failed)
l_dbus_remove_watch(dbus_get_bus(),
join_pending->disc_watch);
- acceptor_cancel(&mesh);
-
mesh_agent_remove(join_pending->agent);
if (failed) {
@@ -375,11 +373,14 @@ void mesh_cleanup(void)
mgmt_unref(mgmt_mesh);
if (join_pending) {
- /* The Join() call failed since it has not been completed */
- reply = dbus_error(join_pending->msg, MESH_ERROR_FAILED,
+
+ if (join_pending->msg) {
+ reply = dbus_error(join_pending->msg, MESH_ERROR_FAILED,
"Failed. Exiting");
- l_dbus_send(dbus_get_bus(), reply);
+ l_dbus_send(dbus_get_bus(), reply);
+ }
+ acceptor_cancel(&mesh);
free_pending_join_call(true);
}
@@ -428,6 +429,7 @@ static void prov_disc_cb(struct l_dbus *bus, void *user_data)
if (join_pending->msg)
l_dbus_message_unref(join_pending->msg);
+ acceptor_cancel(&mesh);
join_pending->disc_watch = 0;
free_pending_join_call(true);
--
2.17.2
next reply other threads:[~2019-01-19 6:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-19 6:53 Inga Stotland [this message]
2019-01-22 20:50 ` [PATCH BlueZ] mesh: Fix logic when cleaning up incomplete provisioning Gix, Brian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190119065318.9203-1-inga.stotland@intel.com \
--to=inga.stotland@intel.com \
--cc=brian.gix@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).