Linux bluetooth development
 help / color / mirror / Atom feed
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH obexd 10/12 v3] gobex: fix not tracking received responses
Date: Fri, 11 Nov 2011 16:29:04 +0200	[thread overview]
Message-ID: <1321021746-5991-10-git-send-email-luiz.dentz@gmail.com> (raw)
In-Reply-To: <1321021746-5991-1-git-send-email-luiz.dentz@gmail.com>

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

obex->rx_last_op is only updated if there is no pending request which
means it only store last received request.
---
 gobex/gobex.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gobex/gobex.c b/gobex/gobex.c
index b0f3716..e2d9c6c 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -860,19 +860,20 @@ static gboolean incoming_data(GIOChannel *io, GIOCondition cond,
 	if (obex->rx_data < 3 || obex->rx_data < obex->rx_pkt_len)
 		return TRUE;
 
+	obex->rx_last_op = obex->rx_buf[0] & ~FINAL_BIT;
+
 	if (obex->pending_req) {
 		struct pending_pkt *p = obex->pending_req;
 		opcode = g_obex_packet_get_operation(p->pkt, NULL);
 		header_offset = rsp_header_offset(opcode);
 	} else {
-		opcode = obex->rx_buf[0] & ~FINAL_BIT;
+		opcode = obex->rx_last_op;
 		/* Unexpected response -- fail silently */
 		if (opcode > 0x1f && opcode < 0xff) {
 			obex->rx_data = 0;
 			return TRUE;
 		}
 		header_offset = req_header_offset(opcode);
-		obex->rx_last_op = opcode;
 	}
 
 	if (header_offset < 0) {
-- 
1.7.6.4


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

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-11 14:28 [PATCH obexd 01/12 v3] gobex: add unit test for CONNECT request Luiz Augusto von Dentz
2011-11-11 14:28 ` [PATCH obexd 02/12 v3] gobex: add unit test for CONNECT response Luiz Augusto von Dentz
2011-11-11 14:28 ` [PATCH obexd 03/12 v3] gobex: add unit test for CONNECT followed by GET request Luiz Augusto von Dentz
2011-11-11 14:28 ` [PATCH obexd 04/12 v3] gobex: add unit test for CONNECT followed by GET response Luiz Augusto von Dentz
2011-11-11 14:28 ` [PATCH obexd 05/12 v3] gobex: add unit test for CONNECT followed by PUT request Luiz Augusto von Dentz
2011-11-11 14:29 ` [PATCH obexd 06/12 v3] gobex: add unit test for CONNECT followed by PUT response Luiz Augusto von Dentz
2011-11-11 14:29 ` [PATCH obexd 07/12 v3] gobex: add unit test for CONNECT followed by GET wrong response Luiz Augusto von Dentz
2011-11-11 14:29 ` [PATCH obexd 08/12 v3] gobex: add unit test for CONNECT followed by PUT request with random data Luiz Augusto von Dentz
2011-11-11 14:29 ` [PATCH obexd 09/12 v3] gobex: fix checking connection id for ABORT Luiz Augusto von Dentz
2011-11-11 14:29 ` Luiz Augusto von Dentz [this message]
2011-11-11 14:29 ` [PATCH obexd 11/12 v3] gobex: fix sending Connection ID header in all requests Luiz Augusto von Dentz
2011-11-11 14:29 ` [PATCH obexd 12/12 v3] gobex: make connection id check less strict Luiz Augusto von Dentz
2011-11-12 18:23 ` [PATCH obexd 01/12 v3] gobex: add unit test for CONNECT request 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=1321021746-5991-10-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