Hi Arman,
On Tue, Oct 21, 2014 at 12:00 AM, Arman Uguray <armansito@xxxxxxxxxxxx> wrote:
> bt_att_cancel and bt_att_cancel_all no longer destroy any pending
> request or indication, since this would cause a later bt_att_send to
> erroneously send out a request or indication before a
> response/confirmation for a pending one is received. Instead, they now
> keep the pending operations but clear their response and destroy
> callbacks since the upper layer is no longer interested in them.
> ---
> src/shared/att.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/src/shared/att.c b/src/shared/att.c
> index 503e06c..c70d396 100644
> --- a/src/shared/att.c
> +++ b/src/shared/att.c
> @@ -1029,15 +1029,17 @@ bool bt_att_cancel(struct bt_att *att, unsigned int id)
> return false;
>
> if (att->pending_req && att->pending_req->id == id) {
> - op = att->pending_req;
> - att->pending_req = NULL;
> - goto done;
> + /* Don't cancel the pending request; remove it's handlers */
> + att->pending_req->callback = NULL;
> + att->pending_req->destroy = NULL;
> + return true;
> }
>
> if (att->pending_ind && att->pending_ind->id == id) {
> - op = att->pending_ind;
> - att->pending_ind = NULL;
> - goto done;
> + /* Don't cancel the pending indication; remove it's handlers */
> + att->pending_ind->callback = NULL;
> + att->pending_ind->destroy = NULL;
> + return true;
> }
>
> op = queue_remove_if(att->req_queue, match_op_id, UINT_TO_PTR(id));
> @@ -1073,13 +1075,15 @@ bool bt_att_cancel_all(struct bt_att *att)
> queue_remove_all(att->write_queue, NULL, NULL, destroy_att_send_op);
>
> if (att->pending_req) {
> - destroy_att_send_op(att->pending_req);
> - att->pending_req = NULL;
> + /* Don't cancel the pending request; remove it's handlers */
> + att->pending_req->callback = NULL;
> + att->pending_req->destroy = NULL;
> }
>
> if (att->pending_ind) {
> - destroy_att_send_op(att->pending_ind);
> - att->pending_ind = NULL;
> + /* Don't cancel the pending indication; remove it's handlers */
> + att->pending_ind->callback = NULL;
> + att->pending_ind->destroy = NULL;
> }
>
> return true;
> --
> 2.1.0.rc2.206.gedb03e5
I would like to first finish with Marcin's patches, are you okay with
v5? Btw, please make sure you follow the HACKING document when
submitting patches so we can be consistent from now on.
--
Luiz Augusto von Dentz
--
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
