michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: shell: Handle error code of bt_conn_auth_cb_register

Browse source 
Fix issue with registering authentication callback handlers failing
without notifying the user of the shell.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-08-05 12:51:47 +02:00 • committed by Carles Cufí
commit 90706a8217
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
subsys/bluetooth/shell/bt.c
View file

@ -1308,24 +1308,26 @@ static struct bt_conn_auth_cb auth_cb_all = {
static int cmd_auth(const struct shell *shell, size_t argc, char *argv[]) static int cmd_auth(const struct shell *shell, size_t argc, char *argv[])
{ {
int err;
if (!strcmp(argv[1], "all")) { if (!strcmp(argv[1], "all")) {
bt_conn_auth_cb_register(&auth_cb_all); err = bt_conn_auth_cb_register(&auth_cb_all);
} else if (!strcmp(argv[1], "input")) { } else if (!strcmp(argv[1], "input")) {
bt_conn_auth_cb_register(&auth_cb_input); err = bt_conn_auth_cb_register(&auth_cb_input);
} else if (!strcmp(argv[1], "display")) { } else if (!strcmp(argv[1], "display")) {
bt_conn_auth_cb_register(&auth_cb_display); err = bt_conn_auth_cb_register(&auth_cb_display);
} else if (!strcmp(argv[1], "yesno")) { } else if (!strcmp(argv[1], "yesno")) {
bt_conn_auth_cb_register(&auth_cb_display_yes_no); err = bt_conn_auth_cb_register(&auth_cb_display_yes_no);
} else if (!strcmp(argv[1], "confirm")) { } else if (!strcmp(argv[1], "confirm")) {
bt_conn_auth_cb_register(&auth_cb_confirm); err = bt_conn_auth_cb_register(&auth_cb_confirm);
} else if (!strcmp(argv[1], "none")) { } else if (!strcmp(argv[1], "none")) {
bt_conn_auth_cb_register(NULL); err = bt_conn_auth_cb_register(NULL);
} else { } else {
shell_help(shell); shell_help(shell);
return SHELL_CMD_HELP_PRINTED; return SHELL_CMD_HELP_PRINTED;
} }
return 0; return err;
} }
static int cmd_auth_cancel(const struct shell *shell, static int cmd_auth_cancel(const struct shell *shell,