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 11/12 v3] gobex: fix sending Connection ID header in all requests
Date: Fri, 11 Nov 2011 16:29:05 +0200	[thread overview]
Message-ID: <1321021746-5991-11-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>

According to both OBEX and GOEP specs Connection ID should only be
included in the first packet of a request.
---
 client/transfer.c |    1 -
 gobex/gobex.c     |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/client/transfer.c b/client/transfer.c
index b6994d1..7db20f6 100644
--- a/client/transfer.c
+++ b/client/transfer.c
@@ -377,7 +377,6 @@ static void get_buf_xfer_progress(GObex *obex, GError *err, GObexPacket *rsp,
 
 	transfer->xfer = g_obex_send_req(obex, req, -1, get_buf_xfer_progress,
 							transfer, &err);
-
 	if (callback)
 		callback->func(transfer, transfer->transferred, err,
 							callback->data);
diff --git a/gobex/gobex.c b/gobex/gobex.c
index e2d9c6c..8a23485 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -410,6 +410,9 @@ guint g_obex_send_req(GObex *obex, GObexPacket *req, gint timeout,
 	if (obex->conn_id == CONNID_INVALID)
 		goto create_pending;
 
+	if (obex->rx_last_op == G_OBEX_RSP_CONTINUE)
+		goto create_pending;
+
 	connid = g_obex_packet_get_header(req, G_OBEX_HDR_CONNECTION);
 	if (connid != NULL)
 		goto create_pending;
-- 
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 ` [PATCH obexd 10/12 v3] gobex: fix not tracking received responses Luiz Augusto von Dentz
2011-11-11 14:29 ` Luiz Augusto von Dentz [this message]
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-11-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