linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH obexd 7/9] gobex: fix checking connection id for ABORT
Date: Thu, 10 Nov 2011 16:43:56 +0200	[thread overview]
Message-ID: <1320936238-28360-7-git-send-email-luiz.dentz@gmail.com> (raw)
In-Reply-To: <1320936238-28360-1-git-send-email-luiz.dentz@gmail.com>

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

OBEX spec state that it is optional to send a Connection Id header in an
OBEX ABORT operation.

Reported by Hendrik Sattler <post@hendrik-sattler.de>
---
 gobex/gobex.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gobex/gobex.c b/gobex/gobex.c
index 86e1c4a..b0f3716 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -705,9 +705,16 @@ static void handle_request(GObex *obex, GObexPacket *req)
 
 	op = g_obex_packet_get_operation(req, NULL);
 
-	if (op == G_OBEX_OP_CONNECT)
+	switch (op) {
+	case G_OBEX_OP_CONNECT:
 		parse_connect_data(obex, req);
-	else if (check_connid(obex, req) == FALSE) {
+		break;
+	case G_OBEX_OP_ABORT:
+		break;
+	default:
+		if (check_connid(obex, req))
+			break;
+
 		g_obex_debug(G_OBEX_DEBUG_ERROR, "Invalid Connection ID");
 		g_obex_send_rsp(obex, G_OBEX_RSP_SERVICE_UNAVAILABLE, NULL,
 							G_OBEX_HDR_INVALID);
-- 
1.7.6.4


  parent reply	other threads:[~2011-11-10 14:43 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-10 14:43 [PATCH obexd 1/9] gobex: add unit test for CONNECT request Luiz Augusto von Dentz
2011-11-10 14:43 ` [PATCH obexd 2/9] gobex: add unit test for CONNECT response Luiz Augusto von Dentz
2011-11-10 14:43 ` [PATCH obexd 3/9] gobex: add unit test for CONNECT followed by GET request Luiz Augusto von Dentz
2011-11-10 15:02   ` Hendrik Sattler
2011-11-11  9:00     ` Luiz Augusto von Dentz
2011-11-10 14:43 ` [PATCH obexd 4/9] gobex: add unit test for CONNECT followed by GET response Luiz Augusto von Dentz
2011-11-10 14:43 ` [PATCH obexd 5/9] gobex: add unit test for CONNECT followed by PUT request Luiz Augusto von Dentz
2011-11-10 14:43 ` [PATCH obexd 6/9] gobex: add unit test for CONNECT followed by PUT response Luiz Augusto von Dentz
2011-11-10 15:25   ` Hendrik Sattler
2011-11-11  9:04     ` Luiz Augusto von Dentz
2011-11-10 14:43 ` Luiz Augusto von Dentz [this message]
2011-11-10 14:43 ` [PATCH obexd 8/9] gobex: fix sending Connection ID header in all requests Luiz Augusto von Dentz
2011-11-10 14:43 ` [PATCH obexd 9/9] gobex: make connection id check less strict Luiz Augusto von Dentz
2011-11-10 15:08 ` [PATCH obexd 1/9] gobex: add unit test for CONNECT request Hendrik Sattler
2011-11-11  9:00   ` Luiz Augusto von Dentz

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=1320936238-28360-7-git-send-email-luiz.dentz@gmail.com \
    --to=luiz.dentz@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /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).