mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-29 22:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

att_db: rework handle_read_by_type_request2

Browse Source
This commit is contained in:
Matthias Ringwald 2020-04-09 12:19:32 +02:00
parent d7f1c72e38
commit 3b9a211c60
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ble/att_db.c
View File

@ -554,21 +554,17 @@ static uint16_t handle_read_by_type_request2(att_connection_t * att_connection,
uint8_t error_code = 0;
uint16_t first_matching_but_unreadable_handle = 0;
#ifdef ENABLE_ATT_DELAYED_RESPONSE
bool read_request_pending = false;
#endif
while (att_iterator_has_next(&it)){
att_iterator_fetch_next(&it);
if (!it.handle) break;
if ((it.handle == 0 ) || (it.handle > end_handle)) break;
if (it.handle < start_handle) continue;
if (it.handle > end_handle) break; // (1)
// does current attribute match
if (!att_iterator_match_uuid(&it, attribute_type, attribute_type_len)) continue;
// skip handles that cannot be read but rembember that there has been at least one
// skip handles that cannot be read but remember that there has been at least one
if ((it.flags & ATT_PROPERTY_READ) == 0) {
if (first_matching_but_unreadable_handle == 0) {
first_matching_but_unreadable_handle = it.handle;
@ -584,17 +580,14 @@ static uint16_t handle_read_by_type_request2(att_connection_t * att_connection,
#ifdef ENABLE_ATT_DELAYED_RESPONSE
if (it.value_len == ATT_READ_RESPONSE_PENDING){
read_request_pending = true;
return ATT_READ_RESPONSE_PENDING;
}
if (read_request_pending) continue;
#endif
// check if value has same len as last one
uint16_t this_pair_len = 2 + it.value_len;
if (offset > 1){
if (pair_len != this_pair_len) {
break;
}
if ((offset > 1) && (pair_len != this_pair_len)) {
break;
}
// first
@ -617,10 +610,6 @@ static uint16_t handle_read_by_type_request2(att_connection_t * att_connection,
uint16_t bytes_copied = att_copy_value(&it, 0, response_buffer + offset, it.value_len, att_connection->con_handle);
offset += bytes_copied;
}
#ifdef ENABLE_ATT_DELAYED_RESPONSE
if (read_request_pending) return ATT_READ_RESPONSE_PENDING;
#endif
// at least one attribute could be read
if (offset > 1){