From f576cae0fb07aa3246a89be9c5953d53ee59ec8a Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Sat, 18 Feb 2012 17:18:56 +0200 Subject: [PATCH] obexd: Fix queueing packet containing error while suspended Queueing the error won't remove the original packet created by transfer from the queue so upon resume gobex will attempt to send it again. To fix this we no longer create a error packet instead the session is market as aborted and the error stored so when gobex finally resumes the error is forward properly. --- obexd/src/obex-priv.h | 1 + obexd/src/obex.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/obexd/src/obex-priv.h b/obexd/src/obex-priv.h index 5b7294259..41854bcd9 100644 --- a/obexd/src/obex-priv.h +++ b/obexd/src/obex-priv.h @@ -43,6 +43,7 @@ struct obex_session { int64_t size; void *object; gboolean aborted; + int err; struct obex_service_driver *service; void *service_data; struct obex_server *server; diff --git a/obexd/src/obex.c b/obexd/src/obex.c index 05cc0685b..a028156a2 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -554,7 +554,7 @@ static gssize send_data(void *buf, gsize size, gpointer user_data) size); if (os->aborted) - return -EPERM; + return os->err < 0 ? os->err : -EPERM; return driver_read(os, buf, size); } @@ -594,7 +594,7 @@ static int driver_get_headers(struct obex_session *os) DBG("name=%s type=%s object=%p", os->name, os->type, os->object); if (os->aborted) - return -EPERM; + return os->err < 0 ? os->err : -EPERM; if (os->object == NULL) return -EIO; @@ -661,8 +661,10 @@ static gboolean handle_async_io(void *object, int flags, int err, return TRUE; done: - if (err < 0) - os_set_response(os, err); + if (err < 0) { + os->err = err; + os->aborted = TRUE; + } g_obex_resume(os->obex); -- 2.47.3