Re: [PATCH obexd v2 7/8] client: fix canceling queued transfers
flat view
From: Jaganath <hidden>
Date: 2012-02-22 11:59:02
Hi Mikel. -------------------------------------------------- From: "Jaganath" <redacted> Sent: Wednesday, February 22, 2012 5:11 PM To: "Mikel Astiz" <redacted>; <redacted> Cc: "Mikel Astiz" <redacted> Subject: Re: [PATCH obexd v2 7/8] client: fix canceling queued transfers
Hi Mikel, -------------------------------------------------- From: "Mikel Astiz" <redacted> Sent: Tuesday, February 21, 2012 7:27 PM To: <redacted> Cc: "Mikel Astiz" <redacted> Subject: [PATCH obexd v2 7/8] client: fix canceling queued transfersquoted
From: Mikel Astiz <redacted> The Cancel() method in the D-Bus api should also abort queued transfers, which should just be removed from the queue. --- client/transfer.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)diff --git a/client/transfer.c b/client/transfer.c index b470a3a..dea9a2a 100644 --- a/client/transfer.c +++ b/client/transfer.c@@ -143,11 +143,15 @@ static void obc_transfer_abort(struct obc_transfer *transfer){ struct transfer_callback *callback = transfer->callback; - if (transfer->xfer == 0) - return; + if (transfer->xfer != 0) { + g_obex_cancel_transfer(transfer->xfer); + transfer->xfer = 0; + } - g_obex_cancel_transfer(transfer->xfer); - transfer->xfer = 0; + if (transfer->obex != NULL) { + g_obex_unref(transfer->obex); + transfer->obex = NULL; + }If transfer->obex is unrefed here then the queued ABORT packet will not be sent. This will create problem with PTS which requires ABORT command before transport disconnection
Sorry. I think my comment is invalid since refcount will not be zero in this case.
quoted
if (callback) { GError *err; -- 1.7.6.5 --
Regards Jaganath
quoted
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@vger.kernel.org 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html