Hi Luiz,
> On Mon, Apr 27, 2015 at 6:14 AM, Luiz Augusto von Dentz <luiz.dentz@xxxxxxxxx> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>
> This adds support to encryption related flags as defined in the
> documentation.
> ---
> src/gatt-database.c | 34 +++++++++++++++++++++++++++++++---
> src/shared/att-types.h | 30 ++++++++++++++++++++++--------
> 2 files changed, 53 insertions(+), 11 deletions(-)
>
> diff --git a/src/gatt-database.c b/src/gatt-database.c
> index 2261398..cf75b41 100644
> --- a/src/gatt-database.c
> +++ b/src/gatt-database.c
> @@ -1241,7 +1241,19 @@ static bool parse_flags(GDBusProxy *proxy, uint8_t *props, uint8_t *ext_props)
> *ext_props |= BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE;
> else if (!strcmp("writable-auxiliaries", flag))
> *ext_props |= BT_GATT_CHRC_EXT_PROP_WRITABLE_AUX;
> - else {
> + else if (!strcmp("encrypt-read", flag)) {
> + *props |= BT_GATT_CHRC_PROP_READ;
> + *ext_props |= BT_GATT_CHRC_EXT_PROP_ENC_READ;
You should store these flags separately, perhaps in a
"permission_flags" variable. These shouldn't be part of ext_props as
they are not part of the CS definition of "Characteristic Extended
Properties". Plus, the ext_props variable serves the attribute value
for the local "Characteristic Extended Properties" descriptor when it
exists, so this logic will cause undefined values to be returned from
that descriptor.
> + } else if (!strcmp("encrypt-write", flag)) {
> + *props |= BT_GATT_CHRC_PROP_WRITE;
> + *ext_props |= BT_GATT_CHRC_EXT_PROP_ENC_WRITE;
> + } else if (!strcmp("encrypt-authenticated-read", flag)) {
> + *props |= BT_GATT_CHRC_PROP_READ;
> + *ext_props |= BT_GATT_CHRC_EXT_PROP_AUTH_READ;
> + } else if (!strcmp("encrypt-authenticated-write", flag)) {
> + *props |= BT_GATT_CHRC_PROP_WRITE;
> + *ext_props |= BT_GATT_CHRC_EXT_PROP_AUTH_WRITE;
> + } else {
> error("Invalid characteristic flag: %s", flag);
> return false;
> }
> @@ -1668,12 +1680,28 @@ static uint32_t permissions_from_props(uint8_t props, uint8_t ext_props)
>
> if (props & BT_GATT_CHRC_PROP_WRITE ||
> props & BT_GATT_CHRC_PROP_WRITE_WITHOUT_RESP ||
> - ext_props & BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE)
> + ext_props & BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE ||
> + ext_props & BT_GATT_CHRC_EXT_PROP_ENC_WRITE ||
> + ext_props & BT_GATT_CHRC_EXT_PROP_AUTH_WRITE)
> perm |= BT_ATT_PERM_WRITE;
>
> - if (props & BT_GATT_CHRC_PROP_READ)
> + if (props & BT_GATT_CHRC_PROP_READ ||
> + ext_props & BT_GATT_CHRC_EXT_PROP_ENC_READ ||
> + ext_props & BT_GATT_CHRC_EXT_PROP_AUTH_READ)
> perm |= BT_ATT_PERM_READ;
>
> + if (ext_props & BT_GATT_CHRC_EXT_PROP_ENC_READ)
> + perm |= BT_ATT_PERM_READ_ENCRYPT;
> +
> + if (ext_props & BT_GATT_CHRC_EXT_PROP_ENC_WRITE)
> + perm |= BT_ATT_PERM_WRITE_ENCRYPT;
> +
> + if (ext_props & BT_GATT_CHRC_EXT_PROP_AUTH_READ)
> + perm |= BT_ATT_PERM_READ_AUTHEN;
> +
> + if (ext_props & BT_GATT_CHRC_EXT_PROP_AUTH_WRITE)
> + perm |= BT_ATT_PERM_WRITE_AUTHEN;
> +
> return perm;
> }
>
> diff --git a/src/shared/att-types.h b/src/shared/att-types.h
> index 10a42f2..ce531d1 100644
> --- a/src/shared/att-types.h
> +++ b/src/shared/att-types.h
> @@ -106,12 +106,18 @@ struct bt_att_pdu_error_rsp {
> * "Access", "Encryption", "Authentication", and "Authorization". A bitmask of
> * permissions is a byte that encodes a combination of these.
> */
> -#define BT_ATT_PERM_READ 0x01
> -#define BT_ATT_PERM_WRITE 0x02
> -#define BT_ATT_PERM_ENCRYPT 0x04
> -#define BT_ATT_PERM_AUTHEN 0x08
> -#define BT_ATT_PERM_AUTHOR 0x10
> -#define BT_ATT_PERM_NONE 0x20
> +#define BT_ATT_PERM_READ 0x01
> +#define BT_ATT_PERM_WRITE 0x02
> +#define BT_ATT_PERM_READ_ENCRYPT 0x04
> +#define BT_ATT_PERM_WRITE_ENCRYPT 0x08
> +#define BT_ATT_PERM_ENCRYPT BT_ATT_PERM_READ_ENCRYPT | \
> + BT_ATT_PERM_WRITE_ENCRYPT
> +#define BT_ATT_PERM_READ_AUTHEN 0x10
> +#define BT_ATT_PERM_WRITE_AUTHEN 0x20
> +#define BT_ATT_PERM_AUTHEN BT_ATT_PERM_READ_AUTHEN | \
> + BT_ATT_PERM_WRITE_AUTHEN
> +#define BT_ATT_PERM_AUTHOR 0x40
> +#define BT_ATT_PERM_NONE 0x80
>
> /* GATT Characteristic Properties Bitfield values */
> #define BT_GATT_CHRC_PROP_BROADCAST 0x01
> @@ -124,5 +130,13 @@ struct bt_att_pdu_error_rsp {
> #define BT_GATT_CHRC_PROP_EXT_PROP 0x80
>
> /* GATT Characteristic Extended Properties Bitfield values */
> -#define BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE 0x01
> -#define BT_GATT_CHRC_EXT_PROP_WRITABLE_AUX 0x02
> +#define BT_GATT_CHRC_EXT_PROP_RELIABLE_WRITE 0x01
> +#define BT_GATT_CHRC_EXT_PROP_WRITABLE_AUX 0x02
> +#define BT_GATT_CHRC_EXT_PROP_ENC_READ 0x04
> +#define BT_GATT_CHRC_EXT_PROP_ENC_WRITE 0x08
> +#define BT_GATT_CHRC_EXT_PROP_ENC BT_GATT_CHRC_EXT_PROP_ENC_READ | \
> + BT_GATT_CHRC_EXT_PROP_ENC_WRITE
> +#define BT_GATT_CHRC_EXT_PROP_AUTH_READ 0x10
> +#define BT_GATT_CHRC_EXT_PROP_AUTH_WRITE 0x20
> +#define BT_GATT_CHRC_EXT_PROP_AUTH BT_GATT_CHRC_EXT_PROP_AUTH_READ | \
> + BT_GATT_CHRC_EXT_PROP_AUTH_WRITE
We should keep these new flags separate from the extended properties
stored in ATT. The GATT/ATT spec doesn't define these as extended
properties so these definitions don't really belong here; shared/att
should be strictly for GATT/ATT as defined by the spec whereas the new
permission flags are D-Bus API specific.. I'd define the D-Bus API
flags that represent your new attribute permissions in
src/gatt-database.h.
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks,
Arman
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
