Return-Path: From: Arman Uguray To: linux-bluetooth@vger.kernel.org Cc: Arman Uguray Subject: [PATCH 07/10] shared/att: Implement outgoing "Read By Group Type" request/response. Date: Thu, 26 Jun 2014 16:14:14 -0700 Message-Id: <1403824457-22461-8-git-send-email-armansito@chromium.org> In-Reply-To: <1403824457-22461-1-git-send-email-armansito@chromium.org> References: <1403824457-22461-1-git-send-email-armansito@chromium.org> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: This patch adds support for "Read By Group Type" requests sent via bt_att_send and the corresponding response. --- src/shared/att-types.h | 4 +-- src/shared/att.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/shared/att-types.h b/src/shared/att-types.h index ae2dfb6..4809716 100644 --- a/src/shared/att-types.h +++ b/src/shared/att-types.h @@ -127,14 +127,14 @@ struct bt_att_read_mult_rsp_param { /* Read By Group Type */ #define BT_ATT_OP_READ_BY_GRP_TYPE_REQ 0x10 -struct bt_att_read_by_group_type_req_param { +struct bt_att_read_by_grp_type_req_param { uint16_t start_handle; uint16_t end_handle; bt_uuid_t type; }; #define BT_ATT_OP_READ_BY_GRP_TYPE_RSP 0x11 -struct bt_att_read_by_group_type_rsp_param { +struct bt_att_read_by_grp_type_rsp_param { uint8_t length; const uint8_t *attr_data_list; uint16_t list_length; /* Length of "attr_data_list" */ diff --git a/src/shared/att.c b/src/shared/att.c index 2658969..3406b24 100644 --- a/src/shared/att.c +++ b/src/shared/att.c @@ -341,6 +341,44 @@ static bool encode_read_mult_req(struct att_send_op *op, return true; } +static bool encode_read_by_grp_type_req(struct att_send_op *op, + const void *param, uint16_t length, + uint16_t mtu) +{ + const struct bt_att_read_by_grp_type_req_param *p = param; + uint8_t uuid[16]; + uint8_t uuid_len; + uint16_t len; + + if (length != sizeof(*p)) + return false; + + if (p->type.type == BT_UUID16) { + uuid_len = 2; + put_le16(p->type.value.u16, uuid); + } else if (p->type.type == BT_UUID128) { + uuid_len = 16; + bswap_128(&p->type.value.u128, uuid); + } else + return false; + + len = 5 + uuid_len; + if (len > mtu) + return false; + + op->pdu = malloc(len); + if (!op->pdu) + return false; + + ((uint8_t *) op->pdu)[0] = op->opcode; + put_le16(p->start_handle, ((uint8_t *) op->pdu) + 1); + put_le16(p->end_handle, ((uint8_t *) op->pdu) + 3); + memcpy(((uint8_t *) op->pdu) + 5, uuid, uuid_len); + op->len = len; + + return true; +} + static bool encode_pdu(struct att_send_op *op, const void *param, uint16_t length, uint16_t mtu) { @@ -379,6 +417,8 @@ static bool encode_pdu(struct att_send_op *op, const void *param, return encode_read_blob_req(op, param, length, mtu); case BT_ATT_OP_READ_MULT_REQ: return encode_read_mult_req(op, param, length, mtu); + case BT_ATT_OP_READ_BY_GRP_TYPE_REQ: + return encode_read_by_grp_type_req(op, param, length, mtu); default: break; } @@ -782,6 +822,32 @@ static bool handle_read_mult_rsp(struct bt_att *att, uint8_t opcode, sizeof(param)); } +static bool handle_read_by_grp_type_rsp(struct bt_att *att, uint8_t opcode, + uint8_t *pdu, ssize_t pdu_len) +{ + struct bt_att_read_by_grp_type_rsp_param param; + + /* PDU must contain at least the following: + * - 1 octet: ATT opcode. + * - 1 octet: Length + * - 2 to MTU-2 octets: Attribute Data List + */ + if (pdu_len < 4) + return false; + + memset(¶m, 0, sizeof(param)); + + param.length = pdu[1]; + param.attr_data_list = pdu + 2; + param.list_length = pdu_len - 2; + + if (param.list_length % param.length) + return false; + + return request_complete(att, BT_ATT_OP_READ_BY_GRP_TYPE_REQ, opcode, + ¶m, sizeof(param)); +} + static void handle_rsp(struct bt_att *att, uint8_t opcode, uint8_t *pdu, ssize_t pdu_len) { @@ -813,6 +879,10 @@ static void handle_rsp(struct bt_att *att, uint8_t opcode, uint8_t *pdu, case BT_ATT_OP_READ_MULT_RSP: success = handle_read_mult_rsp(att, opcode, pdu, pdu_len); break; + case BT_ATT_OP_READ_BY_GRP_TYPE_RSP: + success = handle_read_by_grp_type_rsp(att, opcode, + pdu, pdu_len); + break; default: success = false; util_debug(att->debug_callback, att->debug_data, -- 2.0.0.526.g5318336