Multiple prepare writes may be done for multiple attributes. Queue
mechanism must be aware of handle under which preparation is done.
---
src/shared/gatt-server.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/shared/gatt-server.c b/src/shared/gatt-server.c
index 4b554f665..d1efa83a1 100644
--- a/src/shared/gatt-server.c
+++ b/src/shared/gatt-server.c
@@ -1190,6 +1190,14 @@ static bool prep_data_new(struct bt_gatt_server *server,
return true;
}
+static bool match_prep_attr_handle(const void *data, const void *match_data)
+{
+ const struct prep_write_data *prep_data = data;
+ const uint16_t *match_handle = match_data;
+
+ return prep_data->handle == *match_handle;
+}
+
static bool store_prep_data(struct bt_gatt_server *server,
uint16_t handle, uint16_t offset,
uint16_t length, uint8_t *value)
@@ -1200,9 +1208,10 @@ static bool store_prep_data(struct bt_gatt_server *server,
* Now lets check if prep write is a continuation of long write
* If so do aggregation of data
*/
- prep_data = queue_peek_tail(server->prep_queue);
- if (prep_data && (prep_data->handle == handle) &&
- (offset == (prep_data->length + prep_data->offset)))
+ prep_data = queue_find(server->prep_queue, match_prep_attr_handle,
+ &handle);
+
+ if (prep_data && (offset == (prep_data->length + prep_data->offset)))
return append_prep_data(prep_data, handle, length, value);
return prep_data_new(server, handle, offset, length, value);
--
2.13.6
--
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
