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/06/15 02:27:25 UTC
[03/50] [abbrv] incubator-mynewt-core git commit: bletiny - allow
peer addr in undirected adv.
bletiny - allow peer addr in undirected adv.
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/c312da67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c312da67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c312da67
Branch: refs/heads/develop
Commit: c312da67c2781e85e76b928e3dd99a56214ec0ed
Parents: 3550530
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Jun 7 18:23:18 2016 +0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Jun 14 19:23:33 2016 -0700
----------------------------------------------------------------------
apps/bletiny/src/cmd.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c312da67/apps/bletiny/src/cmd.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/cmd.c b/apps/bletiny/src/cmd.c
index c9e38a9..178aeca 100644
--- a/apps/bletiny/src/cmd.c
+++ b/apps/bletiny/src/cmd.c
@@ -297,20 +297,17 @@ cmd_adv(int argc, char **argv)
return -1;
}
- if (conn == BLE_GAP_CONN_MODE_DIR) {
- addr_type = parse_arg_kv_default
- ("peer_addr_type", cmd_adv_addr_types, BLE_ADDR_TYPE_PUBLIC);
- if (addr_type == -1) {
- return -1;
- }
+ addr_type = parse_arg_kv_default
+ ("peer_addr_type", cmd_adv_addr_types, BLE_ADDR_TYPE_PUBLIC);
+ if (addr_type == -1) {
+ return -1;
+ }
- rc = parse_arg_mac("addr", peer_addr);
- if (rc != 0) {
- return rc;
- }
- } else {
- addr_type = BLE_ADDR_TYPE_PUBLIC;
+ rc = parse_arg_mac("peer_addr", peer_addr);
+ if (rc == ENOENT) {
memset(peer_addr, 0, sizeof peer_addr);
+ } else if (rc != 0) {
+ return rc;
}
peer_addr_type = addr_type;