Thread (5 messages) 5 messages, 3 authors, 2012-03-01

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

flat view
STALE5345d

From: Mikel Astiz <hidden>
Date: 2012-02-28 12:56:22
Subsystem: the rest · Maintainer: Linus Torvalds

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help