* [PATCH 1/6] Add color modifiers to NEW, CHG and DEL events.
2013-03-14 18:22 [PATCH 0/6] bluetoothctl: agent's implementation Alex Deymo
@ 2013-03-14 18:22 ` Alex Deymo
2013-03-14 18:22 ` [PATCH 2/6] Right prompt management on agent input Alex Deymo
` (5 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 18:22 UTC (permalink / raw)
To: linux-bluetooth; +Cc: keybuk, marcel, deymo
Events like [NEW], [CHG] and [DEL] can appear in the command console at
any time, even when the user is typing a command. The last line is kept
making the event line appear just before it, something that can be
unnoticed. This patch add meaningful colors for those three events to make
it easier to see them.
---
client/display.h | 3 +++
client/main.c | 20 +++++++++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/client/display.h b/client/display.h
index 393a3c8..9cb891a 100644
--- a/client/display.h
+++ b/client/display.h
@@ -22,6 +22,9 @@
*/
#define COLOR_OFF "\x1B[0m"
+#define COLOR_RED "\x1B[0;91m"
+#define COLOR_GREEN "\x1B[0;92m"
+#define COLOR_YELLOW "\x1B[0;93m"
#define COLOR_BLUE "\x1B[0;34m"
void rl_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
diff --git a/client/main.c b/client/main.c
index 9a927a8..d8547c0 100644
--- a/client/main.c
+++ b/client/main.c
@@ -41,6 +41,11 @@
#include "agent.h"
#include "display.h"
+/* String display constants */
+#define COLORED_NEW COLOR_GREEN "NEW" COLOR_OFF
+#define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF
+#define COLORED_DEL COLOR_RED "DEL" COLOR_OFF
+
static GMainLoop *main_loop;
static DBusConnection *dbus_conn;
@@ -252,7 +257,7 @@ static void proxy_added(GDBusProxy *proxy, void *user_data)
if (device_is_child(proxy, default_ctrl) == TRUE) {
dev_list = g_list_append(dev_list, proxy);
- print_device(proxy, "NEW");
+ print_device(proxy, COLORED_NEW);
}
} else if (!strcmp(interface, "org.bluez.Adapter1")) {
ctrl_list = g_list_append(ctrl_list, proxy);
@@ -260,7 +265,7 @@ static void proxy_added(GDBusProxy *proxy, void *user_data)
if (!default_ctrl)
default_ctrl = proxy;
- print_adapter(proxy, "NEW");
+ print_adapter(proxy, COLORED_NEW);
} else if (!strcmp(interface, "org.bluez.AgentManager1")) {
if (!agent_manager) {
agent_manager = proxy;
@@ -282,12 +287,12 @@ static void proxy_removed(GDBusProxy *proxy, void *user_data)
if (device_is_child(proxy, default_ctrl) == TRUE) {
dev_list = g_list_remove(dev_list, proxy);
- print_device(proxy, "DEL");
+ print_device(proxy, COLORED_DEL);
}
} else if (!strcmp(interface, "org.bluez.Adapter1")) {
ctrl_list = g_list_remove(ctrl_list, proxy);
- print_adapter(proxy, "DEL");
+ print_adapter(proxy, COLORED_DEL);
if (default_ctrl == proxy) {
default_ctrl = NULL;
@@ -319,8 +324,8 @@ static void property_changed(GDBusProxy *proxy, const char *name,
dbus_message_iter_get_basic(&addr_iter,
&address);
- str = g_strdup_printf("[CHG] Device %s ",
- address);
+ str = g_strdup_printf("[" COLORED_CHG
+ "] Device %s ", address);
} else
str = g_strdup("");
@@ -336,7 +341,8 @@ static void property_changed(GDBusProxy *proxy, const char *name,
const char *address;
dbus_message_iter_get_basic(&addr_iter, &address);
- str = g_strdup_printf("[CHG] Controller %s ", address);
+ str = g_strdup_printf("[" COLORED_CHG
+ "] Controller %s ", address);
} else
str = g_strdup("");
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 2/6] Right prompt management on agent input
2013-03-14 18:22 [PATCH 0/6] bluetoothctl: agent's implementation Alex Deymo
2013-03-14 18:22 ` [PATCH 1/6] Add color modifiers to NEW, CHG and DEL events Alex Deymo
@ 2013-03-14 18:22 ` Alex Deymo
2013-03-14 19:32 ` Vinicius Costa Gomes
2013-03-14 18:22 ` [PATCH 3/6] "agent" command capability argument and autocompletion Alex Deymo
` (4 subsequent siblings)
6 siblings, 1 reply; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 18:22 UTC (permalink / raw)
To: linux-bluetooth; +Cc: keybuk, marcel, deymo
Registering an agent shares the user input interface with the normal console
command interface. The way it is implemented (using rl_message, rl_save_prompt
and rl_restore_prompt) conflicts with the rl_printf calls that may appear
while waiting for user input, loosing the [bluetooth]# prompt.
This patch fixes this and makes clear if the expected input is a command or an
agent reply changing the color and text of the prompt.
---
client/agent.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-----------
client/display.h | 2 +-
client/main.c | 13 ++++++++-----
3 files changed, 57 insertions(+), 17 deletions(-)
diff --git a/client/agent.c b/client/agent.c
index b0ac2f8..fa8b1b2 100644
--- a/client/agent.c
+++ b/client/agent.c
@@ -26,6 +26,7 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <readline/readline.h>
#include <gdbus.h>
@@ -35,9 +36,47 @@
#define AGENT_PATH "/org/bluez/agent"
#define AGENT_INTERFACE "org.bluez.Agent1"
+#define AGENT_PROMPT COLOR_RED "[agent]" COLOR_OFF " "
+
static gboolean agent_registered = FALSE;
static const char *agent_capability = NULL;
static DBusMessage *pending_message = NULL;
+static char *agent_saved_prompt = NULL;
+static int agent_saved_point = 0;
+
+static void rl_agent_prompt(const char* msg)
+{
+ char *prompt;
+
+ /* Normal use should not prompt for user input to the agent a second
+ * time before it releases the prompt, but we take a safe action. */
+ if (agent_saved_prompt)
+ return;
+
+ agent_saved_point = rl_point;
+ agent_saved_prompt = g_strdup(rl_prompt);
+
+ prompt = g_strdup_printf(AGENT_PROMPT "%s", msg);
+ rl_set_prompt(prompt);
+ g_free(prompt);
+ rl_replace_line("", 0);
+ rl_redisplay();
+}
+
+static void rl_agent_release_prompt(void)
+{
+ if (!agent_saved_prompt)
+ return;
+
+ /* This will cause rl_expand_prompt to re-run over the last prompt, but
+ * our prompt doesn't expand anyway. */
+ rl_set_prompt(agent_saved_prompt);
+ rl_replace_line("", 0);
+ rl_point = agent_saved_point;
+ rl_redisplay();
+ g_free(agent_saved_prompt);
+ agent_saved_prompt = NULL;
+}
dbus_bool_t agent_completion(void)
{
@@ -69,11 +108,11 @@ dbus_bool_t agent_input(DBusConnection *conn, const char *input)
{
const char *member;
- rl_clear_message();
-
if (!pending_message)
return FALSE;
+ rl_agent_release_prompt();
+
member = dbus_message_get_member(pending_message);
if (!strcmp(member, "RequestPinCode"))
@@ -97,9 +136,6 @@ dbus_bool_t agent_input(DBusConnection *conn, const char *input)
static DBusMessage *release_agent(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
- if (pending_message)
- rl_clear_message();
-
agent_registered = FALSE;
agent_capability = NULL;
@@ -110,6 +146,8 @@ static DBusMessage *release_agent(DBusConnection *conn,
pending_message = NULL;
}
+ rl_agent_release_prompt();
+
g_dbus_unregister_interface(conn, AGENT_PATH, AGENT_INTERFACE);
return dbus_message_new_method_return(msg);
@@ -125,7 +163,7 @@ static DBusMessage *request_pincode(DBusConnection *conn,
dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
DBUS_TYPE_INVALID);
- rl_message("Enter PIN code: ");
+ rl_agent_prompt("Enter PIN code: ");
pending_message = dbus_message_ref(msg);
@@ -145,7 +183,7 @@ static DBusMessage *request_confirmation(DBusConnection *conn,
DBUS_TYPE_UINT32, &passkey, DBUS_TYPE_INVALID);
str = g_strdup_printf("Confirm passkey %06u (yes/no): ", passkey);
- rl_message(str);
+ rl_agent_prompt(str);
g_free(str);
pending_message = dbus_message_ref(msg);
@@ -163,7 +201,7 @@ static DBusMessage *request_authorization(DBusConnection *conn,
dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
DBUS_TYPE_INVALID);
- rl_message("Accept pairing (yes/no): ");
+ rl_agent_prompt("Accept pairing (yes/no): ");
pending_message = dbus_message_ref(msg);
@@ -182,7 +220,7 @@ static DBusMessage *authorize_service(DBusConnection *conn,
DBUS_TYPE_STRING, &uuid, DBUS_TYPE_INVALID);
str = g_strdup_printf("Authorize service %s (yes/no): ", uuid);
- rl_message(str);
+ rl_agent_prompt(str);
g_free(str);
pending_message = dbus_message_ref(msg);
@@ -193,10 +231,9 @@ static DBusMessage *authorize_service(DBusConnection *conn,
static DBusMessage *cancel_request(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
- rl_clear_message();
-
rl_printf("Request canceled\n");
+ rl_agent_release_prompt();
dbus_message_unref(pending_message);
pending_message = NULL;
diff --git a/client/display.h b/client/display.h
index 9cb891a..957bdc6 100644
--- a/client/display.h
+++ b/client/display.h
@@ -25,6 +25,6 @@
#define COLOR_RED "\x1B[0;91m"
#define COLOR_GREEN "\x1B[0;92m"
#define COLOR_YELLOW "\x1B[0;93m"
-#define COLOR_BLUE "\x1B[0;34m"
+#define COLOR_BLUE "\x1B[0;94m"
void rl_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
diff --git a/client/main.c b/client/main.c
index d8547c0..704cf46 100644
--- a/client/main.c
+++ b/client/main.c
@@ -46,6 +46,9 @@
#define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF
#define COLORED_DEL COLOR_RED "DEL" COLOR_OFF
+#define PROMPT_ON COLOR_BLUE "[bluetooth]" COLOR_OFF "# "
+#define PROMPT_OFF "[bluetooth]# "
+
static GMainLoop *main_loop;
static DBusConnection *dbus_conn;
@@ -63,7 +66,7 @@ static void proxy_leak(gpointer data)
static void connect_handler(DBusConnection *connection, void *user_data)
{
- rl_set_prompt(COLOR_BLUE "[bluetooth]" COLOR_OFF "# ");
+ rl_set_prompt(PROMPT_ON);
printf("\r");
rl_on_new_line();
rl_redisplay();
@@ -71,7 +74,7 @@ static void connect_handler(DBusConnection *connection, void *user_data)
static void disconnect_handler(DBusConnection *connection, void *user_data)
{
- rl_set_prompt("[bluetooth]# ");
+ rl_set_prompt(PROMPT_OFF);
printf("\r");
rl_on_new_line();
rl_redisplay();
@@ -1283,11 +1286,11 @@ int main(int argc, char *argv[])
rl_erase_empty_line = 1;
rl_callback_handler_install(NULL, rl_handler);
- rl_set_prompt("[bluetooth]# ");
+ rl_set_prompt(PROMPT_OFF);
rl_redisplay();
- input = setup_standard_input();
- signal = setup_signalfd();
+ input = setup_standard_input();
+ signal = setup_signalfd();
client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez");
g_dbus_client_set_connect_watch(client, connect_handler, NULL);
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 2/6] Right prompt management on agent input
2013-03-14 18:22 ` [PATCH 2/6] Right prompt management on agent input Alex Deymo
@ 2013-03-14 19:32 ` Vinicius Costa Gomes
2013-03-14 23:26 ` Alex Deymo
0 siblings, 1 reply; 19+ messages in thread
From: Vinicius Costa Gomes @ 2013-03-14 19:32 UTC (permalink / raw)
To: Alex Deymo; +Cc: linux-bluetooth, keybuk, marcel
Hi Alex,
On 11:22 Thu 14 Mar, Alex Deymo wrote:
> Registering an agent shares the user input interface with the normal console
> command interface. The way it is implemented (using rl_message, rl_save_prompt
> and rl_restore_prompt) conflicts with the rl_printf calls that may appear
> while waiting for user input, loosing the [bluetooth]# prompt.
> This patch fixes this and makes clear if the expected input is a command or an
> agent reply changing the color and text of the prompt.
> ---
> client/agent.c | 59 +++++++++++++++++++++++++++++++++++++++++++++-----------
> client/display.h | 2 +-
> client/main.c | 13 ++++++++-----
> 3 files changed, 57 insertions(+), 17 deletions(-)
>
> diff --git a/client/agent.c b/client/agent.c
> index b0ac2f8..fa8b1b2 100644
> --- a/client/agent.c
> +++ b/client/agent.c
> @@ -26,6 +26,7 @@
> #endif
>
> #include <stdio.h>
> +#include <stdlib.h>
> #include <readline/readline.h>
> #include <gdbus.h>
>
> @@ -35,9 +36,47 @@
> #define AGENT_PATH "/org/bluez/agent"
> #define AGENT_INTERFACE "org.bluez.Agent1"
>
> +#define AGENT_PROMPT COLOR_RED "[agent]" COLOR_OFF " "
> +
> static gboolean agent_registered = FALSE;
> static const char *agent_capability = NULL;
> static DBusMessage *pending_message = NULL;
> +static char *agent_saved_prompt = NULL;
> +static int agent_saved_point = 0;
> +
> +static void rl_agent_prompt(const char* msg)
I don't like much using the "rl" prefix for local functions, it may confuse
more than help.
> +{
> + char *prompt;
> +
> + /* Normal use should not prompt for user input to the agent a second
> + * time before it releases the prompt, but we take a safe action. */
> + if (agent_saved_prompt)
> + return;
> +
> + agent_saved_point = rl_point;
> + agent_saved_prompt = g_strdup(rl_prompt);
> +
> + prompt = g_strdup_printf(AGENT_PROMPT "%s", msg);
> + rl_set_prompt(prompt);
> + g_free(prompt);
I would add an empty line here, don't know if it makes sense in the context of
readline, but at least the code reads better.
> + rl_replace_line("", 0);
> + rl_redisplay();
> +}
> +
> +static void rl_agent_release_prompt(void)
Same argument about the "rl" prefix.
> +{
> + if (!agent_saved_prompt)
> + return;
> +
> + /* This will cause rl_expand_prompt to re-run over the last prompt, but
> + * our prompt doesn't expand anyway. */
> + rl_set_prompt(agent_saved_prompt);
> + rl_replace_line("", 0);
> + rl_point = agent_saved_point;
> + rl_redisplay();
> + g_free(agent_saved_prompt);
> + agent_saved_prompt = NULL;
Again, if it makes sense, some empty lines may help readability.
> +}
>
> dbus_bool_t agent_completion(void)
> {
> @@ -69,11 +108,11 @@ dbus_bool_t agent_input(DBusConnection *conn, const char *input)
> {
> const char *member;
>
> - rl_clear_message();
> -
> if (!pending_message)
> return FALSE;
>
> + rl_agent_release_prompt();
> +
> member = dbus_message_get_member(pending_message);
>
> if (!strcmp(member, "RequestPinCode"))
> @@ -97,9 +136,6 @@ dbus_bool_t agent_input(DBusConnection *conn, const char *input)
> static DBusMessage *release_agent(DBusConnection *conn,
> DBusMessage *msg, void *user_data)
> {
> - if (pending_message)
> - rl_clear_message();
> -
> agent_registered = FALSE;
> agent_capability = NULL;
>
> @@ -110,6 +146,8 @@ static DBusMessage *release_agent(DBusConnection *conn,
> pending_message = NULL;
> }
>
> + rl_agent_release_prompt();
> +
> g_dbus_unregister_interface(conn, AGENT_PATH, AGENT_INTERFACE);
>
> return dbus_message_new_method_return(msg);
> @@ -125,7 +163,7 @@ static DBusMessage *request_pincode(DBusConnection *conn,
> dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
> DBUS_TYPE_INVALID);
>
> - rl_message("Enter PIN code: ");
> + rl_agent_prompt("Enter PIN code: ");
>
> pending_message = dbus_message_ref(msg);
>
> @@ -145,7 +183,7 @@ static DBusMessage *request_confirmation(DBusConnection *conn,
> DBUS_TYPE_UINT32, &passkey, DBUS_TYPE_INVALID);
>
> str = g_strdup_printf("Confirm passkey %06u (yes/no): ", passkey);
> - rl_message(str);
> + rl_agent_prompt(str);
> g_free(str);
>
> pending_message = dbus_message_ref(msg);
> @@ -163,7 +201,7 @@ static DBusMessage *request_authorization(DBusConnection *conn,
> dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
> DBUS_TYPE_INVALID);
>
> - rl_message("Accept pairing (yes/no): ");
> + rl_agent_prompt("Accept pairing (yes/no): ");
>
> pending_message = dbus_message_ref(msg);
>
> @@ -182,7 +220,7 @@ static DBusMessage *authorize_service(DBusConnection *conn,
> DBUS_TYPE_STRING, &uuid, DBUS_TYPE_INVALID);
>
> str = g_strdup_printf("Authorize service %s (yes/no): ", uuid);
> - rl_message(str);
> + rl_agent_prompt(str);
> g_free(str);
>
> pending_message = dbus_message_ref(msg);
> @@ -193,10 +231,9 @@ static DBusMessage *authorize_service(DBusConnection *conn,
> static DBusMessage *cancel_request(DBusConnection *conn,
> DBusMessage *msg, void *user_data)
> {
> - rl_clear_message();
> -
> rl_printf("Request canceled\n");
>
> + rl_agent_release_prompt();
> dbus_message_unref(pending_message);
> pending_message = NULL;
>
> diff --git a/client/display.h b/client/display.h
> index 9cb891a..957bdc6 100644
> --- a/client/display.h
> +++ b/client/display.h
> @@ -25,6 +25,6 @@
> #define COLOR_RED "\x1B[0;91m"
> #define COLOR_GREEN "\x1B[0;92m"
> #define COLOR_YELLOW "\x1B[0;93m"
> -#define COLOR_BLUE "\x1B[0;34m"
> +#define COLOR_BLUE "\x1B[0;94m"
>
> void rl_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
> diff --git a/client/main.c b/client/main.c
> index d8547c0..704cf46 100644
> --- a/client/main.c
> +++ b/client/main.c
> @@ -46,6 +46,9 @@
> #define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF
> #define COLORED_DEL COLOR_RED "DEL" COLOR_OFF
>
> +#define PROMPT_ON COLOR_BLUE "[bluetooth]" COLOR_OFF "# "
> +#define PROMPT_OFF "[bluetooth]# "
> +
> static GMainLoop *main_loop;
> static DBusConnection *dbus_conn;
>
> @@ -63,7 +66,7 @@ static void proxy_leak(gpointer data)
>
> static void connect_handler(DBusConnection *connection, void *user_data)
> {
> - rl_set_prompt(COLOR_BLUE "[bluetooth]" COLOR_OFF "# ");
> + rl_set_prompt(PROMPT_ON);
> printf("\r");
> rl_on_new_line();
> rl_redisplay();
> @@ -71,7 +74,7 @@ static void connect_handler(DBusConnection *connection, void *user_data)
>
> static void disconnect_handler(DBusConnection *connection, void *user_data)
> {
> - rl_set_prompt("[bluetooth]# ");
> + rl_set_prompt(PROMPT_OFF);
> printf("\r");
> rl_on_new_line();
> rl_redisplay();
> @@ -1283,11 +1286,11 @@ int main(int argc, char *argv[])
> rl_erase_empty_line = 1;
> rl_callback_handler_install(NULL, rl_handler);
>
> - rl_set_prompt("[bluetooth]# ");
> + rl_set_prompt(PROMPT_OFF);
> rl_redisplay();
>
> - input = setup_standard_input();
> - signal = setup_signalfd();
> + input = setup_standard_input();
> + signal = setup_signalfd();
> client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez");
>
> g_dbus_client_set_connect_watch(client, connect_handler, NULL);
> --
> 1.8.1.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 2/6] Right prompt management on agent input
2013-03-14 19:32 ` Vinicius Costa Gomes
@ 2013-03-14 23:26 ` Alex Deymo
0 siblings, 0 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 23:26 UTC (permalink / raw)
To: Vinicius Costa Gomes; +Cc: linux-bluetooth, keybuk, Marcel Holtmann
Registering an agent shares the user input interface with the normal console
command interface. The way it is implemented (using rl_message, rl_save_prompt
and rl_restore_prompt) conflicts with the rl_printf calls that may appear
while waiting for user input, loosing the [bluetooth]# prompt.
This patch fixes this and makes clear if the expected input is a command or an
agent reply changing the color and text of the prompt.
---
client/agent.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++----------
client/display.h | 2 +-
client/main.c | 13 +++++++-----
3 files changed, 59 insertions(+), 17 deletions(-)
diff --git a/client/agent.c b/client/agent.c
index b0ac2f8..dc27079 100644
--- a/client/agent.c
+++ b/client/agent.c
@@ -26,6 +26,7 @@
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <readline/readline.h>
#include <gdbus.h>
@@ -35,9 +36,49 @@
#define AGENT_PATH "/org/bluez/agent"
#define AGENT_INTERFACE "org.bluez.Agent1"
+#define AGENT_PROMPT COLOR_RED "[agent]" COLOR_OFF " "
+
static gboolean agent_registered = FALSE;
static const char *agent_capability = NULL;
static DBusMessage *pending_message = NULL;
+static char *agent_saved_prompt = NULL;
+static int agent_saved_point = 0;
+
+static void agent_prompt(const char* msg)
+{
+ char *prompt;
+
+ /* Normal use should not prompt for user input to the agent a second
+ * time before it releases the prompt, but we take a safe action. */
+ if (agent_saved_prompt)
+ return;
+
+ agent_saved_point = rl_point;
+ agent_saved_prompt = g_strdup(rl_prompt);
+
+ prompt = g_strdup_printf(AGENT_PROMPT "%s", msg);
+ rl_set_prompt(prompt);
+ g_free(prompt);
+
+ rl_replace_line("", 0);
+ rl_redisplay();
+}
+
+static void agent_release_prompt(void)
+{
+ if (!agent_saved_prompt)
+ return;
+
+ /* This will cause rl_expand_prompt to re-run over the last prompt, but
+ * our prompt doesn't expand anyway. */
+ rl_set_prompt(agent_saved_prompt);
+ rl_replace_line("", 0);
+ rl_point = agent_saved_point;
+ rl_redisplay();
+
+ g_free(agent_saved_prompt);
+ agent_saved_prompt = NULL;
+}
dbus_bool_t agent_completion(void)
{
@@ -69,11 +110,11 @@ dbus_bool_t agent_input(DBusConnection *conn,
const char *input)
{
const char *member;
- rl_clear_message();
-
if (!pending_message)
return FALSE;
+ agent_release_prompt();
+
member = dbus_message_get_member(pending_message);
if (!strcmp(member, "RequestPinCode"))
@@ -97,9 +138,6 @@ dbus_bool_t agent_input(DBusConnection *conn, const
char *input)
static DBusMessage *release_agent(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
- if (pending_message)
- rl_clear_message();
-
agent_registered = FALSE;
agent_capability = NULL;
@@ -110,6 +148,8 @@ static DBusMessage *release_agent(DBusConnection *conn,
pending_message = NULL;
}
+ agent_release_prompt();
+
g_dbus_unregister_interface(conn, AGENT_PATH, AGENT_INTERFACE);
return dbus_message_new_method_return(msg);
@@ -125,7 +165,7 @@ static DBusMessage *request_pincode(DBusConnection *conn,
dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
DBUS_TYPE_INVALID);
- rl_message("Enter PIN code: ");
+ agent_prompt("Enter PIN code: ");
pending_message = dbus_message_ref(msg);
@@ -145,7 +185,7 @@ static DBusMessage
*request_confirmation(DBusConnection *conn,
DBUS_TYPE_UINT32, &passkey, DBUS_TYPE_INVALID);
str = g_strdup_printf("Confirm passkey %06u (yes/no): ", passkey);
- rl_message(str);
+ agent_prompt(str);
g_free(str);
pending_message = dbus_message_ref(msg);
@@ -163,7 +203,7 @@ static DBusMessage
*request_authorization(DBusConnection *conn,
dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
DBUS_TYPE_INVALID);
- rl_message("Accept pairing (yes/no): ");
+ agent_prompt("Accept pairing (yes/no): ");
pending_message = dbus_message_ref(msg);
@@ -182,7 +222,7 @@ static DBusMessage *authorize_service(DBusConnection *conn,
DBUS_TYPE_STRING, &uuid, DBUS_TYPE_INVALID);
str = g_strdup_printf("Authorize service %s (yes/no): ", uuid);
- rl_message(str);
+ agent_prompt(str);
g_free(str);
pending_message = dbus_message_ref(msg);
@@ -193,10 +233,9 @@ static DBusMessage *authorize_service(DBusConnection *conn,
static DBusMessage *cancel_request(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
- rl_clear_message();
-
rl_printf("Request canceled\n");
+ agent_release_prompt();
dbus_message_unref(pending_message);
pending_message = NULL;
diff --git a/client/display.h b/client/display.h
index 9cb891a..957bdc6 100644
--- a/client/display.h
+++ b/client/display.h
@@ -25,6 +25,6 @@
#define COLOR_RED "\x1B[0;91m"
#define COLOR_GREEN "\x1B[0;92m"
#define COLOR_YELLOW "\x1B[0;93m"
-#define COLOR_BLUE "\x1B[0;34m"
+#define COLOR_BLUE "\x1B[0;94m"
void rl_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
diff --git a/client/main.c b/client/main.c
index d8547c0..704cf46 100644
--- a/client/main.c
+++ b/client/main.c
@@ -46,6 +46,9 @@
#define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF
#define COLORED_DEL COLOR_RED "DEL" COLOR_OFF
+#define PROMPT_ON COLOR_BLUE "[bluetooth]" COLOR_OFF "# "
+#define PROMPT_OFF "[bluetooth]# "
+
static GMainLoop *main_loop;
static DBusConnection *dbus_conn;
@@ -63,7 +66,7 @@ static void proxy_leak(gpointer data)
static void connect_handler(DBusConnection *connection, void *user_data)
{
- rl_set_prompt(COLOR_BLUE "[bluetooth]" COLOR_OFF "# ");
+ rl_set_prompt(PROMPT_ON);
printf("\r");
rl_on_new_line();
rl_redisplay();
@@ -71,7 +74,7 @@ static void connect_handler(DBusConnection
*connection, void *user_data)
static void disconnect_handler(DBusConnection *connection, void *user_data)
{
- rl_set_prompt("[bluetooth]# ");
+ rl_set_prompt(PROMPT_OFF);
printf("\r");
rl_on_new_line();
rl_redisplay();
@@ -1283,11 +1286,11 @@ int main(int argc, char *argv[])
rl_erase_empty_line = 1;
rl_callback_handler_install(NULL, rl_handler);
- rl_set_prompt("[bluetooth]# ");
+ rl_set_prompt(PROMPT_OFF);
rl_redisplay();
- input = setup_standard_input();
- signal = setup_signalfd();
+ input = setup_standard_input();
+ signal = setup_signalfd();
client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez");
g_dbus_client_set_connect_watch(client, connect_handler, NULL);
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 3/6] "agent" command capability argument and autocompletion
2013-03-14 18:22 [PATCH 0/6] bluetoothctl: agent's implementation Alex Deymo
2013-03-14 18:22 ` [PATCH 1/6] Add color modifiers to NEW, CHG and DEL events Alex Deymo
2013-03-14 18:22 ` [PATCH 2/6] Right prompt management on agent input Alex Deymo
@ 2013-03-14 18:22 ` Alex Deymo
2013-03-14 19:47 ` Vinicius Costa Gomes
2013-03-14 20:00 ` Vinicius Costa Gomes
2013-03-14 18:22 ` [PATCH 4/6] Agent's DisplayPincode implementation Alex Deymo
` (3 subsequent siblings)
6 siblings, 2 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 18:22 UTC (permalink / raw)
To: linux-bluetooth; +Cc: keybuk, marcel, deymo
This patch enables argument autocompletion for the agent command with the
list of capabilities an agent can have, adding also "on" (for the default "")
and "off". The command passes the argument (parsing and verifying it) to the
dbus method call.
---
client/main.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 79 insertions(+), 3 deletions(-)
diff --git a/client/main.c b/client/main.c
index 704cf46..12b08b5 100644
--- a/client/main.c
+++ b/client/main.c
@@ -59,6 +59,27 @@ static GDBusProxy *default_ctrl;
static GList *ctrl_list;
static GList *dev_list;
+static const char* agent_arguments[] = {
+ "on",
+ "off",
+ "DisplayOnly",
+ "DisplayYesNo",
+ "KeyboardDisplay",
+ "KeyboardOnly",
+ "NoInputNoOutput",
+ NULL
+};
+
+static const char* agent_capability_options[] = {
+ "", /* default */
+ "DisplayOnly",
+ "DisplayYesNo",
+ "KeyboardDisplay",
+ "KeyboardOnly",
+ "NoInputNoOutput",
+ NULL
+};
+
static void proxy_leak(gpointer data)
{
printf("Leaking proxy %p\n", data);
@@ -413,6 +434,39 @@ static gboolean parse_argument_on_off(const char *arg, dbus_bool_t *value)
return FALSE;
}
+static gboolean parse_argument_agent(const char *arg, dbus_bool_t *value,
+ const char **capability)
+{
+ const char **opt;
+
+ if (!arg || !strlen(arg)) {
+ rl_printf("Missing on/off/capability argument\n");
+ return FALSE;
+ }
+
+ if (!strcmp(arg, "on") || !strcmp(arg, "yes")) {
+ *value = TRUE;
+ *capability = "";
+ return TRUE;
+ }
+
+ if (!strcmp(arg, "off") || !strcmp(arg, "no")) {
+ *value = FALSE;
+ return TRUE;
+ }
+
+ for (opt = agent_arguments; *opt; opt++) {
+ if (!strcmp(arg, *opt)) {
+ *value = TRUE;
+ *capability = *opt;
+ return TRUE;
+ }
+ }
+
+ rl_printf("Invalid argument %s\n", arg);
+ return FALSE;
+}
+
static void cmd_list(const char *arg)
{
GList *list;
@@ -610,13 +664,14 @@ static void cmd_discoverable(const char *arg)
static void cmd_agent(const char *arg)
{
dbus_bool_t enable;
+ const char* capability;
- if (parse_argument_on_off(arg, &enable) == FALSE)
+ if (parse_argument_agent(arg, &enable, &capability) == FALSE)
return;
if (enable == TRUE) {
g_free(auto_register_agent);
- auto_register_agent = g_strdup("");
+ auto_register_agent = g_strdup(capability);
if (agent_manager)
agent_register(dbus_conn, agent_manager,
@@ -968,6 +1023,26 @@ static char *dev_generator(const char *text, int state)
return generic_generator(text, state, dev_list, "Address");
}
+static char *capability_generator(const char *text, int state)
+{
+ static int index, len;
+ const char *arg;
+
+ if (!state) {
+ index = 0;
+ len = strlen(text);
+ }
+
+ while ((arg = agent_arguments[index])) {
+ index++;
+
+ if (!strncmp(arg, text, len))
+ return strdup(arg);
+ }
+
+ return NULL;
+}
+
static const struct {
const char *cmd;
const char *arg;
@@ -989,7 +1064,8 @@ static const struct {
"Set controller pairable mode" },
{ "discoverable", "<on/off>", cmd_discoverable,
"Set controller discoverable mode" },
- { "agent", "<on/off>", cmd_agent, "Enable/disable agent" },
+ { "agent", "<on/off/capability>", cmd_agent,
+ "Enable/disable agent with given capability", capability_generator},
{ "default-agent",NULL, cmd_default_agent },
{ "scan", "<on/off>", cmd_scan, "Scan for devices" },
{ "info", "<dev>", cmd_info, "Device information",
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 3/6] "agent" command capability argument and autocompletion
2013-03-14 18:22 ` [PATCH 3/6] "agent" command capability argument and autocompletion Alex Deymo
@ 2013-03-14 19:47 ` Vinicius Costa Gomes
2013-03-14 20:00 ` Vinicius Costa Gomes
1 sibling, 0 replies; 19+ messages in thread
From: Vinicius Costa Gomes @ 2013-03-14 19:47 UTC (permalink / raw)
To: Alex Deymo; +Cc: linux-bluetooth, keybuk, marcel
Hi Alex,
On 11:22 Thu 14 Mar, Alex Deymo wrote:
> This patch enables argument autocompletion for the agent command with the
> list of capabilities an agent can have, adding also "on" (for the default "")
> and "off". The command passes the argument (parsing and verifying it) to the
> dbus method call.
> ---
> client/main.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 79 insertions(+), 3 deletions(-)
>
> diff --git a/client/main.c b/client/main.c
> index 704cf46..12b08b5 100644
> --- a/client/main.c
> +++ b/client/main.c
> @@ -59,6 +59,27 @@ static GDBusProxy *default_ctrl;
> static GList *ctrl_list;
> static GList *dev_list;
>
> +static const char* agent_arguments[] = {
> + "on",
> + "off",
> + "DisplayOnly",
> + "DisplayYesNo",
> + "KeyboardDisplay",
> + "KeyboardOnly",
> + "NoInputNoOutput",
> + NULL
> +};
> +
> +static const char* agent_capability_options[] = {
> + "", /* default */
> + "DisplayOnly",
> + "DisplayYesNo",
> + "KeyboardDisplay",
> + "KeyboardOnly",
> + "NoInputNoOutput",
> + NULL
> +};
> +
> static void proxy_leak(gpointer data)
> {
> printf("Leaking proxy %p\n", data);
> @@ -413,6 +434,39 @@ static gboolean parse_argument_on_off(const char *arg, dbus_bool_t *value)
> return FALSE;
> }
>
> +static gboolean parse_argument_agent(const char *arg, dbus_bool_t *value,
> + const char **capability)
> +{
> + const char **opt;
> +
> + if (!arg || !strlen(arg)) {
Even if it's not strictly enforced, in userspace code there's a tendency to
use explicit checks for NULL and 0.
This also applies for the strcmp()'s that are done just bellow.
> + rl_printf("Missing on/off/capability argument\n");
> + return FALSE;
> + }
> +
> + if (!strcmp(arg, "on") || !strcmp(arg, "yes")) {
> + *value = TRUE;
> + *capability = "";
> + return TRUE;
> + }
> +
> + if (!strcmp(arg, "off") || !strcmp(arg, "no")) {
> + *value = FALSE;
> + return TRUE;
> + }
> +
> + for (opt = agent_arguments; *opt; opt++) {
> + if (!strcmp(arg, *opt)) {
> + *value = TRUE;
> + *capability = *opt;
> + return TRUE;
> + }
> + }
> +
> + rl_printf("Invalid argument %s\n", arg);
> + return FALSE;
> +}
> +
> static void cmd_list(const char *arg)
> {
> GList *list;
> @@ -610,13 +664,14 @@ static void cmd_discoverable(const char *arg)
> static void cmd_agent(const char *arg)
> {
> dbus_bool_t enable;
> + const char* capability;
>
> - if (parse_argument_on_off(arg, &enable) == FALSE)
> + if (parse_argument_agent(arg, &enable, &capability) == FALSE)
> return;
>
> if (enable == TRUE) {
> g_free(auto_register_agent);
> - auto_register_agent = g_strdup("");
> + auto_register_agent = g_strdup(capability);
>
> if (agent_manager)
> agent_register(dbus_conn, agent_manager,
> @@ -968,6 +1023,26 @@ static char *dev_generator(const char *text, int state)
> return generic_generator(text, state, dev_list, "Address");
> }
>
> +static char *capability_generator(const char *text, int state)
> +{
> + static int index, len;
> + const char *arg;
> +
> + if (!state) {
> + index = 0;
> + len = strlen(text);
> + }
> +
> + while ((arg = agent_arguments[index])) {
> + index++;
> +
> + if (!strncmp(arg, text, len))
> + return strdup(arg);
> + }
> +
> + return NULL;
> +}
> +
> static const struct {
> const char *cmd;
> const char *arg;
> @@ -989,7 +1064,8 @@ static const struct {
> "Set controller pairable mode" },
> { "discoverable", "<on/off>", cmd_discoverable,
> "Set controller discoverable mode" },
> - { "agent", "<on/off>", cmd_agent, "Enable/disable agent" },
> + { "agent", "<on/off/capability>", cmd_agent,
> + "Enable/disable agent with given capability", capability_generator},
Some more levels of identation here.
> { "default-agent",NULL, cmd_default_agent },
> { "scan", "<on/off>", cmd_scan, "Scan for devices" },
> { "info", "<dev>", cmd_info, "Device information",
> --
> 1.8.1.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 3/6] "agent" command capability argument and autocompletion
2013-03-14 18:22 ` [PATCH 3/6] "agent" command capability argument and autocompletion Alex Deymo
2013-03-14 19:47 ` Vinicius Costa Gomes
@ 2013-03-14 20:00 ` Vinicius Costa Gomes
2013-03-14 20:32 ` Alex Deymo
1 sibling, 1 reply; 19+ messages in thread
From: Vinicius Costa Gomes @ 2013-03-14 20:00 UTC (permalink / raw)
To: Alex Deymo; +Cc: linux-bluetooth, keybuk, marcel
Hi Alex,
Sorry for the double post.
On 11:22 Thu 14 Mar, Alex Deymo wrote:
> This patch enables argument autocompletion for the agent command with the
> list of capabilities an agent can have, adding also "on" (for the default "")
> and "off". The command passes the argument (parsing and verifying it) to the
> dbus method call.
> ---
> client/main.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 79 insertions(+), 3 deletions(-)
>
> diff --git a/client/main.c b/client/main.c
> index 704cf46..12b08b5 100644
> --- a/client/main.c
> +++ b/client/main.c
> @@ -59,6 +59,27 @@ static GDBusProxy *default_ctrl;
> static GList *ctrl_list;
> static GList *dev_list;
>
> +static const char* agent_arguments[] = {
> + "on",
> + "off",
> + "DisplayOnly",
> + "DisplayYesNo",
> + "KeyboardDisplay",
> + "KeyboardOnly",
> + "NoInputNoOutput",
> + NULL
> +};
> +
> +static const char* agent_capability_options[] = {
Neither I (nor my compiler) could find any usages of this ;-)
> + "", /* default */
> + "DisplayOnly",
> + "DisplayYesNo",
> + "KeyboardDisplay",
> + "KeyboardOnly",
> + "NoInputNoOutput",
> + NULL
> +};
> +
[snip]
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 3/6] "agent" command capability argument and autocompletion
2013-03-14 20:00 ` Vinicius Costa Gomes
@ 2013-03-14 20:32 ` Alex Deymo
2013-03-14 20:41 ` Vinicius Costa Gomes
0 siblings, 1 reply; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 20:32 UTC (permalink / raw)
To: Vinicius Costa Gomes; +Cc: linux-bluetooth, keybuk, marcel
Thanks for the comments.
agent_capability_options[] was intended to be use in
parse_argument_agent(), but I finally reused agent_arguments[] since
the two extra cases (on, off) are handled before. I'll fix this (and
the indentation thing).
> > + if (!arg || !strlen(arg)) {
> Even if it's not strictly enforced, in userspace code there's a tendency to
> use explicit checks for NULL and 0.
>
> This also applies for the strcmp()'s that are done just bellow.
I'm not sure if I properly understand this comment. If arg is NULL it
will fall in the first return FALSE, not calling any strcmp() because
of the lazy or operator, right?
Alex.
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 3/6] "agent" command capability argument and autocompletion
2013-03-14 20:32 ` Alex Deymo
@ 2013-03-14 20:41 ` Vinicius Costa Gomes
2013-03-14 22:08 ` Alex Deymo
0 siblings, 1 reply; 19+ messages in thread
From: Vinicius Costa Gomes @ 2013-03-14 20:41 UTC (permalink / raw)
To: Alex Deymo; +Cc: linux-bluetooth, keybuk, marcel
Hi Alex,
On 13:32 Thu 14 Mar, Alex Deymo wrote:
> Thanks for the comments.
> agent_capability_options[] was intended to be use in
> parse_argument_agent(), but I finally reused agent_arguments[] since
> the two extra cases (on, off) are handled before. I'll fix this (and
> the indentation thing).
>
> > > + if (!arg || !strlen(arg)) {
> > Even if it's not strictly enforced, in userspace code there's a tendency to
> > use explicit checks for NULL and 0.
> >
> > This also applies for the strcmp()'s that are done just bellow.
>
> I'm not sure if I properly understand this comment. If arg is NULL it
> will fall in the first return FALSE, not calling any strcmp() because
> of the lazy or operator, right?
I was referring to the fact that in BlueZ (userspace code) the idiom
"strcmp(x, y) == 0" is more common than "!strcmp(x, y)". But I agree that
I wasn't clear enough.
>
> Alex.
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 3/6] "agent" command capability argument and autocompletion
2013-03-14 20:41 ` Vinicius Costa Gomes
@ 2013-03-14 22:08 ` Alex Deymo
2013-03-15 3:47 ` Alex Deymo
0 siblings, 1 reply; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 22:08 UTC (permalink / raw)
To: Vinicius Costa Gomes; +Cc: linux-bluetooth, keybuk, marcel
>> I'm not sure if I properly understand this comment. If arg is NULL it
>> will fall in the first return FALSE, not calling any strcmp() because
>> of the lazy or operator, right?
>
> I was referring to the fact that in BlueZ (userspace code) the idiom
> "strcmp(x, y) == 0" is more common than "!strcmp(x, y)". But I agree that
> I wasn't clear enough.
Ok, I'll include this fix. I basically copied this style from
parse_argument_on_off(), but I can change it if you want.
Alex.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 3/6] "agent" command capability argument and autocompletion
2013-03-14 22:08 ` Alex Deymo
@ 2013-03-15 3:47 ` Alex Deymo
0 siblings, 0 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-15 3:47 UTC (permalink / raw)
To: vinicius.gomes; +Cc: linux-bluetooth, keybuk, marcel, Alex Deymo
This patch enables argument autocompletion for the agent command with the
list of capabilities an agent can have, adding also "on" (for the default "")
and "off". The command passes the argument (parsing and verifying it) to the
dbus method call.
---
client/main.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 70 insertions(+), 3 deletions(-)
diff --git a/client/main.c b/client/main.c
index 704cf46..30d7aa2 100644
--- a/client/main.c
+++ b/client/main.c
@@ -59,6 +59,17 @@ static GDBusProxy *default_ctrl;
static GList *ctrl_list;
static GList *dev_list;
+static const char* agent_arguments[] = {
+ "on",
+ "off",
+ "DisplayOnly",
+ "DisplayYesNo",
+ "KeyboardDisplay",
+ "KeyboardOnly",
+ "NoInputNoOutput",
+ NULL
+};
+
static void proxy_leak(gpointer data)
{
printf("Leaking proxy %p\n", data);
@@ -413,6 +424,39 @@ static gboolean parse_argument_on_off(const char *arg, dbus_bool_t *value)
return FALSE;
}
+static gboolean parse_argument_agent(const char *arg, dbus_bool_t *value,
+ const char **capability)
+{
+ const char **opt;
+
+ if (arg == NULL || strlen(arg) == 0) {
+ rl_printf("Missing on/off/capability argument\n");
+ return FALSE;
+ }
+
+ if (strcmp(arg, "on") == 0 || strcmp(arg, "yes") == 0) {
+ *value = TRUE;
+ *capability = "";
+ return TRUE;
+ }
+
+ if (strcmp(arg, "off") == 0 || strcmp(arg, "no") == 0) {
+ *value = FALSE;
+ return TRUE;
+ }
+
+ for (opt = agent_arguments; *opt; opt++) {
+ if (strcmp(arg, *opt) == 0) {
+ *value = TRUE;
+ *capability = *opt;
+ return TRUE;
+ }
+ }
+
+ rl_printf("Invalid argument %s\n", arg);
+ return FALSE;
+}
+
static void cmd_list(const char *arg)
{
GList *list;
@@ -610,13 +654,14 @@ static void cmd_discoverable(const char *arg)
static void cmd_agent(const char *arg)
{
dbus_bool_t enable;
+ const char* capability;
- if (parse_argument_on_off(arg, &enable) == FALSE)
+ if (parse_argument_agent(arg, &enable, &capability) == FALSE)
return;
if (enable == TRUE) {
g_free(auto_register_agent);
- auto_register_agent = g_strdup("");
+ auto_register_agent = g_strdup(capability);
if (agent_manager)
agent_register(dbus_conn, agent_manager,
@@ -968,6 +1013,26 @@ static char *dev_generator(const char *text, int state)
return generic_generator(text, state, dev_list, "Address");
}
+static char *capability_generator(const char *text, int state)
+{
+ static int index, len;
+ const char *arg;
+
+ if (!state) {
+ index = 0;
+ len = strlen(text);
+ }
+
+ while ((arg = agent_arguments[index])) {
+ index++;
+
+ if (!strncmp(arg, text, len))
+ return strdup(arg);
+ }
+
+ return NULL;
+}
+
static const struct {
const char *cmd;
const char *arg;
@@ -989,7 +1054,9 @@ static const struct {
"Set controller pairable mode" },
{ "discoverable", "<on/off>", cmd_discoverable,
"Set controller discoverable mode" },
- { "agent", "<on/off>", cmd_agent, "Enable/disable agent" },
+ { "agent", "<on/off/capability>", cmd_agent,
+ "Enable/disable agent with given capability",
+ capability_generator},
{ "default-agent",NULL, cmd_default_agent },
{ "scan", "<on/off>", cmd_scan, "Scan for devices" },
{ "info", "<dev>", cmd_info, "Device information",
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 4/6] Agent's DisplayPincode implementation
2013-03-14 18:22 [PATCH 0/6] bluetoothctl: agent's implementation Alex Deymo
` (2 preceding siblings ...)
2013-03-14 18:22 ` [PATCH 3/6] "agent" command capability argument and autocompletion Alex Deymo
@ 2013-03-14 18:22 ` Alex Deymo
2013-03-14 18:22 ` [PATCH 5/6] Agent's DisplayPasskey implementation Alex Deymo
` (2 subsequent siblings)
6 siblings, 0 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 18:22 UTC (permalink / raw)
To: linux-bluetooth; +Cc: keybuk, marcel, deymo
Implements the DisplayPinCode(object device, string pincode) method.
---
client/agent.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/client/agent.c b/client/agent.c
index fa8b1b2..579ae4e 100644
--- a/client/agent.c
+++ b/client/agent.c
@@ -170,6 +170,20 @@ static DBusMessage *request_pincode(DBusConnection *conn,
return NULL;
}
+static DBusMessage *display_pincode(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ const char *device;
+ const char *pincode;
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
+ DBUS_TYPE_STRING, &pincode, DBUS_TYPE_INVALID);
+
+ rl_printf(AGENT_PROMPT "PIN code: %s\n", pincode);
+
+ return dbus_message_new_method_return(msg);
+}
+
static DBusMessage *request_confirmation(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
@@ -245,6 +259,9 @@ static const GDBusMethodTable methods[] = {
{ GDBUS_ASYNC_METHOD("RequestPinCode",
GDBUS_ARGS({ "device", "o" }),
GDBUS_ARGS({ "pincode", "s" }), request_pincode) },
+ { GDBUS_METHOD("DisplayPinCode",
+ GDBUS_ARGS({ "device", "o" }, { "pincode", "s" }),
+ NULL, display_pincode) },
{ GDBUS_ASYNC_METHOD("RequestConfirmation",
GDBUS_ARGS({ "device", "o" }, { "passkey", "u" }),
NULL, request_confirmation) },
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 5/6] Agent's DisplayPasskey implementation
2013-03-14 18:22 [PATCH 0/6] bluetoothctl: agent's implementation Alex Deymo
` (3 preceding siblings ...)
2013-03-14 18:22 ` [PATCH 4/6] Agent's DisplayPincode implementation Alex Deymo
@ 2013-03-14 18:22 ` Alex Deymo
2013-03-14 19:51 ` Vinicius Costa Gomes
2013-03-14 20:45 ` Anderson Lizardo
2013-03-14 18:22 ` [PATCH 6/6] Agent's RequestPasskey implementation Alex Deymo
2013-03-15 3:52 ` [PATCH 5/6] Agent's DisplayPasskey implementation Alex Deymo
6 siblings, 2 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 18:22 UTC (permalink / raw)
To: linux-bluetooth; +Cc: keybuk, marcel, deymo
Implements the DisplayPasskey(object device, uint32 passkey, uint16 entered)
method.
---
client/agent.c | 30 ++++++++++++++++++++++++++++++
client/display.h | 2 ++
2 files changed, 32 insertions(+)
diff --git a/client/agent.c b/client/agent.c
index 579ae4e..cb710da 100644
--- a/client/agent.c
+++ b/client/agent.c
@@ -184,6 +184,32 @@ static DBusMessage *display_pincode(DBusConnection *conn,
return dbus_message_new_method_return(msg);
}
+static DBusMessage *display_passkey(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ const char *device;
+ dbus_uint32_t passkey;
+ dbus_uint16_t entered;
+ char passkey_entered[7];
+ char passkey_remaining[7];
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
+ DBUS_TYPE_UINT32, &passkey, DBUS_TYPE_UINT16, &entered,
+ DBUS_TYPE_INVALID);
+
+ snprintf(passkey_entered, 7, "%.6u", passkey);
+ passkey_entered[6] = '\0';
+ strncpy(passkey_remaining, passkey_entered, 7);
+ if (entered > strlen(passkey_entered))
+ entered = strlen(passkey_entered);
+ passkey_entered[entered] = '\0';
+
+ rl_printf(AGENT_PROMPT "Passkey: " COLOR_BOLDGRAY "%s" COLOR_BOLDWHITE
+ "%s\n" COLOR_OFF, passkey_entered, passkey_remaining+entered);
+
+ return dbus_message_new_method_return(msg);
+}
+
static DBusMessage *request_confirmation(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
@@ -262,6 +288,10 @@ static const GDBusMethodTable methods[] = {
{ GDBUS_METHOD("DisplayPinCode",
GDBUS_ARGS({ "device", "o" }, { "pincode", "s" }),
NULL, display_pincode) },
+ { GDBUS_METHOD("DisplayPasskey",
+ GDBUS_ARGS({ "device", "o" }, { "passkey", "u" },
+ { "entered", "q" }),
+ NULL, display_passkey) },
{ GDBUS_ASYNC_METHOD("RequestConfirmation",
GDBUS_ARGS({ "device", "o" }, { "passkey", "u" }),
NULL, request_confirmation) },
diff --git a/client/display.h b/client/display.h
index 957bdc6..91a0be9 100644
--- a/client/display.h
+++ b/client/display.h
@@ -26,5 +26,7 @@
#define COLOR_GREEN "\x1B[0;92m"
#define COLOR_YELLOW "\x1B[0;93m"
#define COLOR_BLUE "\x1B[0;94m"
+#define COLOR_BOLDGRAY "\x1B[1;30m"
+#define COLOR_BOLDWHITE "\x1B[1;37m"
void rl_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH 5/6] Agent's DisplayPasskey implementation
2013-03-14 18:22 ` [PATCH 5/6] Agent's DisplayPasskey implementation Alex Deymo
@ 2013-03-14 19:51 ` Vinicius Costa Gomes
2013-03-14 20:45 ` Anderson Lizardo
1 sibling, 0 replies; 19+ messages in thread
From: Vinicius Costa Gomes @ 2013-03-14 19:51 UTC (permalink / raw)
To: Alex Deymo; +Cc: linux-bluetooth, keybuk, marcel
Hi Alex,
On 11:22 Thu 14 Mar, Alex Deymo wrote:
> Implements the DisplayPasskey(object device, uint32 passkey, uint16 entered)
> method.
> ---
> client/agent.c | 30 ++++++++++++++++++++++++++++++
> client/display.h | 2 ++
> 2 files changed, 32 insertions(+)
>
> diff --git a/client/agent.c b/client/agent.c
> index 579ae4e..cb710da 100644
> --- a/client/agent.c
> +++ b/client/agent.c
> @@ -184,6 +184,32 @@ static DBusMessage *display_pincode(DBusConnection *conn,
> return dbus_message_new_method_return(msg);
> }
>
> +static DBusMessage *display_passkey(DBusConnection *conn,
> + DBusMessage *msg, void *user_data)
> +{
> + const char *device;
> + dbus_uint32_t passkey;
> + dbus_uint16_t entered;
> + char passkey_entered[7];
> + char passkey_remaining[7];
> +
> + dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
> + DBUS_TYPE_UINT32, &passkey, DBUS_TYPE_UINT16, &entered,
> + DBUS_TYPE_INVALID);
> +
> + snprintf(passkey_entered, 7, "%.6u", passkey);
> + passkey_entered[6] = '\0';
> + strncpy(passkey_remaining, passkey_entered, 7);
> + if (entered > strlen(passkey_entered))
> + entered = strlen(passkey_entered);
> + passkey_entered[entered] = '\0';
Some empty lines in this block please.
> +
> + rl_printf(AGENT_PROMPT "Passkey: " COLOR_BOLDGRAY "%s" COLOR_BOLDWHITE
> + "%s\n" COLOR_OFF, passkey_entered, passkey_remaining+entered);
> +
> + return dbus_message_new_method_return(msg);
> +}
> +
> static DBusMessage *request_confirmation(DBusConnection *conn,
> DBusMessage *msg, void *user_data)
> {
> @@ -262,6 +288,10 @@ static const GDBusMethodTable methods[] = {
> { GDBUS_METHOD("DisplayPinCode",
> GDBUS_ARGS({ "device", "o" }, { "pincode", "s" }),
> NULL, display_pincode) },
> + { GDBUS_METHOD("DisplayPasskey",
> + GDBUS_ARGS({ "device", "o" }, { "passkey", "u" },
> + { "entered", "q" }),
> + NULL, display_passkey) },
> { GDBUS_ASYNC_METHOD("RequestConfirmation",
> GDBUS_ARGS({ "device", "o" }, { "passkey", "u" }),
> NULL, request_confirmation) },
> diff --git a/client/display.h b/client/display.h
> index 957bdc6..91a0be9 100644
> --- a/client/display.h
> +++ b/client/display.h
> @@ -26,5 +26,7 @@
> #define COLOR_GREEN "\x1B[0;92m"
> #define COLOR_YELLOW "\x1B[0;93m"
> #define COLOR_BLUE "\x1B[0;94m"
> +#define COLOR_BOLDGRAY "\x1B[1;30m"
> +#define COLOR_BOLDWHITE "\x1B[1;37m"
>
> void rl_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
> --
> 1.8.1.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH 5/6] Agent's DisplayPasskey implementation
2013-03-14 18:22 ` [PATCH 5/6] Agent's DisplayPasskey implementation Alex Deymo
2013-03-14 19:51 ` Vinicius Costa Gomes
@ 2013-03-14 20:45 ` Anderson Lizardo
1 sibling, 0 replies; 19+ messages in thread
From: Anderson Lizardo @ 2013-03-14 20:45 UTC (permalink / raw)
To: Alex Deymo; +Cc: linux-bluetooth, keybuk, marcel
Hi Alex,
On Thu, Mar 14, 2013 at 2:22 PM, Alex Deymo <deymo@chromium.org> wrote:
> + dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
> + DBUS_TYPE_UINT32, &passkey, DBUS_TYPE_UINT16, &entered,
> + DBUS_TYPE_INVALID);
> +
> + snprintf(passkey_entered, 7, "%.6u", passkey);
> + passkey_entered[6] = '\0';
> + strncpy(passkey_remaining, passkey_entered, 7);
> + if (entered > strlen(passkey_entered))
> + entered = strlen(passkey_entered);
> + passkey_entered[entered] = '\0';
> +
> + rl_printf(AGENT_PROMPT "Passkey: " COLOR_BOLDGRAY "%s" COLOR_BOLDWHITE
> + "%s\n" COLOR_OFF, passkey_entered, passkey_remaining+entered);
> +
> + return dbus_message_new_method_return(msg);
> +}
> +
What about using the "%.*s" printf format specifier to simplify
things? Something like (not tested):
snprintf(passkey_full, sizeof(passkey_full), "%.6u", passkey);
passkey_full[6] = '\0';
if (entered > strlen(passkey_full))
entered = strlen(passkey_full);
rl_printf(AGENT_PROMPT "Passkey: " COLOR_BOLDGRAY "%.*s" COLOR_BOLDWHITE
"%s\n" COLOR_OFF, entered, passkey_full, passkey_full + entered);
Best Regards,
--
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH 6/6] Agent's RequestPasskey implementation
2013-03-14 18:22 [PATCH 0/6] bluetoothctl: agent's implementation Alex Deymo
` (4 preceding siblings ...)
2013-03-14 18:22 ` [PATCH 5/6] Agent's DisplayPasskey implementation Alex Deymo
@ 2013-03-14 18:22 ` Alex Deymo
2013-03-15 3:54 ` Alex Deymo
2013-03-15 3:52 ` [PATCH 5/6] Agent's DisplayPasskey implementation Alex Deymo
6 siblings, 1 reply; 19+ messages in thread
From: Alex Deymo @ 2013-03-14 18:22 UTC (permalink / raw)
To: linux-bluetooth; +Cc: keybuk, marcel, deymo
Implements the uint32 RequestPasskey(object device) method.
---
client/agent.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/client/agent.c b/client/agent.c
index cb710da..fbc8045 100644
--- a/client/agent.c
+++ b/client/agent.c
@@ -92,6 +92,20 @@ static void pincode_response(DBusConnection *conn, const char *input)
DBUS_TYPE_INVALID);
}
+static void passkey_response(DBusConnection *conn, const char *input)
+{
+ dbus_uint32_t passkey;
+ if (sscanf(input, "%u", &passkey) == 1)
+ g_dbus_send_reply(conn, pending_message, DBUS_TYPE_UINT32,
+ &passkey, DBUS_TYPE_INVALID);
+ else if (!strcmp(input, "no"))
+ g_dbus_send_error(conn, pending_message,
+ "org.bluez.Error.Rejected", NULL);
+ else
+ g_dbus_send_error(conn, pending_message,
+ "org.bluez.Error.Canceled", NULL);
+}
+
static void confirm_response(DBusConnection *conn, const char *input)
{
if (!strcmp(input, "yes"))
@@ -117,6 +131,8 @@ dbus_bool_t agent_input(DBusConnection *conn, const char *input)
if (!strcmp(member, "RequestPinCode"))
pincode_response(conn, input);
+ else if (!strcmp(member, "RequestPasskey"))
+ passkey_response(conn, input);
else if (!strcmp(member, "RequestConfirmation"))
confirm_response(conn, input);
else if (!strcmp(member, "RequestAuthorization"))
@@ -184,6 +200,23 @@ static DBusMessage *display_pincode(DBusConnection *conn,
return dbus_message_new_method_return(msg);
}
+static DBusMessage *request_passkey(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ const char *device;
+
+ rl_printf("Request passkey\n");
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
+ DBUS_TYPE_INVALID);
+
+ rl_agent_prompt("Enter passkey (number in 0-999999): ");
+
+ pending_message = dbus_message_ref(msg);
+
+ return NULL;
+}
+
static DBusMessage *display_passkey(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
@@ -288,6 +321,9 @@ static const GDBusMethodTable methods[] = {
{ GDBUS_METHOD("DisplayPinCode",
GDBUS_ARGS({ "device", "o" }, { "pincode", "s" }),
NULL, display_pincode) },
+ { GDBUS_ASYNC_METHOD("RequestPasskey",
+ GDBUS_ARGS({ "device", "o" }),
+ GDBUS_ARGS({ "passkey", "u" }), request_passkey) },
{ GDBUS_METHOD("DisplayPasskey",
GDBUS_ARGS({ "device", "o" }, { "passkey", "u" },
{ "entered", "q" }),
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 6/6] Agent's RequestPasskey implementation
2013-03-14 18:22 ` [PATCH 6/6] Agent's RequestPasskey implementation Alex Deymo
@ 2013-03-15 3:54 ` Alex Deymo
0 siblings, 0 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-15 3:54 UTC (permalink / raw)
To: linux-bluetooth; +Cc: keybuk, marcel, Alex Deymo
Implements the uint32 RequestPasskey(object device) method.
---
client/agent.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/client/agent.c b/client/agent.c
index 00754df..29769fd 100644
--- a/client/agent.c
+++ b/client/agent.c
@@ -94,6 +94,20 @@ static void pincode_response(DBusConnection *conn, const char *input)
DBUS_TYPE_INVALID);
}
+static void passkey_response(DBusConnection *conn, const char *input)
+{
+ dbus_uint32_t passkey;
+ if (sscanf(input, "%u", &passkey) == 1)
+ g_dbus_send_reply(conn, pending_message, DBUS_TYPE_UINT32,
+ &passkey, DBUS_TYPE_INVALID);
+ else if (!strcmp(input, "no"))
+ g_dbus_send_error(conn, pending_message,
+ "org.bluez.Error.Rejected", NULL);
+ else
+ g_dbus_send_error(conn, pending_message,
+ "org.bluez.Error.Canceled", NULL);
+}
+
static void confirm_response(DBusConnection *conn, const char *input)
{
if (!strcmp(input, "yes"))
@@ -119,6 +133,8 @@ dbus_bool_t agent_input(DBusConnection *conn, const char *input)
if (!strcmp(member, "RequestPinCode"))
pincode_response(conn, input);
+ else if (!strcmp(member, "RequestPasskey"))
+ passkey_response(conn, input);
else if (!strcmp(member, "RequestConfirmation"))
confirm_response(conn, input);
else if (!strcmp(member, "RequestAuthorization"))
@@ -186,6 +202,23 @@ static DBusMessage *display_pincode(DBusConnection *conn,
return dbus_message_new_method_return(msg);
}
+static DBusMessage *request_passkey(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ const char *device;
+
+ rl_printf("Request passkey\n");
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
+ DBUS_TYPE_INVALID);
+
+ agent_prompt("Enter passkey (number in 0-999999): ");
+
+ pending_message = dbus_message_ref(msg);
+
+ return NULL;
+}
+
static DBusMessage *display_passkey(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
@@ -289,6 +322,9 @@ static const GDBusMethodTable methods[] = {
{ GDBUS_METHOD("DisplayPinCode",
GDBUS_ARGS({ "device", "o" }, { "pincode", "s" }),
NULL, display_pincode) },
+ { GDBUS_ASYNC_METHOD("RequestPasskey",
+ GDBUS_ARGS({ "device", "o" }),
+ GDBUS_ARGS({ "passkey", "u" }), request_passkey) },
{ GDBUS_METHOD("DisplayPasskey",
GDBUS_ARGS({ "device", "o" }, { "passkey", "u" },
{ "entered", "q" }),
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 5/6] Agent's DisplayPasskey implementation
2013-03-14 18:22 [PATCH 0/6] bluetoothctl: agent's implementation Alex Deymo
` (5 preceding siblings ...)
2013-03-14 18:22 ` [PATCH 6/6] Agent's RequestPasskey implementation Alex Deymo
@ 2013-03-15 3:52 ` Alex Deymo
6 siblings, 0 replies; 19+ messages in thread
From: Alex Deymo @ 2013-03-15 3:52 UTC (permalink / raw)
To: vinicius.gomes, anderson.lizardo
Cc: linux-bluetooth, keybuk, marcel, Alex Deymo
Implements the DisplayPasskey(object device, uint32 passkey, uint16 entered)
method.
---
client/agent.c | 29 +++++++++++++++++++++++++++++
client/display.h | 2 ++
2 files changed, 31 insertions(+)
diff --git a/client/agent.c b/client/agent.c
index 1414eba..00754df 100644
--- a/client/agent.c
+++ b/client/agent.c
@@ -186,6 +186,31 @@ static DBusMessage *display_pincode(DBusConnection *conn,
return dbus_message_new_method_return(msg);
}
+static DBusMessage *display_passkey(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ const char *device;
+ dbus_uint32_t passkey;
+ dbus_uint16_t entered;
+ char passkey_full[7];
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device,
+ DBUS_TYPE_UINT32, &passkey, DBUS_TYPE_UINT16, &entered,
+ DBUS_TYPE_INVALID);
+
+ snprintf(passkey_full, sizeof(passkey_full), "%.6u", passkey);
+ passkey_full[6] = '\0';
+
+ if (entered > strlen(passkey_full))
+ entered = strlen(passkey_full);
+
+ rl_printf(AGENT_PROMPT "Passkey: "
+ COLOR_BOLDGRAY "%.*s" COLOR_BOLDWHITE "%s\n" COLOR_OFF,
+ entered, passkey_full, passkey_full + entered);
+
+ return dbus_message_new_method_return(msg);
+}
+
static DBusMessage *request_confirmation(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
@@ -264,6 +289,10 @@ static const GDBusMethodTable methods[] = {
{ GDBUS_METHOD("DisplayPinCode",
GDBUS_ARGS({ "device", "o" }, { "pincode", "s" }),
NULL, display_pincode) },
+ { GDBUS_METHOD("DisplayPasskey",
+ GDBUS_ARGS({ "device", "o" }, { "passkey", "u" },
+ { "entered", "q" }),
+ NULL, display_passkey) },
{ GDBUS_ASYNC_METHOD("RequestConfirmation",
GDBUS_ARGS({ "device", "o" }, { "passkey", "u" }),
NULL, request_confirmation) },
diff --git a/client/display.h b/client/display.h
index 957bdc6..91a0be9 100644
--- a/client/display.h
+++ b/client/display.h
@@ -26,5 +26,7 @@
#define COLOR_GREEN "\x1B[0;92m"
#define COLOR_YELLOW "\x1B[0;93m"
#define COLOR_BLUE "\x1B[0;94m"
+#define COLOR_BOLDGRAY "\x1B[1;30m"
+#define COLOR_BOLDWHITE "\x1B[1;37m"
void rl_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
--
1.8.1.3
^ permalink raw reply related [flat|nested] 19+ messages in thread