From 20d8a4eb4f1e78c1d27f640385ba0936dc880ef1 Mon Sep 17 00:00:00 2001 From: Jaganath Kanakkassery Date: Wed, 11 Jan 2012 20:34:08 +0530 Subject: [PATCH] obexd: Reset obex session in transfer_complete() This fix solves the following issues in multiple file push. Agent authorize is happening only for first file. Transfer_completed signal is getting called only after last push Incorrect value is sent for "total" and "transfered" signal from second file onwards. --- obexd/src/obex.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/obexd/src/obex.c b/obexd/src/obex.c index baa5904da..5b580d3f9 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -265,6 +265,7 @@ static void os_reset_session(struct obex_session *os) os->offset = 0; os->size = OBJECT_SIZE_DELETE; os->headers_sent = FALSE; + os->checked = FALSE; } static void obex_session_free(struct obex_session *os) @@ -562,7 +563,7 @@ static void transfer_complete(GObex *obex, GError *err, gpointer user_data) if (err != NULL) { error("transfer failed: %s\n", err->message); - return; + goto reset; } if (os->object && os->driver && os->driver->flush) { @@ -570,8 +571,12 @@ static void transfer_complete(GObex *obex, GError *err, gpointer user_data) g_obex_suspend(os->obex); os->driver->set_io_watch(os->object, handle_async_io, os); + return; } } + +reset: + os_reset_session(os); } static int driver_get_headers(struct obex_session *os) -- 2.47.3