Bluetooth: GATT: Replace check for CONFIG_BT_SMP

Vudentz · jhedberg · commit c736de05fa21 · 2019-10-16T12:08:25.000+03:00
Make use of bt_conn_get_security instead of accessing conn-&gt;sec_level
directly.

Signed-off-by: Luiz Augusto von Dentz &lt;luiz.von.dentz@intel.com&gt;
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
@@ -1867,13 +1867,9 @@ u8_t bt_gatt_check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 
 	mask &= attr->perm;
 	if (mask & BT_GATT_PERM_AUTHEN_MASK) {
-#if defined(CONFIG_BT_SMP)
-		if (conn->sec_level < BT_SECURITY_L3) {
+		if (bt_conn_get_security(conn) < BT_SECURITY_L3) {
 			return BT_ATT_ERR_AUTHENTICATION;
 		}
-#else
-		return BT_ATT_ERR_AUTHENTICATION;
-#endif /* CONFIG_BT_SMP */
 	}
 
 	if ((mask & BT_GATT_PERM_ENCRYPT_MASK)) {

Original file line number	Diff line number	Diff line change
`@@ -1867,13 +1867,9 @@ u8_t bt_gatt_check_perm(struct bt_conn conn, const struct bt_gatt_attr attr,`
`1867`	`1867`
`1868`	`1868`	`mask &= attr->perm;`
`1869`	`1869`	`if (mask & BT_GATT_PERM_AUTHEN_MASK) {`
`1870`		`-#if defined(CONFIG_BT_SMP)`
`1871`		`- if (conn->sec_level < BT_SECURITY_L3) {`
	`1870`	`+ if (bt_conn_get_security(conn) < BT_SECURITY_L3) {`
`1872`	`1871`	`return BT_ATT_ERR_AUTHENTICATION;`
`1873`	`1872`	`}`
`1874`		`-#else`
`1875`		`- return BT_ATT_ERR_AUTHENTICATION;`
`1876`		`-#endif /* CONFIG_BT_SMP */`
`1877`	`1873`	`}`
`1878`	`1874`
`1879`	`1875`	`if ((mask & BT_GATT_PERM_ENCRYPT_MASK)) {`