[PATCHv2 obexd] Use 'nice abort' when canceling outgoing OPP transer

Subsystems: the rest

2 messages, 2 authors, 2011-08-09 · open the first message on its own page

[PATCHv2 obexd] Use 'nice abort' when canceling outgoing OPP transer

From: Radoslaw Jablonski <hidden>
Date: 2011-08-09 09:41:06

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).
---
 gwobex/obex-xfer.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/gwobex/obex-xfer.c b/gwobex/obex-xfer.c
index 4013687..3a2ada8 100644
--- a/gwobex/obex-xfer.c
+++ b/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,
-- 
1.7.0.4

Re: [PATCHv2 obexd] Use 'nice abort' when canceling outgoing OPP transer

From: Johan Hedberg <hidden>
Date: 2011-08-09 10:01:48

Hi Radek,

On Tue, Aug 09, 2011, Radoslaw Jablonski wrote:
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).
---
 gwobex/obex-xfer.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
Applied. Thanks.

Johan
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help