From 26ce1d484f62a82455c9b5ee09b8bdb62ad2e426 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Thu, 2 Feb 2012 13:57:06 -0800 Subject: [PATCH] gobex: tools: Fix test-client to use ERTM while on packet mode OBEX should only be used with ERTM over L2CAP and set MTU properly --- tools/obex-client-tool.c | 60 ++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/tools/obex-client-tool.c b/tools/obex-client-tool.c index 848400051..a28d43cad 100644 --- a/tools/obex-client-tool.c +++ b/tools/obex-client-tool.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; -- 2.47.3