diff options
| -rw-r--r-- | include/bluetooth/gatt.h | 25 | ||||
| -rw-r--r-- | net/bluetooth/gatt.c | 58 | ||||
| -rw-r--r-- | samples/bluetooth/central_hr/src/main.c | 17 | ||||
| -rw-r--r-- | samples/bluetooth/shell/src/main.c | 31 | ||||
| -rw-r--r-- | samples/bluetooth/tester/src/gatt.c | 115 |
5 files changed, 129 insertions, 117 deletions
diff --git a/include/bluetooth/gatt.h b/include/bluetooth/gatt.h index 7c6ba8888..9934dd29b 100644 --- a/include/bluetooth/gatt.h +++ b/include/bluetooth/gatt.h @@ -841,13 +841,24 @@ int bt_gatt_write_without_response(struct bt_conn *conn, uint16_t handle, const void *data, uint16_t length, bool sign); +struct bt_gatt_subscribe_params; + +/** @brief Notification callback function + * + * @param conn Connection object. + * @param params Subscription parameters. + * @param data Attribute value data. If NULL then subscription was removed. + * @param length Attribute value length. + */ +typedef uint8_t (*bt_gatt_notify_func_t)(struct bt_conn *conn, + struct bt_gatt_subscribe_params *params, + const void *data, uint16_t length); + /** @brief GATT Subscribe parameters */ struct bt_gatt_subscribe_params { bt_addr_le_t _peer; - /** Subscribe value callback */ - bt_gatt_read_func_t func; - /** Subscribe destroy callback */ - void (*destroy)(void *user_data); + /** Notification value callback */ + bt_gatt_notify_func_t notify; /** Subscribe value handle */ uint16_t value_handle; /** Subscribe CCC handle */ @@ -863,7 +874,8 @@ struct bt_gatt_subscribe_params { * Characteristic Configuration handle. * If notification received subscribe value callback is called to return * notified value. One may then decide whether to unsubscribe directly from - * this callback. + * this callback. Notification callback with NULL data will not be called if + * subscription was removed by this method. * * Note: This procedure is asynchronous therefore the parameters need to * remains valid while it is active. @@ -879,7 +891,8 @@ int bt_gatt_subscribe(struct bt_conn *conn, /** @brief Unsubscribe Attribute Value Notification * * This procedure unsubscribe to value notification using the Client - * Characteristic Configuration handle. + * Characteristic Configuration handle. Notification callback with NULL data + * will not be called if subscription was removed by this call. * * @param conn Connection object. * @param params Subscribe parameters. diff --git a/net/bluetooth/gatt.c b/net/bluetooth/gatt.c index ca67f3727..fb823dad6 100644 --- a/net/bluetooth/gatt.c +++ b/net/bluetooth/gatt.c @@ -590,13 +590,15 @@ void bt_gatt_notification(struct bt_conn *conn, uint16_t handle, continue; } - if (params->func(conn, 0, data, length) == BT_GATT_ITER_STOP) { + if (params->notify(conn, params, data, length) == + BT_GATT_ITER_STOP) { bt_gatt_unsubscribe(conn, params); } } } -static void gatt_subscription_remove(struct bt_gatt_subscribe_params *prev, +static void gatt_subscription_remove(struct bt_conn *conn, + struct bt_gatt_subscribe_params *prev, struct bt_gatt_subscribe_params *params) { /* Remove subscription from the list*/ @@ -606,8 +608,7 @@ static void gatt_subscription_remove(struct bt_gatt_subscribe_params *prev, prev->_next = params->_next; } - if (params->destroy) - params->destroy(params); + params->notify(conn, params, NULL, 0); } static void remove_subscribtions(struct bt_conn *conn) @@ -622,7 +623,7 @@ static void remove_subscribtions(struct bt_conn *conn) } /* Remove subscription */ - gatt_subscription_remove(prev, params); + gatt_subscription_remove(conn, prev, params); } } @@ -1437,15 +1438,19 @@ static void att_write_ccc_rsp(struct bt_conn *conn, uint8_t err, BT_DBG("err 0x%02x", err); - params->func(conn, err, NULL, 0); - + /* if write to CCC failed we remove subscription and notify app */ if (err) { - if (params->destroy) - params->destroy(params); - return; - } + struct bt_gatt_subscribe_params *cur, *prev; - gatt_subscription_add(conn, params); + for (cur = subscriptions, prev = NULL; cur; + prev = cur, cur = cur->_next) { + + if (cur == params) { + gatt_subscription_remove(conn, prev, params); + break; + } + } + } } static int gatt_write_ccc(struct bt_conn *conn, uint16_t handle, uint16_t value, @@ -1480,7 +1485,8 @@ int bt_gatt_subscribe(struct bt_conn *conn, return -ENOTCONN; } - if (!params || !params->func || !params->value || !params->ccc_handle) { + if (!params || !params->notify || + !params->value || !params->ccc_handle) { return -EINVAL; } @@ -1499,14 +1505,24 @@ int bt_gatt_subscribe(struct bt_conn *conn, } } - /* Skip write if already subcribed */ - if (has_subscription) { - gatt_subscription_add(conn, params); - return 0; + /* Skip write if already subscribed */ + if (!has_subscription) { + int err; + + err = gatt_write_ccc(conn, params->ccc_handle, params->value, + att_write_ccc_rsp, NULL); + if (err) { + return err; + } } - return gatt_write_ccc(conn, params->ccc_handle, params->value, - att_write_ccc_rsp, params); + /* + * Add subscription before write complete as some implementation were + * reported to send notification before reply to CCC write. + */ + gatt_subscription_add(conn, params); + + return 0; } int bt_gatt_unsubscribe(struct bt_conn *conn, @@ -1548,10 +1564,6 @@ int bt_gatt_unsubscribe(struct bt_conn *conn, return -EINVAL; } - if (params->destroy) { - params->destroy(params); - } - if (has_subscription) { return 0; } diff --git a/samples/bluetooth/central_hr/src/main.c b/samples/bluetooth/central_hr/src/main.c index cabb343a6..17dc9d9ee 100644 --- a/samples/bluetooth/central_hr/src/main.c +++ b/samples/bluetooth/central_hr/src/main.c @@ -38,13 +38,18 @@ static struct bt_uuid_16 uuid = BT_UUID_INIT_16(0); static struct bt_gatt_discover_params discover_params; static struct bt_gatt_subscribe_params subscribe_params; -static uint8_t subscribe_func(struct bt_conn *conn, int err, +static uint8_t notify_func(struct bt_conn *conn, + struct bt_gatt_subscribe_params *params, const void *data, uint16_t length) { - if (length) { - printk("[NOTIFICATION] data %p length %u\n", data, length); + if (!data) { + printk("[UNSUBSCRIBED]\n"); + params->value_handle = 0; + return BT_GATT_ITER_STOP; } + printk("[NOTIFICATION] data %p length %u\n", data, length); + return BT_GATT_ITER_CONTINUE; } @@ -84,16 +89,18 @@ static uint8_t discover_func(struct bt_conn *conn, if (err) { printk("Discover failed (err %d)\n", err); } - } else { - subscribe_params.func = subscribe_func; + subscribe_params.notify = notify_func; subscribe_params.value = BT_GATT_CCC_NOTIFY; subscribe_params.ccc_handle = attr->handle; err = bt_gatt_subscribe(conn, &subscribe_params); if (err && err != -EALREADY) { printk("Subscribe failed (err %d)\n", err); + } else { + printk("[SUBSCRIBED]\n"); } + return BT_GATT_ITER_STOP; } diff --git a/samples/bluetooth/shell/src/main.c b/samples/bluetooth/shell/src/main.c index 35cfe4476..2e671643f 100644 --- a/samples/bluetooth/shell/src/main.c +++ b/samples/bluetooth/shell/src/main.c @@ -958,23 +958,18 @@ static void cmd_gatt_write_signed(int argc, char *argv[]) static struct bt_gatt_subscribe_params subscribe_params; -static void subscribe_destroy(void *user_data) +static uint8_t notify_func(struct bt_conn *conn, + struct bt_gatt_subscribe_params *params, + const void *data, uint16_t length) { - struct bt_gatt_subscribe_params *params = user_data; - - printk("Subscribe destroy\n"); - params->value_handle = 0; -} - -static uint8_t subscribe_func(struct bt_conn *conn, int err, - const void *data, uint16_t length) -{ - if (!length) { - printk("Subscribe complete: err %u\n", err); - } else { - printk("Notification: data %p length %u\n", data, length); + if (!data) { + printk("Ubsubscribed\n"); + params->value_handle = 0; + return BT_GATT_ITER_STOP; } + printk("Notification: data %p length %u\n", data, length); + return BT_GATT_ITER_CONTINUE; } @@ -1006,8 +1001,7 @@ static void cmd_gatt_subscribe(int argc, char *argv[]) subscribe_params.ccc_handle = strtoul(argv[1], NULL, 16); subscribe_params.value_handle = strtoul(argv[2], NULL, 16); subscribe_params.value = BT_GATT_CCC_NOTIFY; - subscribe_params.func = subscribe_func; - subscribe_params.destroy = subscribe_destroy; + subscribe_params.notify = notify_func; if (argc > 3) { subscribe_params.value = strtoul(argv[3], NULL, 16); @@ -1016,9 +1010,10 @@ static void cmd_gatt_subscribe(int argc, char *argv[]) err = bt_gatt_subscribe(default_conn, &subscribe_params); if (err) { printk("Subscribe failed (err %d)\n", err); - } else { - printk("Subscribe pending\n"); + return; } + + printk("Subscribed\n"); } static void cmd_gatt_unsubscribe(int argc, char *argv[]) diff --git a/samples/bluetooth/tester/src/gatt.c b/samples/bluetooth/tester/src/gatt.c index 302ed3a6b..41292cd30 100644 --- a/samples/bluetooth/tester/src/gatt.c +++ b/samples/bluetooth/tester/src/gatt.c @@ -1508,39 +1508,20 @@ fail: } static struct bt_gatt_subscribe_params subscribe_params; -static struct bt_conn *default_conn; - -static void subscribe_destroy(void *user_data) -{ - struct bt_gatt_subscribe_params *params = user_data; - - memset(params, 0, sizeof(*params)); -} /* ev header + default MTU_ATT-3 */ static uint8_t ev_buf[33]; -static uint8_t subscribe_func(struct bt_conn *conn, int err, - const void *data, uint16_t length) +static uint8_t notify_func(struct bt_conn *conn, + struct bt_gatt_subscribe_params *params, + const void *data, uint16_t length) { struct gatt_notification_ev *ev = (void *) ev_buf; const bt_addr_le_t *addr = bt_conn_get_dst(conn); - uint8_t op; - - op = subscribe_params.value == BT_GATT_CCC_NOTIFY ? GATT_CFG_NOTIFY : - GATT_CFG_INDICATE; - - if (!length) { - /* Subscribe procedure is complete, send response */ - tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, - err ? BTP_STATUS_FAILED : BTP_STATUS_SUCCESS); - return BT_GATT_ITER_CONTINUE; - } - if (length > ARRAY_SIZE(ev_buf)) { - BTTESTER_DBG("Out of memory"); - tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, - BTP_STATUS_FAILED); + if (!data) { + BTTESTER_DBG("Unsubscribed"); + memset(params, 0, sizeof(*params)); return BT_GATT_ITER_STOP; } @@ -1557,32 +1538,32 @@ static uint8_t subscribe_func(struct bt_conn *conn, int err, return BT_GATT_ITER_CONTINUE; } -static void discover_complete(struct bt_gatt_discover_params *params) +static void discover_complete(struct bt_conn *conn, + struct bt_gatt_discover_params *params) { - int err; - uint8_t op; + uint8_t op, status; - /* If default_conn == NULL, it means that chrc has not been found */ - if (!default_conn) { + /* If no value handle it means that chrc has not been found */ + if (!subscribe_params.value_handle) { + status = BTP_STATUS_FAILED; goto fail; } - err = bt_gatt_subscribe(default_conn, &subscribe_params); - - /* Drop conn reference taken by discover_func */ - bt_conn_unref(default_conn); - default_conn = NULL; - - /* Return if bt_gatt_subscribe succeeded */ - if (!err) { - return; + if (bt_gatt_subscribe(conn, &subscribe_params) < 0) { + status = BTP_STATUS_FAILED; + goto fail; } + + status = BTP_STATUS_SUCCESS; fail: op = subscribe_params.value == BT_GATT_CCC_NOTIFY ? GATT_CFG_NOTIFY : GATT_CFG_INDICATE; - subscribe_destroy(&subscribe_params); - tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, - BTP_STATUS_FAILED); + + if (status == BTP_STATUS_FAILED) { + memset(&subscribe_params, 0, sizeof(subscribe_params)); + } + + tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, status); } static uint8_t discover_func(struct bt_conn *conn, @@ -1590,18 +1571,13 @@ static uint8_t discover_func(struct bt_conn *conn, struct bt_gatt_discover_params *params) { if (!attr) { - discover_complete(params); + discover_complete(conn, params); return BT_GATT_ITER_STOP; } /* Characteristic Value Handle is the next handle beyond declaration */ subscribe_params.value_handle = attr->handle + 1; - /* Save this conn to be used in discover_complete*/ - if (!default_conn) { - default_conn = bt_conn_ref(conn); - } - /* * Continue characteristic discovery to get last characteristic * preceding this CCC descriptor @@ -1613,7 +1589,7 @@ static int enable_subscription(struct bt_conn *conn, uint16_t ccc_handle, uint16_t value) { /* Fail if there is another subscription enabled */ - if (subscribe_params.value_handle) { + if (subscribe_params.ccc_handle) { BTTESTER_DBG("Another subscription already enabled"); return -EEXIST; } @@ -1626,8 +1602,7 @@ static int enable_subscription(struct bt_conn *conn, uint16_t ccc_handle, subscribe_params.ccc_handle = ccc_handle; subscribe_params.value = value; - subscribe_params.func = subscribe_func; - subscribe_params.destroy = subscribe_destroy; + subscribe_params.notify = notify_func; return bt_gatt_discover(conn, &discover_params); } @@ -1644,6 +1619,8 @@ static int disable_subscription(struct bt_conn *conn, uint16_t ccc_handle) return -EBUSY; } + subscribe_params.ccc_handle = 0; + return 0; } @@ -1652,35 +1629,43 @@ static void config_subscription(uint8_t *data, uint16_t len, uint16_t op) const struct gatt_cfg_notify_cmd *cmd = (void *) data; struct bt_conn *conn; uint16_t ccc_handle = sys_le16_to_cpu(cmd->ccc_handle); - uint16_t value = op == GATT_CFG_NOTIFY ? BT_GATT_CCC_NOTIFY : - BT_GATT_CCC_INDICATE; + uint8_t status; conn = bt_conn_lookup_addr_le((bt_addr_le_t *) data); if (!conn) { - goto fail; + tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, + BTP_STATUS_FAILED); + return; } if (cmd->enable) { + uint16_t value; + + if (op == GATT_CFG_NOTIFY) { + value = BT_GATT_CCC_NOTIFY; + } else { + value = BT_GATT_CCC_INDICATE; + } + + /* on success response will be sent from callback */ if (enable_subscription(conn, ccc_handle, value) == 0) { bt_conn_unref(conn); - /* Response will be sent by subscribe_func */ return; } - BTTESTER_DBG("Failed to enable subscription"); + + status = BTP_STATUS_FAILED; } else { - if (disable_subscription(conn, ccc_handle) == 0) { - bt_conn_unref(conn); - tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, - BTP_STATUS_SUCCESS); - return; + if (disable_subscription(conn, ccc_handle) < 0) { + status = BTP_STATUS_FAILED; + } else { + status = BTP_STATUS_SUCCESS; } - BTTESTER_DBG("Failed to disable subscription"); } + BTTESTER_DBG("Config subscription (op %u) status %u", op, status); + bt_conn_unref(conn); -fail: - tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, - BTP_STATUS_FAILED); + tester_rsp(BTP_SERVICE_ID_GATT, op, CONTROLLER_INDEX, status); } void tester_handle_gatt(uint8_t opcode, uint8_t index, uint8_t *data, |