You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/05/04 23:48:59 UTC
incubator-mynewt-core git commit: bletiny - compile out tk commands
if no security.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop a4ee38418 -> 2a4c415c8
bletiny - compile out tk commands if no security.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/2a4c415c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/2a4c415c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/2a4c415c
Branch: refs/heads/develop
Commit: 2a4c415c8dea50d1355e35e09b6f55ab75d2d313
Parents: a4ee384
Author: Christopher Collins <cc...@apache.org>
Authored: Wed May 4 16:48:38 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed May 4 16:48:38 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/cmd.c | 87 ++++++++++++++++++++++++---------------------
1 file changed, 46 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/2a4c415c/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index f6fc26f..b5c905d 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -1507,56 +1507,61 @@ cmd_write(int argc, char **argv)
return 0;
}
+
/*****************************************************************************
* $passkey *
*****************************************************************************/
- static int
- cmd_passkey(int argc, char **argv)
- {
- uint16_t conn_handle;
- struct passkey_action pk;
- int rc;
-
- conn_handle = parse_arg_uint16("conn", &rc);
- if (rc != 0) {
- return rc;
- }
-
- pk.action = parse_arg_uint16("action", &rc);
- if (rc != 0) {
- return rc;
- }
-
- switch(pk.action) {
- case PKACT_INPUT:
- case PKACK_GEN_DISP:
- /* passkey is 6 digit number */
- pk.passkey = parse_arg_long_bounds("key", 0, 999999, &rc);
+static int
+cmd_passkey(int argc, char **argv)
+{
+#if !NIMBLE_OPT_SM
+ return BLE_HS_ENOTSUP;
+#endif
+
+ uint16_t conn_handle;
+ struct passkey_action pk;
+ int rc;
+
+ conn_handle = parse_arg_uint16("conn", &rc);
+ if (rc != 0) {
+ return rc;
+ }
+
+ pk.action = parse_arg_uint16("action", &rc);
+ if (rc != 0) {
+ return rc;
+ }
+
+ switch(pk.action) {
+ case PKACT_INPUT:
+ case PKACK_GEN_DISP:
+ /* passkey is 6 digit number */
+ pk.passkey = parse_arg_long_bounds("key", 0, 999999, &rc);
+ if (rc != 0) {
+ return rc;
+ }
+ break;
+
+ case PKACT_OOB:
+ rc = parse_arg_byte_stream_exact_length("oob", pk.oob, 16);
if (rc != 0) {
return rc;
}
break;
+ default:
+ console_printf("invalid passkey action action=%d\n", pk.action);
+ return EINVAL;
+ }
- case PKACT_OOB:
- rc = parse_arg_byte_stream_exact_length("oob", pk.oob, 16);
- if (rc != 0) {
- return rc;
- }
- break;
- default:
- console_printf("invalid passkey action action=%d\n", pk.action);
- return EINVAL;
- }
-
- rc = ble_l2cap_sm_set_tk(conn_handle, &pk);
- if (rc != 0) {
- console_printf("error providing passkey; rc=%d\n", rc);
- return rc;
- }
-
- return 0;
- }
+ rc = ble_l2cap_sm_set_tk(conn_handle, &pk);
+ if (rc != 0) {
+ console_printf("error providing passkey; rc=%d\n", rc);
+ return rc;
+ }
+
+ return 0;
+}
/*****************************************************************************
* $init *