michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: GATT: Fix CCC handling

Browse source 
The 'valid' member of struct bt_gatt_ccc_cfg was redundant, since
setting 'peer' to BT_ADDR_LE_ANY does the same job. What's worse, the
handling of 'valid' was also buggy in that some places looking for
valid CCC structs only matched the address, meaning it might yield a
positive match for invalid entries.

Fix these issues by removing the 'valid' struct member, and solely
using the 'peer' member to identify valid entries. Also simplify the
code by acknowledging that no CCC entry is essentially the same as the
value '0' written to CCC.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2018-04-30 20:27:36 +01:00 • committed by Johan Hedberg
commit 6a71a69f8d
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bluetooth/gatt.h
View file

@ -488,13 +488,11 @@ ssize_t bt_gatt_attr_read_chrc(struct bt_conn *conn,
#define BT_GATT_CCC_MAX (CONFIG_BT_MAX_PAIRED + CONFIG_BT_MAX_CONN)
/** @brief GATT CCC configuration entry.
* @param valid Valid flag
* @param peer Remote peer address
* @param value Configuration value.
* @param data Configuration pointer data.
*/
struct bt_gatt_ccc_cfg {
u8_t valid;
bt_addr_le_t peer;
u16_t value;
u8_t data[4] __aligned(4);