michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: host: cfg_write callback to return error code

Browse source 
Current implementation of application's cfg_write callback only has the
possibility of returning boolean status, which in case of failure only
allows for one error code; BT_ATT_ERR_WRITE_NOT_PERMITTED.
This change makes the application able to add own security check on
characteristic subscription in the cfg_write callback and report a more
relevant error code (e.g. BT_ATT_ERR_AUTHORIZATION).

Signed-off-by: Kim Sekkelund <ksek@oticon.com>
This commit is contained in:
Kim Sekkelund 2019-11-26 08:22:21 +01:00 • committed by Johan Hedberg
commit 9ea6e72bae
3 changed files with 58 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
include/bluetooth/gatt.h
View file

@ -571,15 +571,43 @@ struct bt_gatt_ccc_cfg {
/* Internal representation of CCC value */
struct _bt_gatt_ccc {
struct bt_gatt_ccc_cfg cfg[BT_GATT_CCC_MAX];
u16_t value;
void (*cfg_changed)(const struct bt_gatt_attr *attr,
u16_t value);
bool (*cfg_write)(struct bt_conn *conn,
const struct bt_gatt_attr *attr,
u16_t value);
bool (*cfg_match)(struct bt_conn *conn,
const struct bt_gatt_attr *attr);
/** Configuration for each connection */
struct bt_gatt_ccc_cfg cfg[BT_GATT_CCC_MAX];
/** Highest value of all connected peer's subscriptions */
u16_t value;
/** CCC attribute changed callback
*
* @param attr The attribute that's changed value
* @param value New value
*/
void (*cfg_changed)(const struct bt_gatt_attr *attr, u16_t value);
/** CCC attribute write validation callback
*
* @param conn The connection that is requesting to write
* @param attr The attribute that's being written
* @param value CCC value to write
*
* @return Number of bytes to write, or in case of an error
* BT_GATT_ERR() with a specific error code.
*/
ssize_t (*cfg_write)(struct bt_conn *conn,
const struct bt_gatt_attr *attr, u16_t value);
/** CCC attribute match handler
* Indicate if it is OK to send a notification or indication
* to the subscriber.
*
* @param conn The connection that is being checked
* @param attr The attribute that's being checked
*
* @return true if application has approved notification/indication,
* false if application does not approve.
*/
bool (*cfg_match)(struct bt_conn *conn,
const struct bt_gatt_attr *attr);
};
/** @brief Read Client Characteristic Configuration Attribute helper.

20
subsys/bluetooth/host/gatt.c
View file

@ -359,9 +359,8 @@ done:
}
}
static bool sc_ccc_cfg_write(struct bt_conn *conn,
const struct bt_gatt_attr *attr,
u16_t value)
static ssize_t sc_ccc_cfg_write(struct bt_conn *conn,
const struct bt_gatt_attr *attr, u16_t value)
{
BT_DBG("value 0x%04x", value);
@ -378,7 +377,7 @@ static bool sc_ccc_cfg_write(struct bt_conn *conn,
}
}
return true;
return sizeof(value);
}
static struct _bt_gatt_ccc sc_ccc = BT_GATT_CCC_INITIALIZER(NULL,
@ -1483,8 +1482,17 @@ ssize_t bt_gatt_attr_write_ccc(struct bt_conn *conn,
}
/* Confirm write if cfg is managed by application */
if (ccc->cfg_write && !ccc->cfg_write(conn, attr, value)) {
return BT_GATT_ERR(BT_ATT_ERR_WRITE_NOT_PERMITTED);
if (ccc->cfg_write) {
ssize_t write = ccc->cfg_write(conn, attr, value);
if (write < 0) {
return write;
}
/* Accept size=1 for backwards compatibility */
if (write != sizeof(value) && write != 1) {
return BT_GATT_ERR(BT_ATT_ERR_UNLIKELY);
}
}
cfg->value = value;

14
subsys/bluetooth/mesh/proxy.c
View file

@ -612,7 +612,7 @@ static void prov_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
BT_DBG("value 0x%04x", value);
}
static bool prov_ccc_write(struct bt_conn *conn,
static ssize_t prov_ccc_write(struct bt_conn *conn,
const struct bt_gatt_attr *attr, u16_t value)
{
struct bt_mesh_proxy_client *client;
@ -621,7 +621,7 @@ static bool prov_ccc_write(struct bt_conn *conn,
if (value != BT_GATT_CCC_NOTIFY) {
BT_WARN("Client wrote 0x%04x instead enabling notify", value);
return false;
return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
}
/* If a connection exists there must be a client */
@ -633,7 +633,7 @@ static bool prov_ccc_write(struct bt_conn *conn,
bt_mesh_pb_gatt_open(conn);
}
return true;
return sizeof(value);
}
/* Mesh Provisioning Service Declaration */
@ -731,8 +731,8 @@ static void proxy_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
BT_DBG("value 0x%04x", value);
}
static bool proxy_ccc_write(struct bt_conn *conn,
const struct bt_gatt_attr *attr, u16_t value)
static ssize_t proxy_ccc_write(struct bt_conn *conn,
const struct bt_gatt_attr *attr, u16_t value)
{
struct bt_mesh_proxy_client *client;
@ -740,7 +740,7 @@ static bool proxy_ccc_write(struct bt_conn *conn,
if (value != BT_GATT_CCC_NOTIFY) {
BT_WARN("Client wrote 0x%04x instead enabling notify", value);
return false;
return BT_GATT_ERR(BT_ATT_ERR_VALUE_NOT_ALLOWED);
}
/* If a connection exists there must be a client */
@ -752,7 +752,7 @@ static bool proxy_ccc_write(struct bt_conn *conn,
k_work_submit(&client->send_beacons);
}
return true;
return sizeof(value);
}
/* Mesh Proxy Service Declaration */