From 42b2b55fb44b17ae61f33f694754ae0796f4c75c Mon Sep 17 00:00:00 2001 From: Radoslaw Jablonski Date: Tue, 9 Aug 2011 11:41:06 +0200 Subject: [PATCH] obexd: Use 'nice abort' when canceling outgoing OPP transfer Previously client was suddenly disconnecting to cancel outgoing OPP transfer. Now ABORT command will be sent before disconnecting with server in that scenario. This change is required to pass TC_CLIENT_OPH_BV_27_I PTS test case (not mandatory for qualification). --- obexd/gwobex/obex-xfer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/obexd/gwobex/obex-xfer.c b/obexd/gwobex/obex-xfer.c index 40136870b..3a2ada849 100644 --- a/obexd/gwobex/obex-xfer.c +++ b/obexd/gwobex/obex-xfer.c @@ -98,18 +98,10 @@ gboolean gw_obex_xfer_do_abort(struct gw_obex_xfer *xfer) { xfer->abort = TRUE; -#ifdef USE_NICE_ABORT debug("Performing nice abort\n"); if (OBEX_CancelRequest(xfer->ctx->handle, TRUE) != 0) return FALSE; return TRUE; -#else - debug("Performing abort through disconnection (without ABORT command)\n"); - xfer->ctx->done = TRUE; - OBEX_CancelRequest(xfer->ctx->handle, FALSE); - obex_link_error(xfer->ctx); - return FALSE; -#endif } GwObexXfer *gw_obex_put_async(GwObex *ctx, const char *name, const char *type, -- 2.47.3