Hi Jakub,
On Wed, Feb 4, 2015 at 10:30 AM, Jakub Tyszkowski <tyszja@xxxxxxxxx> wrote:
> Hi Lukasz,
>
> 2015-01-30 6:46 GMT+01:00 Lukasz Rymanowski <lukasz.rymanowski@xxxxxxxxx>:
>> With this patch GATT will correctly response with attribute not found if
>> there is no attributes matching.
>>
>> Issue found and fix tested on UPF50
>> ---
>> android/gatt.c | 7 ++++++-
>> 1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/android/gatt.c b/android/gatt.c
>> index 466c1ea..3b0b81d 100644
>> --- a/android/gatt.c
>> +++ b/android/gatt.c
>> @@ -6258,6 +6258,7 @@ struct find_by_type_request_data {
>> uint8_t *search_value;
>> size_t search_vlen;
>> uint8_t error;
>> + bool found;
>> };
>>
>> static void find_by_type_request_cb(struct gatt_db_attribute *attrib,
>> @@ -6289,6 +6290,9 @@ static void find_by_type_request_cb(struct gatt_db_attribute *attrib,
>> find_data->search_vlen);
>>
>> queue_push_tail(find_data->device->pending_requests, request_data);
>> +
>> + if (!find_data->found)
>> + find_data->found = true;
>> }
>>
>> static uint8_t find_by_type_request(const uint8_t *cmd, uint16_t cmd_len,
>> @@ -6315,11 +6319,12 @@ static uint8_t find_by_type_request(const uint8_t *cmd, uint16_t cmd_len,
>> data.search_vlen = search_vlen;
>> data.search_value = search_value;
>> data.device = device;
>> + data.found = false;
>>
>> gatt_db_find_by_type(gatt_db, start, end, &uuid,
>> find_by_type_request_cb, &data);
>>
>> - if (data.error == ATT_ECODE_ATTR_NOT_FOUND) {
>> + if (!data.found) {
>> size_t mtu;
>> uint8_t *rsp = g_attrib_get_buffer(device->attrib, &mtu);
>>
>> --
>> 1.8.4
>>
>> --
>> 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
>
>
> Maybe this issue can be solved like this:
>
> @@ -6274,17 +6274,9 @@ static uint8_t find_by_type_request(const
> uint8_t *cmd, uint16_t cmd_len,
> gatt_db_find_by_type(gatt_db, start, end, &uuid,
> find_by_type_request_cb, &data);
>
> - if (data.error == ATT_ECODE_ATTR_NOT_FOUND) {
> - size_t mtu;
> - uint8_t *rsp = g_attrib_get_buffer(device->attrib, &mtu);
> -
> - len = enc_error_resp(ATT_OP_FIND_BY_TYPE_REQ, start,
> - ATT_ECODE_ATTR_NOT_FOUND, rsp, mtu);
> - g_attrib_send(device->attrib, 0, rsp, len, NULL, NULL, NULL);
> - return 0;
> - }
> -
> - if (!data.error)
> + if (queue_isempty(device->pending_requests))
> + data.error = ATT_ECODE_ATTR_NOT_FOUND;
> + else
> process_dev_pending_requests(device, ATT_OP_FIND_BY_TYPE_REQ);
>
> return data.error;
>
>
I considered that but this is still not a clear solution for me.
I think rather to make gatt_db_find_by_type() return number of found attributes.
\Lukasz
> Regards,
> Jakub Tyszkowski
> --
> 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
--
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
