Use modified version of gatt_db_read_by_group_type which return list
of handles instead of specific data.
---
android/gatt.c | 172 +++++++++++++++++++++++++++++++++------------------------
1 file changed, 99 insertions(+), 73 deletions(-)
diff --git a/android/gatt.c b/android/gatt.c
index 66d6d3b..cdaa3ef 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -3957,25 +3957,6 @@ static const struct ipc_handler cmd_handlers[] = {
sizeof(struct hal_cmd_gatt_server_send_response) },
};
-struct copy_att_list_data {
- int iterator;
- struct att_data_list *adl;
-};
-
-static void copy_to_att_list(void *data, void *user_data)
-{
- struct copy_att_list_data *l = user_data;
- struct gatt_db_group *group = data;
- uint8_t *value;
-
- value = l->adl->data[l->iterator++];
-
- put_le16(group->handle, value);
- put_le16(group->end_group, &value[2]);
-
- memcpy(&value[4], group->value, group->len);
-}
-
struct request_processing_data {
uint8_t opcode;
struct gatt_device *device;
@@ -3990,8 +3971,8 @@ static void read_requested_db_data(void *data, void *user_data)
int value_len;
/*
- * Store read result as this needs to be removed from queue or else
- * queue will not be sent at all.
+ * Store read result as this needs to be removed from queue on failure
+ * or else queued data will not be sent at all.
*/
resp_data->read_done = gatt_db_read(gatt_db, resp_data->handle,
resp_data->offset,
@@ -4043,57 +4024,6 @@ static void process_pending_read_requests(uint8_t att_opcode,
NULL, destroy_response_data);
}
-static uint8_t read_by_group_type(const uint8_t *cmd, uint16_t cmd_len,
- uint8_t *rsp, size_t rsp_size,
- uint16_t *length)
-{
- uint16_t start, end;
- uint16_t len;
- bt_uuid_t uuid;
- struct queue *q;
- struct att_data_list *adl;
- struct copy_att_list_data l;
- struct gatt_db_group *d;
-
- len = dec_read_by_grp_req(cmd, cmd_len, &start, &end, &uuid);
- if (!len)
- return ATT_ECODE_INVALID_PDU;
-
- q = queue_new();
- if (!q)
- return ATT_ECODE_INSUFF_RESOURCES;
-
- gatt_db_read_by_group_type(gatt_db, start, end, uuid, q);
-
- if (queue_isempty(q)) {
- queue_destroy(q, NULL);
- return ATT_ECODE_ATTR_NOT_FOUND;
- }
-
- len = queue_length(q);
- d = queue_peek_head(q);
-
- /* Element contains start/end handle + size of uuid */
- adl = att_data_list_alloc(len, 2 * sizeof(uint16_t) + d->len);
- if (!adl) {
- queue_destroy(q, free);
- return ATT_ECODE_INSUFF_RESOURCES;
- }
-
- l.iterator = 0;
- l.adl = adl;
-
- queue_foreach(q, copy_to_att_list, &l);
-
- len = enc_read_by_grp_resp(adl, rsp, rsp_size);
- *length = len;
-
- att_data_list_free(adl);
- queue_destroy(q, free);
-
- return 0;
-}
-
static void send_pending_response(uint8_t opcode, struct gatt_device *device)
{
uint8_t rsp[ATT_DEFAULT_LE_MTU];
@@ -4167,6 +4097,54 @@ static void send_pending_response(uint8_t opcode, struct gatt_device *device)
len = enc_read_resp(val->value, val->length, rsp, sizeof(rsp));
destroy_response_data(val);
break;
+ case ATT_OP_READ_BY_GROUP_REQ: {
+ int iterator = 0;
+ int length;
+ struct queue *temp;
+
+ temp = queue_new();
+ if (!temp)
+ goto done;
+
+ val = queue_pop_head(device->pending_requests);
+ if (!val) {
+ error = ATT_ECODE_ATTR_NOT_FOUND;
+ goto done;
+ }
+
+ length = val->length;
+
+ while (val && val->length == length) {
+ queue_push_tail(temp, val);
+ val = queue_pop_head(device->pending_requests);
+ }
+
+ adl = att_data_list_alloc(queue_length(temp),
+ 2 * sizeof(uint16_t) + length);
+
+ val = queue_pop_head(temp);
+ while (val) {
+ uint8_t *value = adl->data[iterator++];
+ uint16_t end_handle;
+
+ end_handle = gatt_db_get_end_handle(gatt_db,
+ val->handle);
+
+ put_le16(val->handle, value);
+ put_le16(end_handle, &value[2]);
+ memcpy(&value[4], val->value, val->length);
+
+ destroy_response_data(val);
+ val = queue_pop_head(temp);
+ }
+
+ len = enc_read_by_grp_resp(adl, rsp, sizeof(rsp));
+
+ att_data_list_free(adl);
+ queue_destroy(temp, destroy_response_data);
+
+ break;
+ }
default:
break;
}
@@ -4182,6 +4160,54 @@ done:
destroy_response_data);
}
+static uint8_t read_by_group_type(const uint8_t *cmd, uint16_t cmd_len,
+ uint8_t *rsp, size_t rsp_size,
+ uint16_t *length,
+ struct gatt_device *device)
+{
+ uint16_t start, end;
+ int len;
+ bt_uuid_t uuid;
+ struct queue *q;
+
+ len = dec_read_by_grp_req(cmd, cmd_len, &start, &end, &uuid);
+ if (!len)
+ return ATT_ECODE_INVALID_PDU;
+
+ q = queue_new();
+ if (!q)
+ return ATT_ECODE_INSUFF_RESOURCES;
+
+ gatt_db_read_by_group_type(gatt_db, start, end, uuid, q);
+
+ if (queue_isempty(q)) {
+ queue_destroy(q, NULL);
+ return ATT_ECODE_ATTR_NOT_FOUND;
+ }
+
+ while (queue_peek_head(q)) {
+ uint16_t handle = PTR_TO_UINT(queue_pop_head(q));
+ struct response_data *entry;
+
+ entry = new0(struct response_data, 1);
+ if (!entry) {
+ queue_destroy(q, destroy_response_data);
+ return ATT_ECODE_UNLIKELY;
+ }
+
+ entry->handle = handle;
+
+ queue_push_tail(device->pending_requests, entry);
+ }
+
+ queue_destroy(q, NULL);
+
+ process_pending_read_requests(ATT_OP_READ_BY_GROUP_REQ, device);
+ send_pending_response(cmd[0], device);
+
+ return 0;
+}
+
static bool match_handle_val_by_empty_len(const void *data,
const void *user_data)
{
@@ -4498,7 +4524,7 @@ static void att_handler(const uint8_t *ipdu, uint16_t len, gpointer user_data)
switch (ipdu[0]) {
case ATT_OP_READ_BY_GROUP_REQ:
status = read_by_group_type(ipdu, len, opdu, sizeof(opdu),
- &length);
+ &length, dev);
break;
case ATT_OP_READ_BY_TYPE_REQ:
status = read_by_type(ipdu, len, dev);
--
1.9.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
