This patch set introduces tools/btgatt-server. This tool serves as a
standalone demo of combining shared/gatt-db, shared/gatt-server, and a
listening L2CAP socket on the ATT channel. The tool exposes the GAP and
GATT services, as well as a Heart Rate service. It's possible to hide/unhide
the latter to test Service Changed events.
The set also includes two small bug fixes for the way Service Changed
characteristics are handled by shared/gatt-client.
Arman Uguray (8):
tools/btgatt-server: Introduce btgatt-server.
tools/btgatt-server: Accept incoming connection and initialize server.
tools/btgatt-server: Populate the database.
tools/btgatt-server: Add command support and the notify command.
tools/btgatt-server: Add Heart Rate service simulation.
tools/btgatt-server: Add "heart-rate" command.
shared/gatt-client: Fix bug in service changed handler.
shared/gatt-client: Watch CCC while registering Service Changed
handler.
.gitignore | 1 +
Makefile.tools | 8 +
src/shared/gatt-client.c | 25 +-
tools/btgatt-server.c | 1065 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 1093 insertions(+), 6 deletions(-)
create mode 100644 tools/btgatt-server.c
--
2.1.0.rc2.206.gedb03e5
Hi Arman,
On Tue, Nov 11, 2014 at 11:39 PM, Arman Uguray <[email protected]> wrote:
> This patch set introduces tools/btgatt-server. This tool serves as a
> standalone demo of combining shared/gatt-db, shared/gatt-server, and a
> listening L2CAP socket on the ATT channel. The tool exposes the GAP and
> GATT services, as well as a Heart Rate service. It's possible to hide/unhide
> the latter to test Service Changed events.
>
> The set also includes two small bug fixes for the way Service Changed
> characteristics are handled by shared/gatt-client.
>
> Arman Uguray (8):
> tools/btgatt-server: Introduce btgatt-server.
> tools/btgatt-server: Accept incoming connection and initialize server.
> tools/btgatt-server: Populate the database.
> tools/btgatt-server: Add command support and the notify command.
> tools/btgatt-server: Add Heart Rate service simulation.
> tools/btgatt-server: Add "heart-rate" command.
> shared/gatt-client: Fix bug in service changed handler.
> shared/gatt-client: Watch CCC while registering Service Changed
> handler.
>
> .gitignore | 1 +
> Makefile.tools | 8 +
> src/shared/gatt-client.c | 25 +-
> tools/btgatt-server.c | 1065 ++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 1093 insertions(+), 6 deletions(-)
> create mode 100644 tools/btgatt-server.c
>
> --
> 2.1.0.rc2.206.gedb03e5
Ive applied the last 2 since there were fixes, please check the my
comments regarding the remaining patches.
--
Luiz Augusto von Dentz
Hi Arman,
On Tue, Nov 11, 2014 at 11:39 PM, Arman Uguray <[email protected]> wrote:
> This patch populates the GATT database with the GAP and GATT services.
> ---
> tools/btgatt-server.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 230 insertions(+)
>
> diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
> index bee6275..9e94b3e 100644
> --- a/tools/btgatt-server.c
> +++ b/tools/btgatt-server.c
> @@ -42,6 +42,8 @@
>
> #define ATT_CID 4
>
> +#define UUID_GAP 0x1800
> +
> #define PRLOG(...) \
> do { \
> printf(__VA_ARGS__); \
> @@ -57,12 +59,19 @@
> #define COLOR_BOLDGRAY "\x1B[1;30m"
> #define COLOR_BOLDWHITE "\x1B[1;37m"
>
> +static const char test_device_name[] = "Very Long Test Device Name For Testing "
> + "ATT Protocol Operations On GATT Server";
> static bool verbose = false;
>
> struct server {
> int fd;
> struct gatt_db *db;
> struct bt_gatt_server *gatt;
> +
> + uint8_t *device_name;
> + size_t name_len;
> +
> + bool svc_chngd_enabled;
> };
>
> static void print_prompt(void)
> @@ -93,10 +102,216 @@ static void gatt_debug_cb(const char *str, void *user_data)
> PRLOG(COLOR_GREEN "%s%s\n" COLOR_OFF, prefix, str);
> }
>
> +static void gap_appearance_cb(struct gatt_db_attribute *attrib, unsigned int id,
> + uint16_t offset, uint8_t opcode,
> + bdaddr_t *bdaddr, void *user_data)
> +{
> + uint16_t appearance = 128;
> + uint8_t value[2];
> +
> + put_le16(appearance, value);
> +
> + gatt_db_attribute_read_result(attrib, id, 0, value, 2);
Lets use sizeof whenever possible.
> +}
> +
> +
> +static void gap_device_name_read_cb(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + uint8_t opcode, bdaddr_t *bdaddr,
> + void *user_data)
> +{
> + struct server *server = user_data;
> + uint8_t error = 0;
> + size_t len = 0;
> + const uint8_t *value = NULL;
> +
> + PRLOG("GAP Device Name Read called\n");
> +
> + len = server->name_len;
> +
> + if (offset > len) {
> + error = BT_ATT_ERROR_INVALID_OFFSET;
> + goto done;
> + }
> +
> + len -= offset;
> + value = len ? &server->device_name[offset] : NULL;
> +
> +done:
> + gatt_db_attribute_read_result(attrib, id, error, value, len);
> +}
> +
> +static void gap_device_name_write_cb(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + const uint8_t *value, size_t len,
> + uint8_t opcode, bdaddr_t *bdaddr,
> + void *user_data)
> +{
> + struct server *server = user_data;
> + uint8_t error = 0;
> +
> + PRLOG("GAP Device Name Write called\n");
> +
> + /* Implement this as a variable length attribute value. */
> + if (offset > server->name_len) {
> + error = BT_ATT_ERROR_INVALID_OFFSET;
> + goto done;
> + }
> +
> + if (offset + len != server->name_len) {
> + uint8_t *name;
> +
> + name = realloc(server->device_name, offset + len);
> + if (!name) {
> + error = BT_ATT_ERROR_INSUFFICIENT_RESOURCES;
> + goto done;
> + }
> +
> + memcpy(name, server->device_name,
> + MIN(offset + len, server->name_len));
> + server->device_name = name;
> + server->name_len = offset + len;
> + }
> +
> + if (value)
> + memcpy(server->device_name + offset, value, len);
> +
> +done:
> + gatt_db_attribute_write_result(attrib, id, error);
> +}
> +
> +static void gap_device_name_ext_prop_read_cb(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + uint8_t opcode, bdaddr_t *bdaddr,
> + void *user_data)
> +{
> + uint8_t value[2];
> +
> + PRLOG("Device Name Extended Properties Read called\n");
> +
> + value[0] = BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE;
> + value[1] = 0;
> +
> + gatt_db_attribute_read_result(attrib, id, 0, value, 2);
Above as well.
> +}
> +
> +static void gatt_service_changed_cb(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + uint8_t opcode, bdaddr_t *bdaddr,
> + void *user_data)
> +{
> + PRLOG("Service Changed Read called\n");
> +
> + gatt_db_attribute_read_result(attrib, id, 0, NULL, 0);
> +}
> +
> +static void gatt_svc_chngd_ccc_read_cb(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + uint8_t opcode, bdaddr_t *bdaddr,
> + void *user_data)
> +{
> + struct server *server = user_data;
> + uint8_t value[2];
> +
> + PRLOG("Service Changed CCC Read called\n");
> +
> + value[0] = server->svc_chngd_enabled ? 0x02 : 0x00;
> + value[1] = 0x00;
> +
> + gatt_db_attribute_read_result(attrib, id, 0, value, 2);
And here.
> +}
> +
> +static void gatt_svc_chngd_ccc_write_cb(struct gatt_db_attribute *attrib,
> + unsigned int id, uint16_t offset,
> + const uint8_t *value, size_t len,
> + uint8_t opcode, bdaddr_t *bdaddr,
> + void *user_data)
> +{
> + struct server *server = user_data;
> + uint8_t ecode = 0;
> +
> + PRLOG("Service Changed CCC Write called\n");
> +
> + if (!value || len != 2) {
> + ecode = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
> + goto done;
> + }
> +
> + if (offset) {
> + ecode = BT_ATT_ERROR_INVALID_OFFSET;
> + goto done;
> + }
> +
> + if (value[0] == 0x00)
> + server->svc_chngd_enabled = false;
> + else if (value[0] == 0x02)
> + server->svc_chngd_enabled = true;
> + else
> + ecode = 0x80;
> +
> + PRLOG("Service Changed Enabled: %s\n",
> + server->svc_chngd_enabled ? "true" : "false");
> +
> +done:
> + gatt_db_attribute_write_result(attrib, id, ecode);
> +}
> +
> +static void populate_db(struct server *server)
> +{
> + bt_uuid_t uuid;
> + struct gatt_db_attribute *attr;
> +
> + /* Add the GAP service */
> + bt_uuid16_create(&uuid, UUID_GAP);
> + attr = gatt_db_add_service(server->db, &uuid, true, 6);
> +
> + /* Device Name characteristic */
> + bt_uuid16_create(&uuid, GATT_CHARAC_DEVICE_NAME);
> + gatt_db_service_add_characteristic(attr, &uuid,
> + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE,
> + BT_GATT_CHRC_PROP_READ,
> + gap_device_name_read_cb,
> + gap_device_name_write_cb,
> + server);
> +
> + bt_uuid16_create(&uuid, GATT_CHARAC_EXT_PROPER_UUID);
> + gatt_db_service_add_descriptor(attr, &uuid, BT_ATT_PERM_READ,
> + gap_device_name_ext_prop_read_cb,
> + NULL, server);
> +
> + /* Appearance characteristic */
> + bt_uuid16_create(&uuid, GATT_CHARAC_APPEARANCE);
> + gatt_db_service_add_characteristic(attr, &uuid, BT_ATT_PERM_READ,
> + BT_GATT_CHRC_PROP_READ,
> + gap_appearance_cb,
> + NULL, server);
> +
> + gatt_db_service_set_active(attr, true);
> +
> + /* Add the GATT service */
> + bt_uuid16_create(&uuid, 0x1801);
> + attr = gatt_db_add_service(server->db, &uuid, true, 4);
> +
> + bt_uuid16_create(&uuid, GATT_CHARAC_SERVICE_CHANGED);
> + gatt_db_service_add_characteristic(attr, &uuid, BT_ATT_PERM_READ,
> + BT_GATT_CHRC_PROP_READ | BT_GATT_CHRC_PROP_INDICATE,
> + gatt_service_changed_cb,
> + NULL, server);
> +
> + bt_uuid16_create(&uuid, GATT_CLIENT_CHARAC_CFG_UUID);
> + gatt_db_service_add_descriptor(attr, &uuid,
> + BT_ATT_PERM_READ | BT_ATT_PERM_WRITE,
> + gatt_svc_chngd_ccc_read_cb,
> + gatt_svc_chngd_ccc_write_cb, server);
> +
> + gatt_db_service_set_active(attr, true);
Perhaps we could have one, or a few, that are actually stored in the
db itself for testing, the attributes that are not context sensitive
and don't have CCC are probably good candidates.
> +}
> +
> static struct server *server_create(int fd, uint16_t mtu)
> {
> struct server *server;
> struct bt_att *att;
> + size_t name_len = strlen(test_device_name);
>
> server = new0(struct server, 1);
> if (!server) {
> @@ -126,10 +341,22 @@ static struct server *server_create(int fd, uint16_t mtu)
> return NULL;
> }
>
> + server->name_len = name_len + 1;
> + server->device_name = malloc(name_len + 1);
> + if (!server->device_name) {
> + bt_att_unref(att);
> + free(server);
> + return NULL;
> + }
> +
> + memcpy(server->device_name, test_device_name, name_len);
> + server->device_name[name_len] = '\0';
> +
> server->fd = fd;
> server->db = gatt_db_new();
> if (!server->db) {
> fprintf(stderr, "Failed to create GATT database\n");
> + free(server->device_name);
> bt_att_unref(att);
> free(server);
> return NULL;
> @@ -139,6 +366,7 @@ static struct server *server_create(int fd, uint16_t mtu)
> if (!server->gatt) {
> fprintf(stderr, "Failed to create GATT server\n");
> gatt_db_destroy(server->db);
> + free(server->device_name);
> bt_att_unref(att);
> free(server);
> return NULL;
> @@ -153,6 +381,8 @@ static struct server *server_create(int fd, uint16_t mtu)
> /* bt_gatt_server already holds a reference */
> bt_att_unref(att);
>
> + populate_db(server);
> +
> return server;
> }
>
> --
> 2.1.0.rc2.206.gedb03e5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Luiz Augusto von Dentz
Hi Arman,
On Tue, Nov 11, 2014 at 11:39 PM, Arman Uguray <[email protected]> wrote:
> This patch adds code that listens for incoming connections and creates a
> bt_gatt_server and bt_att structure once a connection is accepted.
> ---
> tools/btgatt-server.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 213 insertions(+), 2 deletions(-)
>
> diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
> index 4508de2..bee6275 100644
> --- a/tools/btgatt-server.c
> +++ b/tools/btgatt-server.c
> @@ -25,6 +25,7 @@
> #include <stdint.h>
> #include <stdlib.h>
> #include <getopt.h>
> +#include <unistd.h>
>
> #include <bluetooth/bluetooth.h>
> #include <bluetooth/hci.h>
> @@ -32,8 +33,135 @@
> #include <bluetooth/l2cap.h>
> #include "lib/uuid.h"
>
> +#include "monitor/mainloop.h"
> +#include "src/shared/util.h"
> +#include "src/shared/att.h"
> +#include "src/shared/queue.h"
> +#include "src/shared/gatt-db.h"
> +#include "src/shared/gatt-server.h"
> +
> +#define ATT_CID 4
> +
> +#define PRLOG(...) \
> + do { \
> + printf(__VA_ARGS__); \
> + print_prompt(); \
> + } while (0)
> +
> +#define COLOR_OFF "\x1B[0m"
> +#define COLOR_RED "\x1B[0;91m"
> +#define COLOR_GREEN "\x1B[0;92m"
> +#define COLOR_YELLOW "\x1B[0;93m"
> +#define COLOR_BLUE "\x1B[0;94m"
> +#define COLOR_MAGENTA "\x1B[0;95m"
> +#define COLOR_BOLDGRAY "\x1B[1;30m"
> +#define COLOR_BOLDWHITE "\x1B[1;37m"
> +
> static bool verbose = false;
>
> +struct server {
> + int fd;
> + struct gatt_db *db;
> + struct bt_gatt_server *gatt;
> +};
> +
> +static void print_prompt(void)
> +{
> + printf(COLOR_BLUE "[GATT server]" COLOR_OFF "# ");
> + fflush(stdout);
> +}
> +
> +static void att_disconnect_cb(void *user_data)
> +{
> + printf("Device disconnected\n");
> +
> + mainloop_quit();
> +}
> +
> +static void att_debug_cb(const char *str, void *user_data)
> +{
> + const char *prefix = user_data;
> +
> + PRLOG(COLOR_BOLDGRAY "%s" COLOR_BOLDWHITE "%s\n" COLOR_OFF, prefix,
> + str);
> +}
> +
> +static void gatt_debug_cb(const char *str, void *user_data)
> +{
> + const char *prefix = user_data;
> +
> + PRLOG(COLOR_GREEN "%s%s\n" COLOR_OFF, prefix, str);
> +}
> +
> +static struct server *server_create(int fd, uint16_t mtu)
> +{
> + struct server *server;
> + struct bt_att *att;
> +
> + server = new0(struct server, 1);
> + if (!server) {
> + fprintf(stderr, "Failed to allocate memory for server\n");
> + return NULL;
> + }
> +
> + att = bt_att_new(fd);
> + if (!att) {
> + fprintf(stderr, "Failed to initialze ATT transport layer\n");
> + bt_att_unref(att);
> + free(server);
> + return NULL;
> + }
> +
> + if (!bt_att_set_close_on_unref(att, true)) {
> + fprintf(stderr, "Failed to set up ATT transport layer\n");
> + bt_att_unref(att);
> + free(server);
> + return NULL;
> + }
> +
> + if (!bt_att_register_disconnect(att, att_disconnect_cb, NULL, NULL)) {
> + fprintf(stderr, "Failed to set ATT disconnect handler\n");
> + bt_att_unref(att);
> + free(server);
> + return NULL;
> + }
> +
> + server->fd = fd;
> + server->db = gatt_db_new();
> + if (!server->db) {
> + fprintf(stderr, "Failed to create GATT database\n");
> + bt_att_unref(att);
> + free(server);
> + return NULL;
> + }
> +
> + server->gatt = bt_gatt_server_new(server->db, att, mtu);
> + if (!server->gatt) {
> + fprintf(stderr, "Failed to create GATT server\n");
> + gatt_db_destroy(server->db);
> + bt_att_unref(att);
> + free(server);
> + return NULL;
> + }
I guess it makes sense to have goto failed which takes care of freeing
anything allocated and return NULL.
> + if (verbose) {
> + bt_att_set_debug(att, att_debug_cb, "att: ", NULL);
> + bt_gatt_server_set_debug(server->gatt, gatt_debug_cb,
> + "server: ", NULL);
> + }
> +
> + /* bt_gatt_server already holds a reference */
> + bt_att_unref(att);
> +
> + return server;
> +}
> +
> +static void server_destroy(struct server *server)
> +{
> + bt_gatt_server_unref(server->gatt);
> + gatt_db_destroy(server->db);
> +}
> +
> static void usage(void)
> {
> printf("btgatt-server\n");
> @@ -57,6 +185,67 @@ static struct option main_options[] = {
> { }
> };
>
> +static int l2cap_le_att_listen_and_accept(bdaddr_t *src, int sec)
> +{
> + int sk, nsk;
> + struct sockaddr_l2 srcaddr, addr;
> + socklen_t optlen;
> + struct bt_security btsec;
> + char ba[18];
> +
> + sk = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
> + if (sk < 0) {
> + perror("Failed to create L2CAP sket");
> + return -1;
> + }
> +
> + /* Set up source address */
> + memset(&srcaddr, 0, sizeof(srcaddr));
> + srcaddr.l2_family = AF_BLUETOOTH;
> + srcaddr.l2_cid = htobs(ATT_CID);
> + srcaddr.l2_bdaddr_type = 0;
> + bacpy(&srcaddr.l2_bdaddr, src);
> +
> + if (bind(sk, (struct sockaddr *)&srcaddr, sizeof(srcaddr)) < 0) {
> + perror("Failed to bind L2CAP sket");
I suppose you meant socket instead of sket.
> + close(sk);
> + return -1;
> + }
> +
> + /* Set the security level */
> + memset(&btsec, 0, sizeof(btsec));
> + btsec.level = sec;
> + if (setsockopt(sk, SOL_BLUETOOTH, BT_SECURITY, &btsec,
> + sizeof(btsec)) != 0) {
> + fprintf(stderr, "Failed to set L2CAP security level\n");
> + close(sk);
> + return -1;
> + }
> +
> + if (listen(sk, 10) < 0) {
> + perror("Listening on socket failed");
> + close(sk);
> + return -1;
> + }
> +
> + printf("Started listening on ATT channel. Waiting for connections\n");
> +
> + memset(&addr, 0, sizeof(addr));
> + optlen = sizeof(addr);
> + nsk = accept(sk, (struct sockaddr *)&addr, &optlen);
> + if (nsk < 0) {
> + perror("Accept failed");
> + close(sk);
> + return -1;
Again here you can replace with goto failed and have it close and return -1.
> + }
> +
> + ba2str(&addr.l2_bdaddr, ba);
> + printf("Connect from %s\n", ba);
> + close(sk);
> +
> + return nsk;
> +}
> +
> int main(int argc, char *argv[])
> {
> int opt;
> @@ -64,6 +253,8 @@ int main(int argc, char *argv[])
> uint16_t mtu = 0;
> bdaddr_t src_addr;
> int dev_id = -1;
> + int fd;
> + struct server *server;
>
> while ((opt = getopt_long(argc, argv, "+hvs:m:i:",
> main_options, NULL)) != -1) {
> @@ -133,7 +324,27 @@ int main(int argc, char *argv[])
> return EXIT_FAILURE;
> }
>
> - /* TODO: Set up mainloop and listening LE socket */
> + fd = l2cap_le_att_listen_and_accept(&src_addr, sec);
> + if (fd < 0) {
> + fprintf(stderr, "Failed to accept L2CAP ATT connection\n");
> + return EXIT_FAILURE;
> + }
> +
> + mainloop_init();
> +
> + server = server_create(fd, mtu);
> + if (!server) {
> + close(fd);
> + return EXIT_FAILURE;
> + }
> +
> + printf("Running GATT server\n");
> +
> + mainloop_run();
> +
> + printf("\n\nShutting down...\n");
> +
> + server_destroy(server);
>
> - return 0;
> + return EXIT_SUCCESS;
> }
> --
> 2.1.0.rc2.206.gedb03e5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Luiz Augusto von Dentz
If gatt-client discovers the "Service Changed" characteristic but
doesn't discover a Client Characteristic Configuration descriptor for it
then it should just invoke the ready callback instead of attempting to
register a handler and failing. This patch addresses that.
---
src/shared/gatt-client.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 6016b06..30b271e 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -116,6 +116,7 @@ struct bt_gatt_client {
*/
uint16_t gatt_svc_handle;
uint16_t svc_chngd_val_handle;
+ uint16_t svc_chngd_ccc_handle;
unsigned int svc_chngd_ind_id;
struct queue *svc_chngd_queue; /* Queued service changed events */
bool in_svc_chngd;
@@ -577,9 +578,14 @@ static void discover_descs_cb(bool success, uint8_t att_ecode,
"handle: 0x%04x, uuid: %s",
descs[i].handle, uuid_str);
- if (uuid_cmp(descs[i].uuid, GATT_CLIENT_CHARAC_CFG_UUID) == 0)
+ if (uuid_cmp(descs[i].uuid, GATT_CLIENT_CHARAC_CFG_UUID) == 0) {
op->cur_chrc->ccc_handle = descs[i].handle;
+ if (uuid_cmp(op->cur_chrc->chrc_external.uuid,
+ SVC_CHNGD_UUID) == 0)
+ client->svc_chngd_ccc_handle = descs[i].handle;
+ }
+
i++;
}
@@ -1153,7 +1159,7 @@ static void init_complete(struct discovery_op *op, bool success,
op->result_head = NULL;
op->result_tail = NULL;
- if (!client->svc_chngd_val_handle) {
+ if (!client->svc_chngd_val_handle || !client->svc_chngd_ccc_handle) {
client->ready = true;
goto done;
}
--
2.1.0.rc2.206.gedb03e5
This patch fixes a bug in which "0" was passed as the start and end
handles of the service changed callback if no new service was found
within the range.
---
src/shared/gatt-client.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index 401f551..6016b06 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -963,7 +963,9 @@ static void service_changed_complete(struct discovery_op *op, bool success,
{
struct bt_gatt_client *client = op->client;
struct service_changed_op *next_sc_op;
- uint16_t start_handle = 0, end_handle = 0;
+ uint16_t start_handle = op->start;
+ uint16_t end_handle = op->end;
+ bool services_found = false;
client->in_svc_chngd = false;
@@ -978,8 +980,7 @@ static void service_changed_complete(struct discovery_op *op, bool success,
if (!op->result_head || !op->result_tail)
goto next;
- start_handle = op->result_head->service.start_handle;
- end_handle = op->result_tail->service.end_handle;
+ services_found = true;
/* Insert all newly discovered services in their correct place as a
* contiguous chunk */
@@ -1002,7 +1003,7 @@ next:
}
/* Check if the GATT service is not present or has remained unchanged */
- if (!start_handle || !client->svc_chngd_val_handle ||
+ if (!services_found || !client->svc_chngd_val_handle ||
client->svc_chngd_val_handle < start_handle ||
client->svc_chngd_val_handle > end_handle)
return;
@@ -1085,6 +1086,12 @@ static void service_changed_cb(uint16_t value_handle, const uint8_t *value,
start = get_le16(value);
end = get_le16(value + 2);
+ if (start > end) {
+ util_debug(client->debug_callback, client->debug_data,
+ "Service Changed received with invalid handles");
+ return;
+ }
+
util_debug(client->debug_callback, client->debug_data,
"Service Changed received - start: 0x%04x end: 0x%04x",
start, end);
--
2.1.0.rc2.206.gedb03e5
This patch adds the "heart-rate" command which can be used to hide
or unhide the Heart Rate service. This is useful for testing service
changed events.
---
tools/btgatt-server.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 58 insertions(+), 2 deletions(-)
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index 1315a62..5421be7 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -83,8 +83,10 @@ struct server {
uint8_t *device_name;
size_t name_len;
+ uint16_t gatt_svc_chngd_handle;
bool svc_chngd_enabled;
+ uint16_t hr_handle;
uint16_t hr_msrmt_handle;
uint16_t hr_energy_expended;
bool hr_visible;
@@ -414,7 +416,7 @@ done:
static void populate_db(struct server *server)
{
bt_uuid_t uuid;
- struct gatt_db_attribute *attr, *hr_msrmt;
+ struct gatt_db_attribute *attr, *hr_msrmt, *svc_chngd;
/* Add the GAP service */
bt_uuid16_create(&uuid, UUID_GAP);
@@ -448,10 +450,12 @@ static void populate_db(struct server *server)
attr = gatt_db_add_service(server->db, &uuid, true, 4);
bt_uuid16_create(&uuid, GATT_CHARAC_SERVICE_CHANGED);
- gatt_db_service_add_characteristic(attr, &uuid, BT_ATT_PERM_READ,
+ svc_chngd = gatt_db_service_add_characteristic(attr, &uuid,
+ BT_ATT_PERM_READ,
BT_GATT_CHRC_PROP_READ | BT_GATT_CHRC_PROP_INDICATE,
gatt_service_changed_cb,
NULL, server);
+ server->gatt_svc_chngd_handle = gatt_db_attribute_get_handle(svc_chngd);
bt_uuid16_create(&uuid, GATT_CLIENT_CHARAC_CFG_UUID);
gatt_db_service_add_descriptor(attr, &uuid,
@@ -464,6 +468,7 @@ static void populate_db(struct server *server)
/* Add Heart Rate Service */
bt_uuid16_create(&uuid, UUID_HEART_RATE);
attr = gatt_db_add_service(server->db, &uuid, true, 8);
+ server->hr_handle = gatt_db_attribute_get_handle(attr);
bt_uuid16_create(&uuid, UUID_HEART_RATE_MSRMT);
hr_msrmt = gatt_db_service_add_characteristic(attr, &uuid,
@@ -799,6 +804,56 @@ done:
free(value);
}
+static void heart_rate_usage(void)
+{
+ printf("Usage: heart-rate on|off\n");
+}
+
+static void cmd_heart_rate(struct server *server, char *cmd_str)
+{
+ bool enable;
+ uint8_t pdu[4];
+ struct gatt_db_attribute *attr;
+
+ if (!cmd_str) {
+ heart_rate_usage();
+ return;
+ }
+
+ if (strcmp(cmd_str, "on") == 0)
+ enable = true;
+ else if (strcmp(cmd_str, "off") == 0)
+ enable = false;
+ else {
+ heart_rate_usage();
+ return;
+ }
+
+ if (enable == server->hr_visible) {
+ printf("Heart Rate Service already %s\n",
+ enable ? "visible" : "hidden");
+ return;
+ }
+
+ server->hr_visible = enable;
+ attr = gatt_db_get_attribute(server->db, server->hr_handle);
+ gatt_db_service_set_active(attr, server->hr_visible);
+ update_hr_msrmt_simulation(server);
+
+ if (!server->svc_chngd_enabled)
+ return;
+
+ put_le16(server->hr_handle, pdu);
+ put_le16(server->hr_handle + 7, pdu + 2);
+
+ server->hr_msrmt_enabled = false;
+ update_hr_msrmt_simulation(server);
+
+ bt_gatt_server_send_indication(server->gatt,
+ server->gatt_svc_chngd_handle,
+ pdu, 4, conf_cb, NULL, NULL);
+}
+
static void cmd_help(struct server *server, char *cmd_str);
typedef void (*command_func_t)(struct server *server, char *cmd_str);
@@ -810,6 +865,7 @@ static struct {
} command[] = {
{ "help", cmd_help, "\tDisplay help message" },
{ "notify", cmd_notify, "\tSend handle-value notification" },
+ { "heart-rate", cmd_heart_rate, "\tHide/Unhide Heart Rate Service" },
{ }
};
--
2.1.0.rc2.206.gedb03e5
This patch adds a Heart Rate service to the database which simulates a
fake Heart Rate service implementation. The service can be enabled by
default by passing the '-r' flag to the executable.
---
tools/btgatt-server.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 207 insertions(+), 8 deletions(-)
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index 067e258..1315a62 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdbool.h>
#include <stdint.h>
+#include <time.h>
#include <stdlib.h>
#include <getopt.h>
#include <unistd.h>
@@ -38,12 +39,18 @@
#include "src/shared/util.h"
#include "src/shared/att.h"
#include "src/shared/queue.h"
+#include "src/shared/timeout.h"
#include "src/shared/gatt-db.h"
#include "src/shared/gatt-server.h"
-#define ATT_CID 4
+#define UUID_GAP 0x1800
+#define UUID_GATT 0x1801
+#define UUID_HEART_RATE 0x180d
+#define UUID_HEART_RATE_MSRMT 0x2a37
+#define UUID_HEART_RATE_BODY 0x2a38
+#define UUID_HEART_RATE_CTRL 0x2a39
-#define UUID_GAP 0x1800
+#define ATT_CID 4
#define PRLOG(...) \
do { \
@@ -51,6 +58,10 @@
print_prompt(); \
} while (0)
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
#define COLOR_OFF "\x1B[0m"
#define COLOR_RED "\x1B[0;91m"
#define COLOR_GREEN "\x1B[0;92m"
@@ -73,6 +84,12 @@ struct server {
size_t name_len;
bool svc_chngd_enabled;
+
+ uint16_t hr_msrmt_handle;
+ uint16_t hr_energy_expended;
+ bool hr_visible;
+ bool hr_msrmt_enabled;
+ unsigned int hr_timeout_id;
};
static void print_prompt(void)
@@ -257,10 +274,147 @@ done:
gatt_db_attribute_write_result(attrib, id, ecode);
}
+static void hr_msrmt_ccc_read_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ struct server *server = user_data;
+ uint8_t value[2];
+
+ value[0] = server->hr_msrmt_enabled ? 0x01 : 0x00;
+ value[1] = 0x00;
+
+ gatt_db_attribute_read_result(attrib, id, 0, value, 2);
+}
+
+static int count = 0;
+static bool hr_msrmt_cb(void *user_data)
+{
+ struct server *server = user_data;
+ bool expended_present = !(count % 10);
+ uint16_t len = 2;
+ uint8_t pdu[4];
+ uint32_t cur_ee;
+
+ pdu[0] = 0x06;
+ pdu[1] = 90 + (rand() % 40);
+
+ if (expended_present) {
+ pdu[0] |= 0x08;
+ put_le16(server->hr_energy_expended, pdu + 2);
+ len += 2;
+ }
+
+ bt_gatt_server_send_notification(server->gatt,
+ server->hr_msrmt_handle,
+ pdu, len);
+
+
+ cur_ee = server->hr_energy_expended;
+ server->hr_energy_expended = MIN(UINT16_MAX, cur_ee + 10);
+ count++;
+
+ return true;
+}
+
+static void update_hr_msrmt_simulation(struct server *server)
+{
+ if (!server->hr_msrmt_enabled || !server->hr_visible) {
+ timeout_remove(server->hr_timeout_id);
+ return;
+ }
+
+ server->hr_timeout_id = timeout_add(1000, hr_msrmt_cb, server, NULL);
+}
+
+static void hr_msrmt_ccc_write_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ const uint8_t *value, size_t len,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ struct server *server = user_data;
+ uint8_t ecode = 0;
+
+ if (!value || len != 2) {
+ ecode = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
+ goto done;
+ }
+
+ if (offset) {
+ ecode = BT_ATT_ERROR_INVALID_OFFSET;
+ goto done;
+ }
+
+ if (value[0] == 0x00)
+ server->hr_msrmt_enabled = false;
+ else if (value[0] == 0x01) {
+ if (server->hr_msrmt_enabled) {
+ PRLOG("HR Measurement Already Enabled\n");
+ goto done;
+ }
+
+ server->hr_msrmt_enabled = true;
+ } else
+ ecode = 0x80;
+
+ PRLOG("HR: Measurement Enabled: %s\n",
+ server->hr_msrmt_enabled ? "true" : "false");
+
+ update_hr_msrmt_simulation(server);
+
+done:
+ gatt_db_attribute_write_result(attrib, id, ecode);
+}
+
+static void hr_body_sensor_location_read_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ uint8_t value;
+
+ PRLOG("HR: Body Sensor Location Read\n");
+
+ /* Report "Chest" as the location */
+ value = 1;
+
+ gatt_db_attribute_read_result(attrib, id, 0, &value, 1);
+}
+
+static void hr_control_point_write_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ const uint8_t *value, size_t len,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ struct server *server = user_data;
+ uint8_t ecode = 0;
+
+ if (!value || len != 1) {
+ ecode = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
+ goto done;
+ }
+
+ if (offset) {
+ ecode = BT_ATT_ERROR_INVALID_OFFSET;
+ goto done;
+ }
+
+ if (value[0] == 1) {
+ PRLOG("HR: Energy Expended value reset\n");
+ server->hr_energy_expended = 0;
+ }
+
+done:
+ gatt_db_attribute_write_result(attrib, id, ecode);
+}
+
static void populate_db(struct server *server)
{
bt_uuid_t uuid;
- struct gatt_db_attribute *attr;
+ struct gatt_db_attribute *attr, *hr_msrmt;
/* Add the GAP service */
bt_uuid16_create(&uuid, UUID_GAP);
@@ -290,7 +444,7 @@ static void populate_db(struct server *server)
gatt_db_service_set_active(attr, true);
/* Add the GATT service */
- bt_uuid16_create(&uuid, 0x1801);
+ bt_uuid16_create(&uuid, UUID_GATT);
attr = gatt_db_add_service(server->db, &uuid, true, 4);
bt_uuid16_create(&uuid, GATT_CHARAC_SERVICE_CHANGED);
@@ -306,9 +460,43 @@ static void populate_db(struct server *server)
gatt_svc_chngd_ccc_write_cb, server);
gatt_db_service_set_active(attr, true);
+
+ /* Add Heart Rate Service */
+ bt_uuid16_create(&uuid, UUID_HEART_RATE);
+ attr = gatt_db_add_service(server->db, &uuid, true, 8);
+
+ bt_uuid16_create(&uuid, UUID_HEART_RATE_MSRMT);
+ hr_msrmt = gatt_db_service_add_characteristic(attr, &uuid,
+ BT_ATT_PERM_NONE,
+ BT_GATT_CHRC_PROP_NOTIFY,
+ NULL, NULL, NULL);
+ server->hr_msrmt_handle = gatt_db_attribute_get_handle(hr_msrmt);
+
+ bt_uuid16_create(&uuid, GATT_CLIENT_CHARAC_CFG_UUID);
+ gatt_db_service_add_descriptor(attr, &uuid,
+ BT_ATT_PERM_READ | BT_ATT_PERM_WRITE,
+ hr_msrmt_ccc_read_cb,
+ hr_msrmt_ccc_write_cb, server);
+
+ bt_uuid16_create(&uuid, UUID_HEART_RATE_BODY);
+ gatt_db_service_add_characteristic(attr, &uuid,
+ BT_ATT_PERM_READ,
+ BT_GATT_CHRC_PROP_READ,
+ hr_body_sensor_location_read_cb,
+ NULL, server);
+
+ bt_uuid16_create(&uuid, UUID_HEART_RATE_CTRL);
+ gatt_db_service_add_characteristic(attr, &uuid,
+ BT_ATT_PERM_WRITE,
+ BT_GATT_CHRC_PROP_WRITE,
+ NULL, hr_control_point_write_cb,
+ server);
+
+ if (server->hr_visible)
+ gatt_db_service_set_active(attr, true);
}
-static struct server *server_create(int fd, uint16_t mtu)
+static struct server *server_create(int fd, uint16_t mtu, bool hr_visible)
{
struct server *server;
struct bt_att *att;
@@ -373,15 +561,19 @@ static struct server *server_create(int fd, uint16_t mtu)
return NULL;
}
+ server->hr_visible = hr_visible;
+
if (verbose) {
bt_att_set_debug(att, att_debug_cb, "att: ", NULL);
bt_gatt_server_set_debug(server->gatt, gatt_debug_cb,
"server: ", NULL);
}
+ /* Random seed for generating fake Heart Rate measurements */
+ srand(time(NULL));
+
/* bt_gatt_server already holds a reference */
bt_att_unref(att);
-
populate_db(server);
return server;
@@ -389,6 +581,7 @@ static struct server *server_create(int fd, uint16_t mtu)
static void server_destroy(struct server *server)
{
+ timeout_remove(server->hr_timeout_id);
bt_gatt_server_unref(server->gatt);
gatt_db_destroy(server->db);
}
@@ -404,6 +597,7 @@ static void usage(void)
"\t-s, --security-level <sec>\tSet security level (low|"
"medium|high)\n"
"\t-v, --verbose\t\t\tEnable extra logging\n"
+ "\t-r, --heart-rate\t\tEnable Heart Rate service"
"\t-h, --help\t\t\tDisplay help\n");
}
@@ -412,6 +606,7 @@ static struct option main_options[] = {
{ "mtu", 1, 0, 'm' },
{ "security-level", 1, 0, 's' },
{ "verbose", 0, 0, 'v' },
+ { "heart-rate", 0, 0, 'r' },
{ "help", 0, 0, 'h' },
{ }
};
@@ -697,9 +892,10 @@ int main(int argc, char *argv[])
int dev_id = -1;
int fd;
sigset_t mask;
+ bool hr_visible = false;
struct server *server;
- while ((opt = getopt_long(argc, argv, "+hvs:m:i:",
+ while ((opt = getopt_long(argc, argv, "+hvrs:m:i:",
main_options, NULL)) != -1) {
switch (opt) {
case 'h':
@@ -708,6 +904,9 @@ int main(int argc, char *argv[])
case 'v':
verbose = true;
break;
+ case 'r':
+ hr_visible = true;
+ break;
case 's':
if (strcmp(optarg, "low") == 0)
sec = BT_SECURITY_LOW;
@@ -775,7 +974,7 @@ int main(int argc, char *argv[])
mainloop_init();
- server = server_create(fd, mtu);
+ server = server_create(fd, mtu, hr_visible);
if (!server) {
close(fd);
return EXIT_FAILURE;
--
2.1.0.rc2.206.gedb03e5
This patch populates the GATT database with the GAP and GATT services.
---
tools/btgatt-server.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 230 insertions(+)
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index bee6275..9e94b3e 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -42,6 +42,8 @@
#define ATT_CID 4
+#define UUID_GAP 0x1800
+
#define PRLOG(...) \
do { \
printf(__VA_ARGS__); \
@@ -57,12 +59,19 @@
#define COLOR_BOLDGRAY "\x1B[1;30m"
#define COLOR_BOLDWHITE "\x1B[1;37m"
+static const char test_device_name[] = "Very Long Test Device Name For Testing "
+ "ATT Protocol Operations On GATT Server";
static bool verbose = false;
struct server {
int fd;
struct gatt_db *db;
struct bt_gatt_server *gatt;
+
+ uint8_t *device_name;
+ size_t name_len;
+
+ bool svc_chngd_enabled;
};
static void print_prompt(void)
@@ -93,10 +102,216 @@ static void gatt_debug_cb(const char *str, void *user_data)
PRLOG(COLOR_GREEN "%s%s\n" COLOR_OFF, prefix, str);
}
+static void gap_appearance_cb(struct gatt_db_attribute *attrib, unsigned int id,
+ uint16_t offset, uint8_t opcode,
+ bdaddr_t *bdaddr, void *user_data)
+{
+ uint16_t appearance = 128;
+ uint8_t value[2];
+
+ put_le16(appearance, value);
+
+ gatt_db_attribute_read_result(attrib, id, 0, value, 2);
+}
+
+
+static void gap_device_name_read_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ struct server *server = user_data;
+ uint8_t error = 0;
+ size_t len = 0;
+ const uint8_t *value = NULL;
+
+ PRLOG("GAP Device Name Read called\n");
+
+ len = server->name_len;
+
+ if (offset > len) {
+ error = BT_ATT_ERROR_INVALID_OFFSET;
+ goto done;
+ }
+
+ len -= offset;
+ value = len ? &server->device_name[offset] : NULL;
+
+done:
+ gatt_db_attribute_read_result(attrib, id, error, value, len);
+}
+
+static void gap_device_name_write_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ const uint8_t *value, size_t len,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ struct server *server = user_data;
+ uint8_t error = 0;
+
+ PRLOG("GAP Device Name Write called\n");
+
+ /* Implement this as a variable length attribute value. */
+ if (offset > server->name_len) {
+ error = BT_ATT_ERROR_INVALID_OFFSET;
+ goto done;
+ }
+
+ if (offset + len != server->name_len) {
+ uint8_t *name;
+
+ name = realloc(server->device_name, offset + len);
+ if (!name) {
+ error = BT_ATT_ERROR_INSUFFICIENT_RESOURCES;
+ goto done;
+ }
+
+ memcpy(name, server->device_name,
+ MIN(offset + len, server->name_len));
+ server->device_name = name;
+ server->name_len = offset + len;
+ }
+
+ if (value)
+ memcpy(server->device_name + offset, value, len);
+
+done:
+ gatt_db_attribute_write_result(attrib, id, error);
+}
+
+static void gap_device_name_ext_prop_read_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ uint8_t value[2];
+
+ PRLOG("Device Name Extended Properties Read called\n");
+
+ value[0] = BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE;
+ value[1] = 0;
+
+ gatt_db_attribute_read_result(attrib, id, 0, value, 2);
+}
+
+static void gatt_service_changed_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ PRLOG("Service Changed Read called\n");
+
+ gatt_db_attribute_read_result(attrib, id, 0, NULL, 0);
+}
+
+static void gatt_svc_chngd_ccc_read_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ struct server *server = user_data;
+ uint8_t value[2];
+
+ PRLOG("Service Changed CCC Read called\n");
+
+ value[0] = server->svc_chngd_enabled ? 0x02 : 0x00;
+ value[1] = 0x00;
+
+ gatt_db_attribute_read_result(attrib, id, 0, value, 2);
+}
+
+static void gatt_svc_chngd_ccc_write_cb(struct gatt_db_attribute *attrib,
+ unsigned int id, uint16_t offset,
+ const uint8_t *value, size_t len,
+ uint8_t opcode, bdaddr_t *bdaddr,
+ void *user_data)
+{
+ struct server *server = user_data;
+ uint8_t ecode = 0;
+
+ PRLOG("Service Changed CCC Write called\n");
+
+ if (!value || len != 2) {
+ ecode = BT_ATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN;
+ goto done;
+ }
+
+ if (offset) {
+ ecode = BT_ATT_ERROR_INVALID_OFFSET;
+ goto done;
+ }
+
+ if (value[0] == 0x00)
+ server->svc_chngd_enabled = false;
+ else if (value[0] == 0x02)
+ server->svc_chngd_enabled = true;
+ else
+ ecode = 0x80;
+
+ PRLOG("Service Changed Enabled: %s\n",
+ server->svc_chngd_enabled ? "true" : "false");
+
+done:
+ gatt_db_attribute_write_result(attrib, id, ecode);
+}
+
+static void populate_db(struct server *server)
+{
+ bt_uuid_t uuid;
+ struct gatt_db_attribute *attr;
+
+ /* Add the GAP service */
+ bt_uuid16_create(&uuid, UUID_GAP);
+ attr = gatt_db_add_service(server->db, &uuid, true, 6);
+
+ /* Device Name characteristic */
+ bt_uuid16_create(&uuid, GATT_CHARAC_DEVICE_NAME);
+ gatt_db_service_add_characteristic(attr, &uuid,
+ BT_ATT_PERM_READ | BT_ATT_PERM_WRITE,
+ BT_GATT_CHRC_PROP_READ,
+ gap_device_name_read_cb,
+ gap_device_name_write_cb,
+ server);
+
+ bt_uuid16_create(&uuid, GATT_CHARAC_EXT_PROPER_UUID);
+ gatt_db_service_add_descriptor(attr, &uuid, BT_ATT_PERM_READ,
+ gap_device_name_ext_prop_read_cb,
+ NULL, server);
+
+ /* Appearance characteristic */
+ bt_uuid16_create(&uuid, GATT_CHARAC_APPEARANCE);
+ gatt_db_service_add_characteristic(attr, &uuid, BT_ATT_PERM_READ,
+ BT_GATT_CHRC_PROP_READ,
+ gap_appearance_cb,
+ NULL, server);
+
+ gatt_db_service_set_active(attr, true);
+
+ /* Add the GATT service */
+ bt_uuid16_create(&uuid, 0x1801);
+ attr = gatt_db_add_service(server->db, &uuid, true, 4);
+
+ bt_uuid16_create(&uuid, GATT_CHARAC_SERVICE_CHANGED);
+ gatt_db_service_add_characteristic(attr, &uuid, BT_ATT_PERM_READ,
+ BT_GATT_CHRC_PROP_READ | BT_GATT_CHRC_PROP_INDICATE,
+ gatt_service_changed_cb,
+ NULL, server);
+
+ bt_uuid16_create(&uuid, GATT_CLIENT_CHARAC_CFG_UUID);
+ gatt_db_service_add_descriptor(attr, &uuid,
+ BT_ATT_PERM_READ | BT_ATT_PERM_WRITE,
+ gatt_svc_chngd_ccc_read_cb,
+ gatt_svc_chngd_ccc_write_cb, server);
+
+ gatt_db_service_set_active(attr, true);
+}
+
static struct server *server_create(int fd, uint16_t mtu)
{
struct server *server;
struct bt_att *att;
+ size_t name_len = strlen(test_device_name);
server = new0(struct server, 1);
if (!server) {
@@ -126,10 +341,22 @@ static struct server *server_create(int fd, uint16_t mtu)
return NULL;
}
+ server->name_len = name_len + 1;
+ server->device_name = malloc(name_len + 1);
+ if (!server->device_name) {
+ bt_att_unref(att);
+ free(server);
+ return NULL;
+ }
+
+ memcpy(server->device_name, test_device_name, name_len);
+ server->device_name[name_len] = '\0';
+
server->fd = fd;
server->db = gatt_db_new();
if (!server->db) {
fprintf(stderr, "Failed to create GATT database\n");
+ free(server->device_name);
bt_att_unref(att);
free(server);
return NULL;
@@ -139,6 +366,7 @@ static struct server *server_create(int fd, uint16_t mtu)
if (!server->gatt) {
fprintf(stderr, "Failed to create GATT server\n");
gatt_db_destroy(server->db);
+ free(server->device_name);
bt_att_unref(att);
free(server);
return NULL;
@@ -153,6 +381,8 @@ static struct server *server_create(int fd, uint16_t mtu)
/* bt_gatt_server already holds a reference */
bt_att_unref(att);
+ populate_db(server);
+
return server;
}
--
2.1.0.rc2.206.gedb03e5
This patch adds a command REPL and introduces the "notify" command which
allows sending notifications and indications.
---
tools/btgatt-server.c | 230 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 230 insertions(+)
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index 9e94b3e..067e258 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -26,6 +26,7 @@
#include <stdlib.h>
#include <getopt.h>
#include <unistd.h>
+#include <errno.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
@@ -476,6 +477,217 @@ static int l2cap_le_att_listen_and_accept(bdaddr_t *src, int sec)
return nsk;
}
+static void notify_usage(void)
+{
+ printf("Usage: notify [options] <value_handle> <value>\n"
+ "Options:\n"
+ "\t -i, --indicate\tSend indication\n"
+ "e.g.:\n"
+ "\tnotify 0x0001 00 01 00\n");
+}
+
+static struct option notify_options[] = {
+ { "indicate", 0, 0, 'i' },
+ { }
+};
+
+static bool parse_args(char *str, int expected_argc, char **argv, int *argc)
+{
+ char **ap;
+
+ for (ap = argv; (*ap = strsep(&str, " \t")) != NULL;) {
+ if (**ap == '\0')
+ continue;
+
+ (*argc)++;
+ ap++;
+
+ if (*argc > expected_argc)
+ return false;
+ }
+
+ return true;
+}
+
+static void conf_cb(void *user_data)
+{
+ PRLOG("Received confirmation\n");
+}
+
+static void cmd_notify(struct server *server, char *cmd_str)
+{
+ int opt, i;
+ char *argvbuf[516];
+ char **argv = argvbuf;
+ int argc = 1;
+ uint16_t handle;
+ char *endptr = NULL;
+ int length;
+ uint8_t *value = NULL;
+ bool indicate = false;
+
+ if (!parse_args(cmd_str, 514, argv + 1, &argc)) {
+ printf("Too many arguments\n");
+ notify_usage();
+ return;
+ }
+
+ optind = 0;
+ argv[0] = "notify";
+ while ((opt = getopt_long(argc, argv, "+i", notify_options,
+ NULL)) != -1) {
+ switch (opt) {
+ case 'i':
+ indicate = true;
+ break;
+ default:
+ notify_usage();
+ return;
+ }
+ }
+
+ argc -= optind;
+ argv += optind;
+
+ if (argc < 1) {
+ notify_usage();
+ return;
+ }
+
+ handle = strtol(argv[0], &endptr, 16);
+ if (!endptr || *endptr != '\0' || !handle) {
+ printf("Invalid handle: %s\n", argv[0]);
+ return;
+ }
+
+ length = argc - 1;
+
+ if (length > 0) {
+ if (length > UINT16_MAX) {
+ printf("Value too long\n");
+ return;
+ }
+
+ value = malloc(length);
+ if (!value) {
+ printf("Failed to construct value\n");
+ return;
+ }
+
+ for (i = 1; i < argc; i++) {
+ if (strlen(argv[i]) != 2) {
+ printf("Invalid value byte: %s\n",
+ argv[i]);
+ goto done;
+ }
+
+ value[i-1] = strtol(argv[i], &endptr, 16);
+ if (endptr == argv[i] || *endptr != '\0'
+ || errno == ERANGE) {
+ printf("Invalid value byte: %s\n",
+ argv[i]);
+ goto done;
+ }
+ }
+ }
+
+ if (indicate) {
+ if (!bt_gatt_server_send_indication(server->gatt, handle,
+ value, length,
+ conf_cb, NULL, NULL))
+ printf("Failed to initiate indication\n");
+ } else if (!bt_gatt_server_send_notification(server->gatt, handle,
+ value, length))
+ printf("Failed to initiate notification\n");
+
+done:
+ free(value);
+}
+
+static void cmd_help(struct server *server, char *cmd_str);
+
+typedef void (*command_func_t)(struct server *server, char *cmd_str);
+
+static struct {
+ char *cmd;
+ command_func_t func;
+ char *doc;
+} command[] = {
+ { "help", cmd_help, "\tDisplay help message" },
+ { "notify", cmd_notify, "\tSend handle-value notification" },
+ { }
+};
+
+static void cmd_help(struct server *server, char *cmd_str)
+{
+ int i;
+
+ printf("Commands:\n");
+ for (i = 0; command[i].cmd; i++)
+ printf("\t%-15s\t%s\n", command[i].cmd, command[i].doc);
+}
+
+static void prompt_read_cb(int fd, uint32_t events, void *user_data)
+{
+ ssize_t read;
+ size_t len = 0;
+ char *line = NULL;
+ char *cmd = NULL, *args;
+ struct server *server = user_data;
+ int i;
+
+ if (events & (EPOLLRDHUP | EPOLLHUP | EPOLLERR)) {
+ mainloop_quit();
+ return;
+ }
+
+ if ((read = getline(&line, &len, stdin)) == -1)
+ return;
+
+ if (read <= 1) {
+ cmd_help(server, NULL);
+ print_prompt();
+ return;
+ }
+
+ line[read-1] = '\0';
+ args = line;
+
+ while ((cmd = strsep(&args, " \t")))
+ if (*cmd != '\0')
+ break;
+
+ if (!cmd)
+ goto failed;
+
+ for (i = 0; command[i].cmd; i++) {
+ if (strcmp(command[i].cmd, cmd) == 0)
+ break;
+ }
+
+ if (command[i].cmd)
+ command[i].func(server, args);
+ else
+ fprintf(stderr, "Unknown command: %s\n", line);
+
+failed:
+ print_prompt();
+
+ free(line);
+}
+
+static void signal_cb(int signum, void *user_data)
+{
+ switch (signum) {
+ case SIGINT:
+ case SIGTERM:
+ mainloop_quit();
+ break;
+ default:
+ break;
+ }
+}
+
int main(int argc, char *argv[])
{
int opt;
@@ -484,6 +696,7 @@ int main(int argc, char *argv[])
bdaddr_t src_addr;
int dev_id = -1;
int fd;
+ sigset_t mask;
struct server *server;
while ((opt = getopt_long(argc, argv, "+hvs:m:i:",
@@ -568,8 +781,25 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
+ if (mainloop_add_fd(fileno(stdin),
+ EPOLLIN | EPOLLRDHUP | EPOLLHUP | EPOLLERR,
+ prompt_read_cb, server, NULL) < 0) {
+ fprintf(stderr, "Failed to initialize console\n");
+ server_destroy(server);
+
+ return EXIT_FAILURE;
+ }
+
printf("Running GATT server\n");
+ sigemptyset(&mask);
+ sigaddset(&mask, SIGINT);
+ sigaddset(&mask, SIGTERM);
+
+ mainloop_set_signal(&mask, signal_cb, NULL, NULL);
+
+ print_prompt();
+
mainloop_run();
printf("\n\nShutting down...\n");
--
2.1.0.rc2.206.gedb03e5
This patch adds code that listens for incoming connections and creates a
bt_gatt_server and bt_att structure once a connection is accepted.
---
tools/btgatt-server.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 213 insertions(+), 2 deletions(-)
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
index 4508de2..bee6275 100644
--- a/tools/btgatt-server.c
+++ b/tools/btgatt-server.c
@@ -25,6 +25,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <getopt.h>
+#include <unistd.h>
#include <bluetooth/bluetooth.h>
#include <bluetooth/hci.h>
@@ -32,8 +33,135 @@
#include <bluetooth/l2cap.h>
#include "lib/uuid.h"
+#include "monitor/mainloop.h"
+#include "src/shared/util.h"
+#include "src/shared/att.h"
+#include "src/shared/queue.h"
+#include "src/shared/gatt-db.h"
+#include "src/shared/gatt-server.h"
+
+#define ATT_CID 4
+
+#define PRLOG(...) \
+ do { \
+ printf(__VA_ARGS__); \
+ print_prompt(); \
+ } while (0)
+
+#define COLOR_OFF "\x1B[0m"
+#define COLOR_RED "\x1B[0;91m"
+#define COLOR_GREEN "\x1B[0;92m"
+#define COLOR_YELLOW "\x1B[0;93m"
+#define COLOR_BLUE "\x1B[0;94m"
+#define COLOR_MAGENTA "\x1B[0;95m"
+#define COLOR_BOLDGRAY "\x1B[1;30m"
+#define COLOR_BOLDWHITE "\x1B[1;37m"
+
static bool verbose = false;
+struct server {
+ int fd;
+ struct gatt_db *db;
+ struct bt_gatt_server *gatt;
+};
+
+static void print_prompt(void)
+{
+ printf(COLOR_BLUE "[GATT server]" COLOR_OFF "# ");
+ fflush(stdout);
+}
+
+static void att_disconnect_cb(void *user_data)
+{
+ printf("Device disconnected\n");
+
+ mainloop_quit();
+}
+
+static void att_debug_cb(const char *str, void *user_data)
+{
+ const char *prefix = user_data;
+
+ PRLOG(COLOR_BOLDGRAY "%s" COLOR_BOLDWHITE "%s\n" COLOR_OFF, prefix,
+ str);
+}
+
+static void gatt_debug_cb(const char *str, void *user_data)
+{
+ const char *prefix = user_data;
+
+ PRLOG(COLOR_GREEN "%s%s\n" COLOR_OFF, prefix, str);
+}
+
+static struct server *server_create(int fd, uint16_t mtu)
+{
+ struct server *server;
+ struct bt_att *att;
+
+ server = new0(struct server, 1);
+ if (!server) {
+ fprintf(stderr, "Failed to allocate memory for server\n");
+ return NULL;
+ }
+
+ att = bt_att_new(fd);
+ if (!att) {
+ fprintf(stderr, "Failed to initialze ATT transport layer\n");
+ bt_att_unref(att);
+ free(server);
+ return NULL;
+ }
+
+ if (!bt_att_set_close_on_unref(att, true)) {
+ fprintf(stderr, "Failed to set up ATT transport layer\n");
+ bt_att_unref(att);
+ free(server);
+ return NULL;
+ }
+
+ if (!bt_att_register_disconnect(att, att_disconnect_cb, NULL, NULL)) {
+ fprintf(stderr, "Failed to set ATT disconnect handler\n");
+ bt_att_unref(att);
+ free(server);
+ return NULL;
+ }
+
+ server->fd = fd;
+ server->db = gatt_db_new();
+ if (!server->db) {
+ fprintf(stderr, "Failed to create GATT database\n");
+ bt_att_unref(att);
+ free(server);
+ return NULL;
+ }
+
+ server->gatt = bt_gatt_server_new(server->db, att, mtu);
+ if (!server->gatt) {
+ fprintf(stderr, "Failed to create GATT server\n");
+ gatt_db_destroy(server->db);
+ bt_att_unref(att);
+ free(server);
+ return NULL;
+ }
+
+ if (verbose) {
+ bt_att_set_debug(att, att_debug_cb, "att: ", NULL);
+ bt_gatt_server_set_debug(server->gatt, gatt_debug_cb,
+ "server: ", NULL);
+ }
+
+ /* bt_gatt_server already holds a reference */
+ bt_att_unref(att);
+
+ return server;
+}
+
+static void server_destroy(struct server *server)
+{
+ bt_gatt_server_unref(server->gatt);
+ gatt_db_destroy(server->db);
+}
+
static void usage(void)
{
printf("btgatt-server\n");
@@ -57,6 +185,67 @@ static struct option main_options[] = {
{ }
};
+static int l2cap_le_att_listen_and_accept(bdaddr_t *src, int sec)
+{
+ int sk, nsk;
+ struct sockaddr_l2 srcaddr, addr;
+ socklen_t optlen;
+ struct bt_security btsec;
+ char ba[18];
+
+ sk = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP);
+ if (sk < 0) {
+ perror("Failed to create L2CAP sket");
+ return -1;
+ }
+
+ /* Set up source address */
+ memset(&srcaddr, 0, sizeof(srcaddr));
+ srcaddr.l2_family = AF_BLUETOOTH;
+ srcaddr.l2_cid = htobs(ATT_CID);
+ srcaddr.l2_bdaddr_type = 0;
+ bacpy(&srcaddr.l2_bdaddr, src);
+
+ if (bind(sk, (struct sockaddr *)&srcaddr, sizeof(srcaddr)) < 0) {
+ perror("Failed to bind L2CAP sket");
+ close(sk);
+ return -1;
+ }
+
+ /* Set the security level */
+ memset(&btsec, 0, sizeof(btsec));
+ btsec.level = sec;
+ if (setsockopt(sk, SOL_BLUETOOTH, BT_SECURITY, &btsec,
+ sizeof(btsec)) != 0) {
+ fprintf(stderr, "Failed to set L2CAP security level\n");
+ close(sk);
+ return -1;
+ }
+
+ if (listen(sk, 10) < 0) {
+ perror("Listening on socket failed");
+ close(sk);
+ return -1;
+ }
+
+ printf("Started listening on ATT channel. Waiting for connections\n");
+
+ memset(&addr, 0, sizeof(addr));
+ optlen = sizeof(addr);
+ nsk = accept(sk, (struct sockaddr *)&addr, &optlen);
+ if (nsk < 0) {
+ perror("Accept failed");
+ close(sk);
+ return -1;
+ }
+
+ ba2str(&addr.l2_bdaddr, ba);
+ printf("Connect from %s\n", ba);
+ close(sk);
+
+ return nsk;
+}
+
int main(int argc, char *argv[])
{
int opt;
@@ -64,6 +253,8 @@ int main(int argc, char *argv[])
uint16_t mtu = 0;
bdaddr_t src_addr;
int dev_id = -1;
+ int fd;
+ struct server *server;
while ((opt = getopt_long(argc, argv, "+hvs:m:i:",
main_options, NULL)) != -1) {
@@ -133,7 +324,27 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
- /* TODO: Set up mainloop and listening LE socket */
+ fd = l2cap_le_att_listen_and_accept(&src_addr, sec);
+ if (fd < 0) {
+ fprintf(stderr, "Failed to accept L2CAP ATT connection\n");
+ return EXIT_FAILURE;
+ }
+
+ mainloop_init();
+
+ server = server_create(fd, mtu);
+ if (!server) {
+ close(fd);
+ return EXIT_FAILURE;
+ }
+
+ printf("Running GATT server\n");
+
+ mainloop_run();
+
+ printf("\n\nShutting down...\n");
+
+ server_destroy(server);
- return 0;
+ return EXIT_SUCCESS;
}
--
2.1.0.rc2.206.gedb03e5
This patch introduces tools/btgatt-server, which is a command-line tool
for testing and debugging shared/gatt-server.
---
.gitignore | 1 +
Makefile.tools | 8 +++
tools/btgatt-server.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 148 insertions(+)
create mode 100644 tools/btgatt-server.c
diff --git a/.gitignore b/.gitignore
index 164cc97..82304b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,7 @@ tools/3dsp
tools/obexctl
tools/gatt-service
tools/btgatt-client
+tools/btgatt-server
tools/mcaptest
test/sap_client.pyc
test/bluezutils.pyc
diff --git a/Makefile.tools b/Makefile.tools
index 75a6faa..4bd683b 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -207,6 +207,14 @@ EXTRA_DIST += tools/hciattach.1 tools/hciconfig.1 \
tools/sdptool.1 tools/ciptool.1 tools/bccmd.1
endif
+if TOOLS
+bin_PROGRAMS += tools/btgatt-server
+
+tools_btgatt_server_SOURCES = tools/btgatt-server.c src/uuid-helper.c
+tools_btgatt_server_LDADD = lib/libbluetooth-internal.la \
+ src/libshared-mainloop.la
+endif
+
if HID2HCI
udevdir = @UDEV_DIR@
diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c
new file mode 100644
index 0000000..4508de2
--- /dev/null
+++ b/tools/btgatt-server.c
@@ -0,0 +1,139 @@
+/*
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2014 Google Inc.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <getopt.h>
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include <bluetooth/hci_lib.h>
+#include <bluetooth/l2cap.h>
+#include "lib/uuid.h"
+
+static bool verbose = false;
+
+static void usage(void)
+{
+ printf("btgatt-server\n");
+ printf("Usage:\n\tbtgatt-server [options]\n");
+
+ printf("Options:\n"
+ "\t-i, --index <id>\t\tSpecify adapter index, e.g. hci0\n"
+ "\t-m, --mtu <mtu>\t\t\tThe ATT MTU to use\n"
+ "\t-s, --security-level <sec>\tSet security level (low|"
+ "medium|high)\n"
+ "\t-v, --verbose\t\t\tEnable extra logging\n"
+ "\t-h, --help\t\t\tDisplay help\n");
+}
+
+static struct option main_options[] = {
+ { "index", 1, 0, 'i' },
+ { "mtu", 1, 0, 'm' },
+ { "security-level", 1, 0, 's' },
+ { "verbose", 0, 0, 'v' },
+ { "help", 0, 0, 'h' },
+ { }
+};
+
+int main(int argc, char *argv[])
+{
+ int opt;
+ int sec = BT_SECURITY_LOW;
+ uint16_t mtu = 0;
+ bdaddr_t src_addr;
+ int dev_id = -1;
+
+ while ((opt = getopt_long(argc, argv, "+hvs:m:i:",
+ main_options, NULL)) != -1) {
+ switch (opt) {
+ case 'h':
+ usage();
+ return EXIT_SUCCESS;
+ case 'v':
+ verbose = true;
+ break;
+ case 's':
+ if (strcmp(optarg, "low") == 0)
+ sec = BT_SECURITY_LOW;
+ else if (strcmp(optarg, "medium") == 0)
+ sec = BT_SECURITY_MEDIUM;
+ else if (strcmp(optarg, "high") == 0)
+ sec = BT_SECURITY_HIGH;
+ else {
+ fprintf(stderr, "Invalid security level\n");
+ return EXIT_FAILURE;
+ }
+ break;
+ case 'm': {
+ int arg;
+
+ arg = atoi(optarg);
+ if (arg <= 0) {
+ fprintf(stderr, "Invalid MTU: %d\n", arg);
+ return EXIT_FAILURE;
+ }
+
+ if (arg > UINT16_MAX) {
+ fprintf(stderr, "MTU too large: %d\n", arg);
+ return EXIT_FAILURE;
+ }
+
+ mtu = (uint16_t)arg;
+ break;
+ }
+ case 'i':
+ dev_id = hci_devid(optarg);
+ if (dev_id < 0) {
+ perror("Invalid adapter");
+ return EXIT_FAILURE;
+ }
+
+ break;
+ default:
+ fprintf(stderr, "Invalid option: %c\n", opt);
+ return EXIT_FAILURE;
+ }
+ }
+
+ argc -= optind;
+ argv -= optind;
+ optind = 0;
+
+ if (argc) {
+ usage();
+ return EXIT_SUCCESS;
+ }
+
+ if (dev_id == -1)
+ bacpy(&src_addr, BDADDR_ANY);
+ else if (hci_devba(dev_id, &src_addr) < 0) {
+ perror("Adapter not available");
+ return EXIT_FAILURE;
+ }
+
+ /* TODO: Set up mainloop and listening LE socket */
+
+ return 0;
+}
--
2.1.0.rc2.206.gedb03e5