From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>
Subject: [PATCH obexd v4 2/6] client: fix unreported error case
Date: Fri, 17 Feb 2012 13:55:32 +0100 [thread overview]
Message-ID: <1329483336-25853-3-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1329483336-25853-1-git-send-email-mikel.astiz.oss@gmail.com>
From: Mikel Astiz <mikel.astiz@bmw-carit.de>
The authorization request of a queued transfer could fail, and this
needs to be reported to the transfer initiator. Otherwise it would
likely result in D-Bus timeouts.
---
client/session.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/client/session.c b/client/session.c
index 28516b2..85f466a 100644
--- a/client/session.c
+++ b/client/session.c
@@ -735,17 +735,30 @@ static void session_process_queue(struct obc_session *session)
if (session->queue == NULL || g_queue_is_empty(session->queue))
return;
+ obc_session_ref(session);
+
while ((p = g_queue_pop_head(session->queue))) {
int err;
err = pending_request_auth(p);
if (err == 0) {
session->p = p;
- return;
+ break;
+ }
+
+ if (p->func) {
+ GError *gerr = NULL;
+
+ g_set_error(&gerr, OBEX_IO_ERROR, err,
+ "Authorization failed");
+ p->func(session, gerr, p->data);
+ g_error_free(gerr);
}
pending_request_free(p);
}
+
+ obc_session_unref(session);
}
static void session_terminate_transfer(struct obc_session *session,
--
1.7.6.5
next prev parent reply other threads:[~2012-02-17 12:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-17 12:55 [PATCH obexd v4 0/6] Several minor fixes Mikel Astiz
2012-02-17 12:55 ` [PATCH obexd v4 1/6] client: fix memory leak in obc_session_put Mikel Astiz
2012-02-17 12:55 ` Mikel Astiz [this message]
2012-02-17 12:55 ` [PATCH obexd v4 3/6] client: fix incorrect error check Mikel Astiz
2012-02-17 12:55 ` [PATCH obexd v4 4/6] client: fix pbap select when same path given twice Mikel Astiz
2012-02-17 12:55 ` [PATCH obexd v4 5/6] client: queue transfers in ftp sessions Mikel Astiz
2012-02-17 12:55 ` [PATCH obexd v4 6/6] client: queue transfers in pbap sessions Mikel Astiz
2012-02-17 14:27 ` [PATCH obexd v4 0/6] Several minor fixes Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329483336-25853-3-git-send-email-mikel.astiz.oss@gmail.com \
--to=mikel.astiz.oss@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mikel.astiz@bmw-carit.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).