From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH v3 3/8] advertising: Add implementation of Discoverable property
Date: Tue, 22 May 2018 12:50:06 +0300 [thread overview]
Message-ID: <20180522095011.517-3-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20180522095011.517-1-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This parses the contents of Discoverable property and add it to AD data
directly using bt_ad_add_flags.
---
src/advertising.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 65 insertions(+), 1 deletion(-)
diff --git a/src/advertising.c b/src/advertising.c
index b087b48b7..cba30ada0 100644
--- a/src/advertising.c
+++ b/src/advertising.c
@@ -641,6 +641,56 @@ fail:
return false;
}
+static bool set_flags(struct btd_adv_client *client, uint8_t flags)
+{
+ if (!flags) {
+ bt_ad_clear_flags(client->data);
+ return true;
+ }
+
+ /* Set BR/EDR Not Supported for LE only */
+ if (!btd_adapter_get_bredr(client->manager->adapter))
+ flags |= 0x04;
+
+ if (!bt_ad_add_flags(client->data, &flags, 1))
+ return false;
+
+ return true;
+}
+
+static bool parse_discoverable(DBusMessageIter *iter,
+ struct btd_adv_client *client)
+{
+ uint8_t flags;
+ dbus_bool_t discoverable;
+
+ if (!iter) {
+ bt_ad_clear_flags(client->data);
+ return true;
+ }
+
+ if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_BOOLEAN)
+ return false;
+
+ dbus_message_iter_get_basic(iter, &discoverable);
+
+ if (discoverable)
+ flags = 0x02;
+ else
+ flags = 0x00;
+
+ if (!set_flags(client , flags))
+ goto fail;
+
+ DBG("Adding Flags 0x%02x", flags);
+
+ return true;
+
+fail:
+ bt_ad_clear_flags(client->data);
+ return false;
+}
+
static struct adv_parser {
const char *name;
bool (*func)(DBusMessageIter *iter, struct btd_adv_client *client);
@@ -656,6 +706,7 @@ static struct adv_parser {
{ "Duration", parse_duration },
{ "Timeout", parse_timeout },
{ "Data", parse_data },
+ { "Discoverable", parse_discoverable },
{ },
};
@@ -737,7 +788,8 @@ static int refresh_adv(struct btd_adv_client *client, mgmt_request_func_t func)
if (client->type == AD_TYPE_PERIPHERAL) {
flags = MGMT_ADV_FLAG_CONNECTABLE;
- if (btd_adapter_get_discoverable(client->manager->adapter))
+ if (btd_adapter_get_discoverable(client->manager->adapter) &&
+ !(bt_ad_has_flags(client->data)))
flags |= MGMT_ADV_FLAG_DISCOV;
}
@@ -881,6 +933,18 @@ static DBusMessage *parse_advertisement(struct btd_adv_client *client)
}
}
+ /* BLUETOOTH SPECIFICATION Version 5.0 | Vol 3, Part C page 2042:
+ * A device in the broadcast mode shall not set the
+ * ‘LE General Discoverable Mode’ flag or the
+ * ‘LE Limited Discoverable Mode’ flag in the Flags AD Type as
+ * defined in [Core Specification Supplement], Part A, Section 1.3.
+ */
+ if (client->type == AD_TYPE_BROADCAST &&
+ bt_ad_has_flags(client->data)) {
+ error("Broadcast cannot set flags");
+ goto fail;
+ }
+
err = refresh_adv(client, add_adv_callback);
if (!err)
return NULL;
--
2.14.3
next prev parent reply other threads:[~2018-05-22 9:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-22 9:50 [PATCH v3 1/8] doc/advertising-api: Add Discoverable property Luiz Augusto von Dentz
2018-05-22 9:50 ` [PATCH v3 2/8] shared/ad: Add function to manipulate flags Luiz Augusto von Dentz
2018-05-22 9:50 ` Luiz Augusto von Dentz [this message]
2018-05-22 9:50 ` [PATCH v3 4/8] client: Add advertise.discoverable command Luiz Augusto von Dentz
2018-05-22 9:50 ` [PATCH v3 5/8] client: Print AD Data and Discoverable once registered Luiz Augusto von Dentz
2018-05-22 9:50 ` [PATCH v3 6/8] doc/advertising-api: Add DiscoverableTimeout property Luiz Augusto von Dentz
2018-05-22 9:50 ` [PATCH v3 7/8] advertising: Add implementation of " Luiz Augusto von Dentz
2018-05-22 9:50 ` [PATCH v3 8/8] client: Add advertise.discoverable-timeout command Luiz Augusto von Dentz
2018-05-22 10:25 ` [PATCH v3 1/8] doc/advertising-api: Add Discoverable property David Llewellyn-Jones
2018-05-22 10:45 ` Luiz Augusto von Dentz
2018-05-22 10:52 ` David Llewellyn-Jones
2018-05-24 11:05 ` Luiz Augusto von Dentz
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=20180522095011.517-3-luiz.dentz@gmail.com \
--to=luiz.dentz@gmail.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).