michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: GATT: Fix bt_gatt_foreach_attr_type

Browse source 
Number of matches was not being properly handled causing the callback to
be called more than specified by the caller.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2019-06-10 11:37:39 +03:00 • committed by Johan Hedberg
commit e8d9609c36
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
subsys/bluetooth/host/gatt.c
View file

@ -999,6 +999,8 @@ static u8_t gatt_foreach_iter(const struct bt_gatt_attr *attr,
const void *attr_data, uint16_t *num_matches,
bt_gatt_attr_func_t func, void *user_data)
{
u8_t result;
/* Stop if over the requested range */
if (attr->handle > end_handle) {
return BT_GATT_ITER_STOP;
@ -1019,11 +1021,15 @@ static u8_t gatt_foreach_iter(const struct bt_gatt_attr *attr,
return BT_GATT_ITER_CONTINUE;
}
if (*num_matches) {
*num_matches -= 1;
*num_matches -= 1;
result = func(attr, user_data);
if (!*num_matches) {
return BT_GATT_ITER_STOP;
}
return func(attr, user_data);
return result;
}
void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
@ -1066,11 +1072,6 @@ void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
return;
}
}
/* Stop if number of matches has reached 0 */
if (!num_matches) {
return;
}
}
}
@ -1095,11 +1096,6 @@ void bt_gatt_foreach_attr_type(u16_t start_handle, u16_t end_handle,
return;
}
}
/* Stop if number of matches has reached 0 */
if (!num_matches) {
return;
}
}
}