michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: gatt: remove operation infix from authorization callback API

Browse source 
Removed the "operation" infix from the bt_gatt_authorization_cb
callback structure in the Bluetooth GATT header.

Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
This commit is contained in:
Kamil Piszczek 2024-01-30 10:13:00 +01:00 • committed by Fabio Baltieri
commit 129b73ce26
3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/zephyr/bluetooth/gatt.h
View file

@ -248,8 +248,8 @@ struct bt_gatt_authorization_cb {
* @retval true Authorize the operation and allow it to execute. * @retval true Authorize the operation and allow it to execute.
* @retval false Reject the operation and prevent it from executing. * @retval false Reject the operation and prevent it from executing.
*/ */
bool (*read_operation_authorize)(struct bt_conn *conn, bool (*read_authorize)(struct bt_conn *conn,
const struct bt_gatt_attr *attr); const struct bt_gatt_attr *attr);
/** @brief Authorize the GATT write operation. /** @brief Authorize the GATT write operation.
* *
@ -262,8 +262,8 @@ struct bt_gatt_authorization_cb {
* @retval true Authorize the operation and allow it to execute. * @retval true Authorize the operation and allow it to execute.
* @retval false Reject the operation and prevent it from executing. * @retval false Reject the operation and prevent it from executing.
*/ */
bool (*write_operation_authorize)(struct bt_conn *conn, bool (*write_authorize)(struct bt_conn *conn,
const struct bt_gatt_attr *attr); const struct bt_gatt_attr *attr);
}; };
/** Characteristic Properties Bit field values */ /** Characteristic Properties Bit field values */

8
subsys/bluetooth/host/att.c
View file

@ -1278,11 +1278,11 @@ static bool attr_read_authorize(struct bt_conn *conn,
return true; return true;
} }
if (!authorization_cb || !authorization_cb->read_operation_authorize) { if (!authorization_cb || !authorization_cb->read_authorize) {
return true; return true;
} }
return authorization_cb->read_operation_authorize(conn, attr); return authorization_cb->read_authorize(conn, attr);
} }
static bool attr_read_type_cb(struct net_buf *frag, ssize_t read, static bool attr_read_type_cb(struct net_buf *frag, ssize_t read,
@ -1956,11 +1956,11 @@ static bool attr_write_authorize(struct bt_conn *conn,
return true; return true;
} }
if (!authorization_cb || !authorization_cb->write_operation_authorize) { if (!authorization_cb || !authorization_cb->write_authorize) {
return true; return true;
} }
return authorization_cb->write_operation_authorize(conn, attr); return authorization_cb->write_authorize(conn, attr);
} }
static uint8_t write_cb(const struct bt_gatt_attr *attr, uint16_t handle, static uint8_t write_cb(const struct bt_gatt_attr *attr, uint16_t handle,

10
tests/bsim/bluetooth/host/gatt/authorization/src/gatt_server_test.c
View file

@ -287,8 +287,7 @@ BT_GATT_SERVICE_DEFINE(test_svc,
NULL, write_cp_chrc, NULL), NULL, write_cp_chrc, NULL),
); );
static bool gatt_read_operation_authorize(struct bt_conn *conn, static bool gatt_read_authorize(struct bt_conn *conn, const struct bt_gatt_attr *attr)
const struct bt_gatt_attr *attr)
{ {
if (bt_uuid_cmp(attr->uuid, TEST_UNAUTHORIZED_CHRC_UUID) == 0) { if (bt_uuid_cmp(attr->uuid, TEST_UNAUTHORIZED_CHRC_UUID) == 0) {
unauthorized_chrc_ctx.auth_read_cnt++; unauthorized_chrc_ctx.auth_read_cnt++;
@ -301,8 +300,7 @@ static bool gatt_read_operation_authorize(struct bt_conn *conn,
} }
} }
static bool gatt_write_operation_authorize(struct bt_conn *conn, static bool gatt_write_authorize(struct bt_conn *conn, const struct bt_gatt_attr *attr)
const struct bt_gatt_attr *attr)
{ {
if (bt_uuid_cmp(attr->uuid, TEST_UNAUTHORIZED_CHRC_UUID) == 0) { if (bt_uuid_cmp(attr->uuid, TEST_UNAUTHORIZED_CHRC_UUID) == 0) {
unauthorized_chrc_ctx.auth_write_cnt++; unauthorized_chrc_ctx.auth_write_cnt++;
@ -316,8 +314,8 @@ static bool gatt_write_operation_authorize(struct bt_conn *conn,
} }
static const struct bt_gatt_authorization_cb gatt_authorization_callbacks = { static const struct bt_gatt_authorization_cb gatt_authorization_callbacks = {
.read_operation_authorize = gatt_read_operation_authorize, .read_authorize = gatt_read_authorize,
.write_operation_authorize = gatt_write_operation_authorize, .write_authorize = gatt_write_authorize,
}; };
static void test_main(void) static void test_main(void)