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 10/10] mesh: Clean up Join() method
Date: Thu, 21 May 2020 17:35:01 -0700 [thread overview]
Message-ID: <20200522003501.106165-11-inga.stotland@intel.com> (raw)
In-Reply-To: <20200522003501.106165-1-inga.stotland@intel.com>
This consolidates various places where a pending response
to Join() is created and makes sure that l_dus_message_unref()
is called correctly.
---
mesh/mesh.c | 49 ++++++++++++++++++++++---------------------------
1 file changed, 22 insertions(+), 27 deletions(-)
diff --git a/mesh/mesh.c b/mesh/mesh.c
index 6f8974745..24ea3afd6 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -341,6 +341,7 @@ void mesh_cleanup(void)
reply = dbus_error(join_pending->msg, MESH_ERROR_FAILED,
"Failed. Exiting");
l_dbus_send(dbus_get_bus(), reply);
+ l_dbus_message_unref(join_pending->msg);
}
acceptor_cancel(&mesh);
@@ -391,11 +392,6 @@ static void prov_disc_cb(struct l_dbus *bus, void *user_data)
if (!join_pending)
return;
- if (join_pending->msg) {
- l_dbus_message_unref(join_pending->msg);
- join_pending->msg = NULL;
- }
-
acceptor_cancel(&mesh);
join_pending->disc_watch = 0;
@@ -501,39 +497,40 @@ static void node_init_cb(struct mesh_node *node, struct mesh_agent *agent)
{
struct l_dbus_message *reply;
uint8_t num_ele;
+ bool is_error = false;
+ struct l_dbus *dbus = dbus_get_bus();
if (!node) {
reply = dbus_error(join_pending->msg, MESH_ERROR_FAILED,
"Failed to create node from application");
- goto fail;
+ is_error = true;
+ goto done;
}
join_pending->node = node;
num_ele = node_get_num_elements(node);
if (!acceptor_start(num_ele, join_pending->uuid, mesh.algorithms,
- mesh.prov_timeout, agent, prov_complete_cb,
- &mesh))
- {
+ mesh.prov_timeout, agent,
+ prov_complete_cb, &mesh)) {
reply = dbus_error(join_pending->msg, MESH_ERROR_FAILED,
"Failed to start provisioning acceptor");
- goto fail;
- }
+ is_error = true;
+ } else
+ reply = l_dbus_message_new_method_return(join_pending->msg);
- reply = l_dbus_message_new_method_return(join_pending->msg);
- l_dbus_send(dbus_get_bus(), reply);
+done:
+ l_dbus_send(dbus, reply);
+ l_dbus_message_unref(join_pending->msg);
join_pending->msg = NULL;
- /* Setup disconnect watch */
- join_pending->disc_watch = l_dbus_add_disconnect_watch(dbus_get_bus(),
+ if (is_error)
+ free_pending_join_call(true);
+ else
+ /* Setup disconnect watch */
+ join_pending->disc_watch = l_dbus_add_disconnect_watch(dbus,
join_pending->sender,
prov_disc_cb, NULL, NULL);
-
- return;
-
-fail:
- l_dbus_send(dbus_get_bus(), reply);
- free_pending_join_call(true);
}
static struct l_dbus_message *join_network_call(struct l_dbus *dbus,
@@ -591,25 +588,23 @@ static struct l_dbus_message *cancel_join_call(struct l_dbus *dbus,
l_debug("Cancel Join");
- if (!join_pending) {
- reply = dbus_error(msg, MESH_ERROR_DOES_NOT_EXIST,
+ if (!join_pending)
+ return dbus_error(msg, MESH_ERROR_DOES_NOT_EXIST,
"No join in progress");
- goto done;
- }
-
acceptor_cancel(&mesh);
/* Return error to the original Join call */
if (join_pending->msg) {
reply = dbus_error(join_pending->msg, MESH_ERROR_FAILED, NULL);
l_dbus_send(dbus_get_bus(), reply);
+ l_dbus_message_unref(join_pending->msg);
}
reply = l_dbus_message_new_method_return(msg);
l_dbus_message_set_arguments(reply, "");
free_pending_join_call(true);
-done:
+
return reply;
}
--
2.26.2
next prev parent reply other threads:[~2020-05-22 0:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-22 0:34 [PATCH BlueZ 00/10] Mesh code clean up Inga Stotland
2020-05-22 0:34 ` [PATCH BlueZ 01/10] mesh: Remove unused structure member Inga Stotland
2020-05-22 0:34 ` [PATCH BlueZ 02/10] mesh: Free allocated agent in mesh_remove_agent() Inga Stotland
2020-05-22 0:34 ` [PATCH BlueZ 03/10] mesh: Remove agent when freeing node's dynamic resources Inga Stotland
2020-05-22 0:34 ` [PATCH BlueZ 04/10] mesh: Add finalization of a newly created node Inga Stotland
2020-05-22 0:34 ` [PATCH BlueZ 05/10] mesh: Remove unused function prototypes from node.h Inga Stotland
2020-05-22 1:12 ` [BlueZ,05/10] " bluez.test.bot
2020-05-22 0:34 ` [PATCH BlueZ 06/10] mesh: Create a queue of pending requests in mesh_init() Inga Stotland
2020-05-22 0:34 ` [PATCH BlueZ 07/10] mesh: Clean up Import() method call Inga Stotland
2020-05-22 0:34 ` [PATCH BlueZ 08/10] mesh: Clean up Attach() " Inga Stotland
2020-05-22 0:35 ` [PATCH BlueZ 09/10] mesh: Fix memory leak in Create, Import & Attach methods Inga Stotland
2020-05-22 0:35 ` Inga Stotland [this message]
2020-05-22 20:54 ` [PATCH BlueZ 00/10] Mesh code clean up 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=20200522003501.106165-11-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).