Re: [PATCH 4/4] shared/gatt-server: Cancel remaining write exec on error in the middle

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Grzegorz,

On Tue, Nov 17, 2015 at 10:57 AM, Grzegorz Kolodziejczyk
<grzegorz.kolodziejczyk@xxxxxxxxx> wrote:
> Hi Lukasz,
>
> On 16 November 2015 at 22:08, Łukasz Rymanowski
> <lukasz.rymanowski@xxxxxxxxxxx> wrote:
>> If one execute write fail, server sends error response to the client.
>> All characteristics before the failing one has been written and we cannot
>> do anything about that. All the following characteristics will be
>> canceled with this patch.
>>
>> According to the spec BT Core 4.2, Vol.3, Part F, chapter 3.4.6.3.
>> in case of error, state of attributes is not defined, which makes
>> this behavior ok.
>> ---
>>  src/shared/gatt-server.c | 22 +++++++++++++++++++++-
>>  1 file changed, 21 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/shared/gatt-server.c b/src/shared/gatt-server.c
>> index 931d619..3cd5190 100644
>> --- a/src/shared/gatt-server.c
>> +++ b/src/shared/gatt-server.c
>> @@ -1158,6 +1158,22 @@ error:
>>
>>  }
>>
>> +static void exec_write_cancel(void *data, void *user_data)
>> +{
>> +       uint16_t handle = PTR_TO_UINT(data);
>> +       struct bt_gatt_server *server = user_data;
>> +       struct gatt_db_attribute *attr;
>> +       uint8_t cancel = 0;
>> +
>> +       attr = gatt_db_get_attribute(server->db, PTR_TO_UINT(handle));
>> +       if (!attr) {
>> +               return;
>> +       }
> No brackets.
I knew that I will forgot about that after my last project :) thanks

>> +
>> +       gatt_db_attribute_write(attr, 0, &cancel , 1, BT_ATT_OP_EXEC_WRITE_REQ,
> Shouldn't be len - sizeof value ? instead of "1" ?

Ok, will fix

>> +                                               server->att, NULL, NULL);
>> +}
>> +
>>  static void exec_next_write(struct bt_gatt_server *server);
>>
>>  static void exec_write_complete_cb(struct gatt_db_attribute *attr, int err,
>> @@ -1167,6 +1183,7 @@ static void exec_write_complete_cb(struct gatt_db_attribute *attr, int err,
>>         uint16_t handle = gatt_db_attribute_get_handle(attr);
>>
>>         if (err) {
>> +               queue_foreach(server->exec_queue, exec_write_cancel, server);
>>                 queue_remove_all(server->exec_queue, NULL, NULL, NULL);
>>                 bt_att_send_error_rsp(server->att, BT_ATT_OP_EXEC_WRITE_REQ,
>>                                                                 handle, err);
>> @@ -1178,6 +1195,7 @@ static void exec_write_complete_cb(struct gatt_db_attribute *attr, int err,
>>  static void exec_next_write(struct bt_gatt_server *server)
>>  {
>>         uint16_t *handle;
>> +       uint8_t execute = 1;
>>         struct gatt_db_attribute *attr;
>>         bool status;
>>         int err;
>> @@ -1194,7 +1212,7 @@ static void exec_next_write(struct bt_gatt_server *server)
>>                 goto error;
>>         }
>>
>> -       status = gatt_db_attribute_write(attr, 0, NULL , 0,
>> +       status = gatt_db_attribute_write(attr, 0, &execute , 1,
> ditto (sizeof)
OK
>>                                                 BT_ATT_OP_EXEC_WRITE_REQ,
>>                                                 server->att,
>>                                                 exec_write_complete_cb, server);
>> @@ -1204,6 +1222,8 @@ static void exec_next_write(struct bt_gatt_server *server)
>>         err = BT_ATT_ERROR_UNLIKELY;
>>
>>  error:
>> +
>> +       queue_foreach(server->exec_queue, exec_write_cancel, server);
>>         queue_remove_all(server->exec_queue, NULL, NULL, NULL);
>>         bt_att_send_error_rsp(server->att, BT_ATT_OP_EXEC_WRITE_REQ,
>>                                                 PTR_TO_UINT(handle), err);
>> --
>> 2.5.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
>
> BR,
> Grzegorz


-- 
BR / Pozdrawiam
Łukasz
--
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



[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux