applications, samples: use conn_handle from sys attr missing event

When responding with sd_ble_gatts_sys_attr_set() to a
BLE_GATTS_EVT_SYS_ATTR_MISSING event, use the connection handle
from the BLE GATTS event. This is more correct than using some
conn_handle stored in some global data.

While the conn_handle is stored with the same offset in both the
evt.gap_evt and evt.gatts_evt structures,
the BLE_GATTS_EVT_SYS_ATTR_MISSING event is a GATTS event and so it
is incorrect to read it using evt.gap_evt. Read the conn_handle
correctly using the evt.gatts_evt structure.

Signed-off-by: Andreas Moltumyr <andreas.moltumyr@nordicsemi.no>

Author: anhmolt

applications/firmware_loader/ble_mcumgr/src/main.c

@@ -104,7 +104,7 @@ static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 	case BLE_GATTS_EVT_SYS_ATTR_MISSING:
 	{
 		/* No system attributes have been stored */
-		nrf_err = sd_ble_gatts_sys_attr_set(evt->evt.gap_evt.conn_handle, NULL, 0, 0);
+		nrf_err = sd_ble_gatts_sys_attr_set(evt->evt.gatts_evt.conn_handle, NULL, 0, 0);
 
 		if (nrf_err) {
 			LOG_ERR("Failed to set system attributes, nrf_error %#x", nrf_err);

samples/bluetooth/ble_lbs/src/main.c

@@ -65,7 +65,7 @@ static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 
 	case BLE_GATTS_EVT_SYS_ATTR_MISSING:
 		/* No system attributes have been stored */
-		nrf_err = sd_ble_gatts_sys_attr_set(conn_handle, NULL, 0, 0);
+		nrf_err = sd_ble_gatts_sys_attr_set(evt->evt.gatts_evt.conn_handle, NULL, 0, 0);
 		if (nrf_err) {
 			LOG_ERR("Failed to set system attributes, nrf_error %#x", nrf_err);
 		}

samples/bluetooth/ble_nus/src/main.c

@@ -242,7 +242,7 @@ static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 
 	case BLE_GATTS_EVT_SYS_ATTR_MISSING:
 		/* No system attributes have been stored */
-		nrf_err = sd_ble_gatts_sys_attr_set(conn_handle, NULL, 0, 0);
+		nrf_err = sd_ble_gatts_sys_attr_set(evt->evt.gatts_evt.conn_handle, NULL, 0, 0);
 		if (nrf_err) {
 			LOG_ERR("Failed to set system attributes, nrf_error %#x", nrf_err);
 		}

samples/bluetooth/ble_pwr_profiling/src/main.c

@@ -346,7 +346,7 @@ static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 
 	case BLE_GATTS_EVT_SYS_ATTR_MISSING:
 		/* No system attributes have been stored */
-		nrf_err = sd_ble_gatts_sys_attr_set(conn_handle, NULL, 0, 0);
+		nrf_err = sd_ble_gatts_sys_attr_set(evt->evt.gatts_evt.conn_handle, NULL, 0, 0);
 		if (nrf_err) {
 			LOG_ERR("Failed to set system attributes, nrf_error %#x", nrf_err);
 		}

samples/boot/mcuboot_recovery_entry/src/main.c

@@ -96,7 +96,7 @@ static void on_ble_evt(const ble_evt_t *evt, void *ctx)
 	case BLE_GATTS_EVT_SYS_ATTR_MISSING:
 	{
 		/* No system attributes have been stored */
-		nrf_err = sd_ble_gatts_sys_attr_set(evt->evt.gap_evt.conn_handle, NULL, 0, 0);
+		nrf_err = sd_ble_gatts_sys_attr_set(evt->evt.gatts_evt.conn_handle, NULL, 0, 0);
 
 		if (nrf_err) {
 			LOG_ERR("Failed to set system attributes, nrf_error %#x", nrf_err);