From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH obexd 2/3] tools: Fix test-client to use ERTM while on packet mode
Date: Thu, 2 Feb 2012 13:57:06 -0800 [thread overview]
Message-ID: <1328219827-2611-2-git-send-email-luiz.dentz@gmail.com> (raw)
In-Reply-To: <1328219827-2611-1-git-send-email-luiz.dentz@gmail.com>
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
OBEX should only be used with ERTM over L2CAP and set MTU properly
---
tools/test-client.c | 60 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/tools/test-client.c b/tools/test-client.c
index 8484000..a28d43c 100644
--- a/tools/test-client.c
+++ b/tools/test-client.c
@@ -362,21 +362,51 @@ static GIOChannel *bluetooth_connect(GObexTransportType transport)
option = BT_IO_OPT_CHANNEL;
}
- if (option_source)
- io = bt_io_connect(type, conn_callback, GUINT_TO_POINTER(transport),
- NULL, &err,
- BT_IO_OPT_SOURCE, option_source,
- BT_IO_OPT_DEST, option_dest,
- option, option_channel,
- BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
- BT_IO_OPT_INVALID);
- else
- io = bt_io_connect(type, conn_callback, GUINT_TO_POINTER(transport),
- NULL, &err,
- BT_IO_OPT_DEST, option_dest,
- option, option_channel,
- BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
- BT_IO_OPT_INVALID);
+ if (option_source) {
+ if (type == BT_IO_L2CAP) {
+ io = bt_io_connect(type, conn_callback,
+ GUINT_TO_POINTER(transport),
+ NULL, &err,
+ BT_IO_OPT_SOURCE, option_source,
+ BT_IO_OPT_DEST, option_dest,
+ option, option_channel,
+ BT_IO_OPT_MODE, BT_IO_MODE_ERTM,
+ BT_IO_OPT_OMTU, option_omtu,
+ BT_IO_OPT_IMTU, option_imtu,
+ BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
+ BT_IO_OPT_INVALID);
+ } else {
+ io = bt_io_connect(type, conn_callback,
+ GUINT_TO_POINTER(transport),
+ NULL, &err,
+ BT_IO_OPT_SOURCE, option_source,
+ BT_IO_OPT_DEST, option_dest,
+ option, option_channel,
+ BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
+ BT_IO_OPT_INVALID);
+ }
+ } else {
+ if (type == BT_IO_L2CAP) {
+ io = bt_io_connect(type, conn_callback,
+ GUINT_TO_POINTER(transport),
+ NULL, &err,
+ BT_IO_OPT_DEST, option_dest,
+ option, option_channel,
+ BT_IO_OPT_MODE, BT_IO_MODE_ERTM,
+ BT_IO_OPT_OMTU, option_omtu,
+ BT_IO_OPT_IMTU, option_imtu,
+ BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
+ BT_IO_OPT_INVALID);
+ } else {
+ io = bt_io_connect(type, conn_callback,
+ GUINT_TO_POINTER(transport),
+ NULL, &err,
+ BT_IO_OPT_DEST, option_dest,
+ option, option_channel,
+ BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW,
+ BT_IO_OPT_INVALID);
+ }
+ }
if (io != NULL)
return io;
--
1.7.7.6
next prev parent reply other threads:[~2012-02-02 21:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 21:57 [PATCH obexd 1/3] btio: Add BtIOMode enum to be used with BT_IO_OPT_MODE Luiz Augusto von Dentz
2012-02-02 21:57 ` Luiz Augusto von Dentz [this message]
2012-02-02 21:57 ` [PATCH obexd 3/3] tools: Fix test-server to use ERTM while on packet mode Luiz Augusto von Dentz
2012-02-02 23:58 ` [PATCH obexd 1/3] btio: Add BtIOMode enum to be used with BT_IO_OPT_MODE 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=1328219827-2611-2-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).