bluetooth: host: move bt_gatt_authorization_cb_register to gatt.c

This function logically belongs to gatt.c as it is GATT API.

Signed-off-by: Pavel Vasilyev <[email protected]>

Author: PavelVPV

subsys/bluetooth/host/att.c

@@ -143,11 +143,6 @@ static uint16_t bt_att_mtu(struct bt_att_chan *chan)
 	return MIN(chan->chan.rx.mtu, chan->chan.tx.mtu);
 }
 
-/* Descriptor of application-specific authorization callbacks that are used
- * with the CONFIG_BT_GATT_AUTHORIZATION_CUSTOM Kconfig enabled.
- */
-static const struct bt_gatt_authorization_cb *authorization_cb;
-
 /* ATT connection specific data */
 struct bt_att {
 	struct bt_conn		*conn;
@@ -1350,20 +1345,6 @@ struct read_type_data {
 typedef bool (*attr_read_cb)(struct net_buf *buf, ssize_t read,
 			     void *user_data);
 
-static bool attr_read_authorize(struct bt_conn *conn,
-				const struct bt_gatt_attr *attr)
-{
-	if (!IS_ENABLED(CONFIG_BT_GATT_AUTHORIZATION_CUSTOM)) {
-		return true;
-	}
-
-	if (!authorization_cb || !authorization_cb->read_authorize) {
-		return true;
-	}
-
-	return authorization_cb->read_authorize(conn, attr);
-}
-
 static bool attr_read_type_cb(struct net_buf *frag, ssize_t read,
 			      void *user_data)
 {
@@ -1474,7 +1455,7 @@ static uint8_t read_type_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 	}
 
 	/* Check the attribute authorization logic */
-	if (!attr_read_authorize(conn, attr)) {
+	if (!bt_gatt_attr_read_authorize(conn, attr)) {
 		data->err = BT_ATT_ERR_AUTHORIZATION;
 		return BT_GATT_ITER_STOP;
 	}
@@ -1630,7 +1611,7 @@ static uint8_t read_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 	}
 
 	/* Check the attribute authorization logic */
-	if (!attr_read_authorize(conn, attr)) {
+	if (!bt_gatt_attr_read_authorize(conn, attr)) {
 		data->err = BT_ATT_ERR_AUTHORIZATION;
 		return BT_GATT_ITER_STOP;
 	}
@@ -1801,7 +1782,7 @@ static uint8_t read_vl_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 	}
 
 	/* Check the attribute authorization logic */
-	if (!attr_read_authorize(conn, attr)) {
+	if (!bt_gatt_attr_read_authorize(conn, attr)) {
 		data->err = BT_ATT_ERR_AUTHORIZATION;
 		return BT_GATT_ITER_STOP;
 	}
@@ -2050,20 +2031,6 @@ struct write_data {
 	uint8_t err;
 };
 
-static bool attr_write_authorize(struct bt_conn *conn,
-				 const struct bt_gatt_attr *attr)
-{
-	if (!IS_ENABLED(CONFIG_BT_GATT_AUTHORIZATION_CUSTOM)) {
-		return true;
-	}
-
-	if (!authorization_cb || !authorization_cb->write_authorize) {
-		return true;
-	}
-
-	return authorization_cb->write_authorize(conn, attr);
-}
-
 static uint8_t write_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 			void *user_data)
 {
@@ -2081,7 +2048,7 @@ static uint8_t write_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 	}
 
 	/* Check the attribute authorization logic */
-	if (!attr_write_authorize(data->conn, attr)) {
+	if (!bt_gatt_attr_write_authorize(data->conn, attr)) {
 		data->err = BT_ATT_ERR_AUTHORIZATION;
 		return BT_GATT_ITER_STOP;
 	}
@@ -2200,7 +2167,7 @@ static uint8_t prep_write_cb(const struct bt_gatt_attr *attr, uint16_t handle,
 	}
 
 	/* Check the attribute authorization logic */
-	if (!attr_write_authorize(data->conn, attr)) {
+	if (!bt_gatt_attr_write_authorize(data->conn, attr)) {
 		data->err = BT_ATT_ERR_AUTHORIZATION;
 		return BT_GATT_ITER_STOP;
 	}
@@ -4169,23 +4136,3 @@ bool bt_att_chan_opt_valid(struct bt_conn *conn, enum bt_att_chan_opt chan_opt)
 
 	return true;
 }
-
-int bt_gatt_authorization_cb_register(const struct bt_gatt_authorization_cb *cb)
-{
-	if (!IS_ENABLED(CONFIG_BT_GATT_AUTHORIZATION_CUSTOM)) {
-		return -ENOSYS;
-	}
-
-	if (!cb) {
-		authorization_cb = NULL;
-		return 0;
-	}
-
-	if (authorization_cb) {
-		return -EALREADY;
-	}
-
-	authorization_cb = cb;
-
-	return 0;
-}

subsys/bluetooth/host/gatt.c

@@ -6590,3 +6590,54 @@ void bt_gatt_req_set_mtu(struct bt_att_req *req, uint16_t mtu)
 	 * request types if needed.
 	 */
 }
+
+/* Descriptor of application-specific authorization callbacks that are used
+ * with the CONFIG_BT_GATT_AUTHORIZATION_CUSTOM Kconfig enabled.
+ */
+static const struct bt_gatt_authorization_cb *authorization_cb;
+
+bool bt_gatt_attr_read_authorize(struct bt_conn *conn, const struct bt_gatt_attr *attr)
+{
+	if (!IS_ENABLED(CONFIG_BT_GATT_AUTHORIZATION_CUSTOM)) {
+		return true;
+	}
+
+	if (!authorization_cb || !authorization_cb->read_authorize) {
+		return true;
+	}
+
+	return authorization_cb->read_authorize(conn, attr);
+}
+
+bool bt_gatt_attr_write_authorize(struct bt_conn *conn, const struct bt_gatt_attr *attr)
+{
+	if (!IS_ENABLED(CONFIG_BT_GATT_AUTHORIZATION_CUSTOM)) {
+		return true;
+	}
+
+	if (!authorization_cb || !authorization_cb->write_authorize) {
+		return true;
+	}
+
+	return authorization_cb->write_authorize(conn, attr);
+}
+
+int bt_gatt_authorization_cb_register(const struct bt_gatt_authorization_cb *cb)
+{
+	if (!IS_ENABLED(CONFIG_BT_GATT_AUTHORIZATION_CUSTOM)) {
+		return -ENOSYS;
+	}
+
+	if (!cb) {
+		authorization_cb = NULL;
+		return 0;
+	}
+
+	if (authorization_cb) {
+		return -EALREADY;
+	}
+
+	authorization_cb = cb;
+
+	return 0;
+}

subsys/bluetooth/host/gatt_internal.h

@@ -68,3 +68,6 @@ struct bt_gatt_attr;
 /* Check attribute permission */
 uint8_t bt_gatt_check_perm(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 			uint16_t mask);
+
+bool bt_gatt_attr_read_authorize(struct bt_conn *conn, const struct bt_gatt_attr *attr);
+bool bt_gatt_attr_write_authorize(struct bt_conn *conn, const struct bt_gatt_attr *attr);