[PATCH 1/2] neard: Set device UUIDs from EIR

[PATCH 1/2] neard: Set device UUIDs from EIR

[Szymon Janc]

Handle UUIDs received in EIR from neard in same way as UUIDs received
on device discovery.
---
 plugins/neard.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/neard.c b/plugins/neard.c
index 35fdaeb..da6e37c 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -643,7 +643,8 @@ static void store_params(struct btd_adapter *adapter, struct btd_device *device,
 		btd_device_device_set_name(device, params->name);
 	}
 
-	/* TODO handle UUIDs? */
+	if (params->services)
+		device_add_eir_uuids(device, params->services);
 
 	if (params->hash) {
 		btd_adapter_add_remote_oob_data(adapter, &params->address,
-- 
1.8.5.3

[PATCH 2/2] neard: Refactor request_oob function

[Szymon Janc]

This makes function flow easier to follow.
---
 plugins/neard.c | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/plugins/neard.c b/plugins/neard.c
index da6e37c..b546750 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -768,42 +768,39 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *msg,
 	if (err < 0)
 		return error_reply(msg, -err);
 
-	if (bacmp(&remote.address, BDADDR_ANY) == 0)
-		goto read_local;
-
-	device = btd_adapter_get_device(adapter, &remote.address,
-								BDADDR_BREDR);
+	if (bacmp(&remote.address, BDADDR_ANY) == 0) {
+		if (btd_adapter_get_powered(adapter))
+			goto read_local;
 
-	err = check_device(device);
-	if (err < 0) {
-		free_oob_params(&remote);
+		goto done;
+	}
 
-		if (err == -EALREADY)
-			return create_request_oob_reply(adapter, NULL, NULL,
-									msg);
+	device = btd_adapter_get_device(adapter, &remote.address, BDADDR_BREDR);
 
-		return error_reply(msg, -err);
-	}
+	err = check_device(device);
+	if (err < 0)
+		goto done;
 
 	if (!btd_adapter_get_pairable(adapter)) {
-		free_oob_params(&remote);
-
-		return error_reply(msg, ENONET);
+		err = -ENONET;
+		goto done;
 	}
 
 	store_params(adapter, device, &remote);
 
-	if (!remote.hash || !btd_adapter_get_powered(adapter)) {
-		free_oob_params(&remote);
-		return create_request_oob_reply(adapter, NULL, NULL, msg);
-	}
+	if (remote.hash && btd_adapter_get_powered(adapter))
+		goto read_local;
+done:
+	free_oob_params(&remote);
+
+	if (err < 0 && err != -EALREADY)
+		return error_reply(msg, -err);
+
+	return create_request_oob_reply(adapter, NULL, NULL, msg);
 
 read_local:
 	free_oob_params(&remote);
 
-	if (!btd_adapter_get_powered(adapter))
-		return create_request_oob_reply(adapter, NULL, NULL, msg);
-
 	err = btd_adapter_read_local_oob_data(adapter);
 	if (err < 0)
 		return error_reply(msg, -err);
-- 
1.8.5.3

Re: [PATCH 1/2] neard: Set device UUIDs from EIR

[Johan Hedberg]

Hi Szymon,

On Sat, Jan 18, 2014, Szymon Janc wrote:
> Handle UUIDs received in EIR from neard in same way as UUIDs received
> on device discovery.
> ---
>  plugins/neard.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Both patches have been applied. Thanks.

Johan