linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 1/2] mesh: Fix reading device UUID from Join() call
Date: Fri, 11 Jan 2019 18:40:54 -0800	[thread overview]
Message-ID: <20190112024055.9967-1-inga.stotland@intel.com> (raw)

Supply correct parameters to l_dbus_message_iter_get_fixed_array
to get the location from where to read UUID value.
---
 mesh/mesh.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mesh/mesh.c b/mesh/mesh.c
index 169e6f42c..8971f7cc4 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -564,6 +564,7 @@ static struct l_dbus_message *join_network_call(struct l_dbus *dbus,
 {
 	const char *app_path, *sender;
 	struct l_dbus_message_iter iter_uuid;
+	uint8_t *uuid;
 	uint32_t n;
 
 	l_debug("Join network request");
@@ -578,7 +579,7 @@ static struct l_dbus_message *join_network_call(struct l_dbus *dbus,
 
 	join_pending = l_new(struct join_data, 1);
 
-	l_dbus_message_iter_get_fixed_array(&iter_uuid, join_pending->uuid, &n);
+	l_dbus_message_iter_get_fixed_array(&iter_uuid, &uuid, &n);
 
 	if (n != 16) {
 		l_free(join_pending);
@@ -587,6 +588,8 @@ static struct l_dbus_message *join_network_call(struct l_dbus *dbus,
 							"Bad device UUID");
 	}
 
+	memcpy(join_pending->uuid, uuid, 16);
+
 	sender = l_dbus_message_get_sender(msg);
 
 	join_pending->sender = l_strdup(sender);
-- 
2.17.2


             reply	other threads:[~2019-01-12  2:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-12  2:40 Inga Stotland [this message]
2019-01-12  2:40 ` [PATCH BlueZ 2/2] mesh: Clean up when finishing the Join call Inga Stotland
2019-01-14 22:10   ` Gix, Brian
2019-01-14 22:10 ` [PATCH BlueZ 1/2] mesh: Fix reading device UUID from Join() call 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=20190112024055.9967-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).