From 821ad2ecd40fcfab5fd0bc06897d8b53d31deacd Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 18 Dec 2017 11:12:16 -0200 Subject: [PATCH] client: Rename set-name to name Make the command return the current value if no parameters: [bluetooth]# name blah [bluetooth]# name LocalName: blah --- client/advertising.c | 9 +++++++++ client/main.c | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/client/advertising.c b/client/advertising.c index 05c69102c..5e63f6dbb 100644 --- a/client/advertising.c +++ b/client/advertising.c @@ -619,6 +619,15 @@ void ad_advertise_name(DBusConnection *conn, bool value) void ad_advertise_local_name(DBusConnection *conn, const char *name) { + if (!name) { + if (ad.local_name) + bt_shell_printf("LocalName: %s\n", ad.local_name); + else + bt_shell_printf("Name: %s\n", ad.name ? "on" : "off"); + + return; + } + if (ad.local_name && !strcmp(name, ad.local_name)) return; diff --git a/client/main.c b/client/main.c index 195a86141..01a3c2131 100644 --- a/client/main.c +++ b/client/main.c @@ -2221,8 +2221,13 @@ static void cmd_advertise_tx_power(int argc, char *argv[]) ad_advertise_tx_power(dbus_conn, &powered); } -static void cmd_set_advertise_name(int argc, char *argv[]) +static void cmd_advertise_name(int argc, char *argv[]) { + if (argc < 2) { + ad_advertise_local_name(dbus_conn, NULL); + return; + } + if (strcmp(argv[1], "on") == 0 || strcmp(argv[1], "yes") == 0) { ad_advertise_name(dbus_conn, true); return; @@ -2302,7 +2307,7 @@ static const struct bt_shell_menu advertise_menu = { { "tx-power", "[on/off]", cmd_advertise_tx_power, "Enable/disable TX power to be advertised", mode_generator }, - { "set-name", "", cmd_set_advertise_name, + { "name", "[on/off/name]", cmd_advertise_name, "Enable/disable local name to be advertised" }, { "set-appearance", "", cmd_set_advertise_appearance, "Set custom appearance to be advertised" }, -- 2.47.3