Since 5d7d3ac25bd56684f4f8c7378b3ec2db0b0ce1ae obexd supports to connect
the session using a L2CAP PSM.
---
tools/obexctl.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/tools/obexctl.c b/tools/obexctl.c
index 56a76915c..3dfb72856 100644
--- a/tools/obexctl.c
+++ b/tools/obexctl.c
@@ -114,7 +114,7 @@ static void connect_reply(DBusMessage *message, void *user_data)
struct connect_args {
char *dev;
char *target;
- uint8_t channel;
+ uint16_t channel;
};
static void connect_args_free(void *data)
@@ -144,9 +144,14 @@ static void connect_setup(DBusMessageIter *iter, void *user_data)
g_dbus_dict_append_entry(&dict, "Target",
DBUS_TYPE_STRING, &args->target);
- if (args->channel)
- g_dbus_dict_append_entry(&dict, "Channel",
- DBUS_TYPE_BYTE, &args->channel);
+ if (args->channel) {
+ if (args->channel > 31)
+ g_dbus_dict_append_entry(&dict, "PSM",
+ DBUS_TYPE_UINT16, &args->channel);
+ else
+ g_dbus_dict_append_entry(&dict, "Channel",
+ DBUS_TYPE_BYTE, &args->channel);
+ }
dbus_message_iter_close_container(iter, &dict);
}
@@ -169,8 +174,8 @@ static void cmd_connect(int argc, char *argv[])
char *endptr = NULL;
channel = strtol(argv[3], &endptr, 0);
- if (!endptr || *endptr != '\0' || channel > UINT8_MAX) {
- bt_shell_printf("Invalid channel\n");
+ if (!endptr || *endptr != '\0' || channel > UINT16_MAX) {
+ bt_shell_printf("Invalid channel or PSM\n");
return bt_shell_noninteractive_quit(EXIT_FAILURE);
}
}
@@ -1846,7 +1851,7 @@ static void cmd_mkdir(int argc, char *argv[])
static const struct bt_shell_menu main_menu = {
.name = "main",
.entries = {
- { "connect", "<dev> [uuid] [channel]", cmd_connect,
+ { "connect", "<dev> [uuid] [channel|PSM]", cmd_connect,
"Connect session" },
{ "disconnect", "[session]", cmd_disconnect, "Disconnect session",
session_generator },
--
2.34.1
