[PATCH obexd v2 1/2] client: fix unreported canceled transfers

From: Mikel Astiz <redacted>

A session can be shut down from D-Bus, and therefore the pending
transfer callbacks must be reported.
---
 client/session.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/client/session.c b/client/session.c
index 417295e..c4645fb 100644
--- a/client/session.c
+++ b/client/session.c

@@ -485,12 +485,25 @@ proceed:

 void obc_session_shutdown(struct obc_session *session)
 {
+       struct pending_request *p;
+       GError *err;
+
       DBG("%p", session);

       obc_session_ref(session);

       /* Unregister any pending transfer */
-       g_queue_foreach(session->queue, (GFunc) pending_request_free, NULL);
+       err = g_error_new(OBEX_IO_ERROR, OBEX_IO_DISCONNECTED,
+                                               "Session closed by user");
+
+       while ((p = g_queue_pop_head(session->queue))) {
+               if (p->func)
+                       p->func(session, err, p->data);
+
+               pending_request_free(p);
+       }
+
+       g_error_free(err);

       /* Unregister interfaces */
       if (session->path)
--
1.7.6.5

From: Mikel Astiz <redacted>

The currently active request should be canceled just like any other
queued transfer. Otherwise obex timeout is reported.
---
 client/session.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/client/session.c b/client/session.c
index c4645fb..42eba10 100644
--- a/client/session.c
+++ b/client/session.c

@@ -496,6 +496,14 @@ void obc_session_shutdown(struct obc_session *session)

       err = g_error_new(OBEX_IO_ERROR, OBEX_IO_DISCONNECTED,
                                               "Session closed by user");

+       if (session->p != NULL) {
+               if (session->p->func)
+                       session->p->func(session, err, session->p->data);
+
+               pending_request_free(session->p);
+               session->p = NULL;
+       }
+
       while ((p = g_queue_pop_head(session->queue))) {
               if (p->func)
                       p->func(session, err, p->data);
--
1.7.6.5