Re: [PATCH obexd] client: Fix ABORT command not sending when user cancels the transfer

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

 



Hi Jaganath,

Issue: When user cancels the tranfer, after queuing the ABORT command
transfer->callback() with error will be called. In that session_unref
is called which disconnects the transport.

Fix: Just send ABORT command during abort and transfer->callback()
will be called after getting response of ABORT command.
---
  client/transfer.c      |   12 ------------
  gobex/gobex-transfer.c |    6 +++++-
  2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/client/transfer.c b/client/transfer.c
index 157811d..88e8ef7 100644
--- a/client/transfer.c
+++ b/client/transfer.c
@@ -141,23 +141,11 @@ static DBusMessage *obc_transfer_get_properties(DBusConnection *connection,

  static void obc_transfer_abort(struct obc_transfer *transfer)
  {
-	struct transfer_callback *callback = transfer->callback;
-
  	if (transfer->xfer == 0)
  		return;

  	g_obex_cancel_transfer(transfer->xfer);
  	transfer->xfer = 0;
-
-	if (callback) {
-		GError *err;
-
-		err = g_error_new(OBC_TRANSFER_ERROR, -ECANCELED, "%s",
-							strerror(ECANCELED));
-		callback->func(transfer, transfer->transferred, err,
-							callback->data);
-		g_error_free(err);
-	}
  }


I think this callback is needed here, particularly for transfers that are queued but have not been started yet. This does not work right now but I was planning to propose a patch series to fix it soon. Also, IMO it seems fair to report the abortion as soon as possible to the upper layers, no matter what the response will be.

Having said that, I agree that transfer canceling is broken right now.

Cheers,
Mikel

--
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