2012-02-28 12:56:21

by Mikel Astiz

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

From: Mikel Astiz <[email protected]>

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

2012-03-01 01:47:04

by Johan Hedberg

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

Hi Mikel,

On Tue, Feb 28, 2012, Mikel Astiz wrote:
> 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(-)

Both patches have been applied. Thanks.

Johan

2012-02-28 13:06:41

by Luiz Augusto von Dentz

Subject: Re: [PATCH obexd v2 2/2] client: free active transfer on session shutdown

Hi Mikel,

On Tue, Feb 28, 2012 at 2:56 PM, Mikel Astiz <[email protected]> wrote:
> From: Mikel Astiz <[email protected]>
>
> 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

Ack.

--
Luiz Augusto von Dentz

2012-02-28 13:05:56

by Luiz Augusto von Dentz

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

Hi Mikel,

On Tue, Feb 28, 2012 at 2:56 PM, Mikel Astiz <[email protected]> wrote:
> From: Mikel Astiz <[email protected]>
>
> 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

Ack

--
Luiz Augusto von Dentz

2012-02-28 12:56:22

by Mikel Astiz

Subject: [PATCH obexd v2 2/2] client: free active transfer on session shutdown

From: Mikel Astiz <[email protected]>

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