Commit f8ba0ccc authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Anas Nashif
Browse files

Bluetooth: GATT: Fix not storing SC changes 



CCC storaged is no longer declared separetly so check if ccc->cfg
matches with sc_ccc_cfg no longer works so instead use the cfg_changed
callback and match against sc_ccc_cfg_changed.

Fixes #19267

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 1b31b7eb

subsys/bluetooth/host/gatt.c

+2 −4
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ BT_GATT_SERVICE_DEFINE(_2_gap_svc, 
);



#if defined(CONFIG_BT_GATT_DYNAMIC_DB)

static struct bt_gatt_ccc_cfg sc_ccc_cfg[BT_GATT_CCC_MAX] = {};



static void sc_ccc_cfg_changed(const struct bt_gatt_attr *attr,

			       u16_t value)

{
@@ -1544,7 +1542,7 @@ static u8_t notify_cb(const struct bt_gatt_attr *attr, void *user_data) 
		conn = bt_conn_lookup_addr_le(cfg->id, &cfg->peer);

		if (!conn) {

#if defined(CONFIG_BT_GATT_DYNAMIC_DB)

			if (ccc->cfg == sc_ccc_cfg) {

			if (ccc->cfg_changed == sc_ccc_cfg_changed) {

				sc_save(cfg, data->ind_params);

			}

#endif /* CONFIG_BT_GATT_DYNAMIC_DB */
@@ -1752,7 +1750,7 @@ static u8_t connected_cb(const struct bt_gatt_attr *attr, void *user_data) 
		if (ccc->cfg[i].value) {

			gatt_ccc_changed(attr, ccc);

#if defined(CONFIG_BT_GATT_DYNAMIC_DB)

			if (ccc->cfg == sc_ccc_cfg) {

			if (ccc->cfg_changed == sc_ccc_cfg_changed) {

				sc_restore(&ccc->cfg[i]);

			}

#endif /* CONFIG_BT_GATT_DYNAMIC_DB */

CRA Git | Maintained and supported by SUSTech CRA and CCSE