From 34e99c8328254583d67eacb5c1fef7e83bfa3745 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Mon, 6 May 2013 15:20:52 +0200 Subject: [PATCH] neard: Fix reading local OOB data when adapter is not powered Read Local OOB data only if adapter is powered. This fix replying with error instead of CPS set to inactive when adapter is not powered. --- plugins/neard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/neard.c b/plugins/neard.c index dfe4f233c..e4a4d71ea 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -790,7 +790,7 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *msg, store_params(adapter, device, &remote); - if (!remote.hash) { + if (!remote.hash || !btd_adapter_get_powered(adapter)) { free_oob_params(&remote); return create_request_oob_reply(adapter, NULL, NULL, msg); } @@ -798,6 +798,9 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *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); -- 2.47.3