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/08 01:37:10 UTC
[4/4] incubator-mynewt-core git commit: BLE Host - rename
effective->ota; identity->id
BLE Host - rename effective->ota; identity->id
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/f935a799
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f935a799
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f935a799
Branch: refs/heads/upf54
Commit: f935a799ad3f645e421a008bc35a71acd4e4030d
Parents: d710074
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Jun 8 08:45:23 2016 +0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Jun 8 09:36:50 2016 +0800
----------------------------------------------------------------------
apps/bletiny/src/misc.c | 10 +--
net/nimble/host/include/host/ble_gap.h | 4 +-
net/nimble/host/src/ble_gap.c | 10 +--
net/nimble/host/src/ble_hs_conn.c | 100 ++++++++++++++--------------
net/nimble/host/src/ble_hs_conn_priv.h | 16 ++---
net/nimble/host/src/ble_sm.c | 16 ++---
net/nimble/host/src/ble_sm_sc.c | 32 ++++-----
7 files changed, 94 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f935a799/apps/bletiny/src/misc.c
----------------------------------------------------------------------
diff --git a/apps/bletiny/src/misc.c b/apps/bletiny/src/misc.c
index a96a388..ecfcd9a 100644
--- a/apps/bletiny/src/misc.c
+++ b/apps/bletiny/src/misc.c
@@ -96,11 +96,11 @@ chr_is_empty(struct bletiny_svc *svc, struct bletiny_chr *chr)
void
print_conn_desc(struct ble_gap_conn_desc *desc)
{
- console_printf("handle=%d peer_effective_addr_type=%d "
- "peer_effective_addr=",
- desc->conn_handle, desc->peer_effective_addr_type);
- print_addr(desc->peer_effective_addr);
- console_printf(" peer_identity_addr_type=%d peer_identity_addr=",
+ console_printf("handle=%d peer_ota_addr_type=%d "
+ "peer_ota_addr=",
+ desc->conn_handle, desc->peer_ota_addr_type);
+ print_addr(desc->peer_ota_addr);
+ console_printf(" peer_id_addr_type=%d peer_id_addr=",
desc->peer_id_addr_type);
print_addr(desc->peer_id_addr);
console_printf(" conn_itvl=%d conn_latency=%d supervision_timeout=%d "
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f935a799/net/nimble/host/include/host/ble_gap.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/include/host/ble_gap.h b/net/nimble/host/include/host/ble_gap.h
index a2ff51c..dce7802 100644
--- a/net/nimble/host/include/host/ble_gap.h
+++ b/net/nimble/host/include/host/ble_gap.h
@@ -119,13 +119,13 @@ struct ble_gap_adv_params {
struct ble_gap_conn_desc {
struct ble_gap_sec_state sec_state;
- uint8_t peer_effective_addr[6];
+ uint8_t peer_ota_addr[6];
uint8_t peer_id_addr[6];
uint16_t conn_handle;
uint16_t conn_itvl;
uint16_t conn_latency;
uint16_t supervision_timeout;
- uint8_t peer_effective_addr_type;
+ uint8_t peer_ota_addr_type;
uint8_t peer_id_addr_type;
};
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f935a799/net/nimble/host/src/ble_gap.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_gap.c b/net/nimble/host/src/ble_gap.c
index 8b7e632..879df6c 100644
--- a/net/nimble/host/src/ble_gap.c
+++ b/net/nimble/host/src/ble_gap.c
@@ -273,18 +273,18 @@ static void
ble_gap_fill_conn_desc(struct ble_hs_conn *conn,
struct ble_gap_conn_desc *desc)
{
- uint8_t *peer_effective_addr;
+ uint8_t *peer_ota_addr;
uint8_t *peer_id_addr;
- uint8_t *our_effective_addr;
+ uint8_t *our_ota_addr;
ble_hs_conn_addrs(conn,
- NULL, &our_effective_addr,
+ NULL, &our_ota_addr,
NULL, NULL,
- &desc->peer_effective_addr_type, &peer_effective_addr,
+ &desc->peer_ota_addr_type, &peer_ota_addr,
&desc->peer_id_addr_type, &peer_id_addr);
desc->conn_handle = conn->bhc_handle;
- memcpy(desc->peer_effective_addr, peer_effective_addr, 6);
+ memcpy(desc->peer_ota_addr, peer_ota_addr, 6);
memcpy(desc->peer_id_addr, peer_id_addr, 6);
desc->conn_itvl = conn->bhc_itvl;
desc->conn_latency = conn->bhc_latency;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f935a799/net/nimble/host/src/ble_hs_conn.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_conn.c b/net/nimble/host/src/ble_hs_conn.c
index 07550ec..967e8b3 100644
--- a/net/nimble/host/src/ble_hs_conn.c
+++ b/net/nimble/host/src/ble_hs_conn.c
@@ -317,70 +317,70 @@ ble_hs_conn_first(void)
void
ble_hs_conn_addrs(struct ble_hs_conn *conn,
- uint8_t *out_our_effective_addr_type,
- uint8_t **out_our_effective_addr,
- uint8_t *out_our_identity_addr_type,
- uint8_t **out_our_identity_addr,
- uint8_t *out_peer_effective_addr_type,
- uint8_t **out_peer_effective_addr,
- uint8_t *out_peer_identity_addr_type,
- uint8_t **out_peer_identity_addr)
+ uint8_t *out_our_ota_addr_type,
+ uint8_t **out_our_ota_addr,
+ uint8_t *out_our_id_addr_type,
+ uint8_t **out_our_id_addr,
+ uint8_t *out_peer_ota_addr_type,
+ uint8_t **out_peer_ota_addr,
+ uint8_t *out_peer_id_addr_type,
+ uint8_t **out_peer_id_addr)
{
- uint8_t peer_effective_addr_type;
- uint8_t peer_identity_addr_type;
- uint8_t our_effective_addr_type;
- uint8_t our_identity_addr_type;
- uint8_t *peer_effective_addr;
- uint8_t *peer_identity_addr;
- uint8_t *our_effective_addr;
- uint8_t *our_identity_addr;
+ uint8_t peer_ota_addr_type;
+ uint8_t peer_id_addr_type;
+ uint8_t our_ota_addr_type;
+ uint8_t our_id_addr_type;
+ uint8_t *peer_ota_addr;
+ uint8_t *peer_id_addr;
+ uint8_t *our_ota_addr;
+ uint8_t *our_id_addr;
/* Determine our address information. */
- our_identity_addr =
- bls_hs_priv_get_local_identity_addr(&our_identity_addr_type);
+ our_id_addr =
+ bls_hs_priv_get_local_identity_addr(&our_id_addr_type);
if (memcmp(conn->our_rpa_addr, ble_hs_conn_null_addr, 6) == 0) {
- our_effective_addr_type = our_identity_addr_type;
- our_effective_addr = our_identity_addr;
+ our_ota_addr_type = our_id_addr_type;
+ our_ota_addr = our_id_addr;
} else {
- switch (our_identity_addr_type) {
+ switch (our_id_addr_type) {
case BLE_ADDR_TYPE_PUBLIC:
- our_effective_addr_type = BLE_ADDR_TYPE_RPA_PUB_DEFAULT;
+ our_ota_addr_type = BLE_ADDR_TYPE_RPA_PUB_DEFAULT;
break;
case BLE_ADDR_TYPE_RANDOM:
- our_effective_addr_type = BLE_ADDR_TYPE_RPA_RND_DEFAULT;
+ our_ota_addr_type = BLE_ADDR_TYPE_RPA_RND_DEFAULT;
break;
default:
BLE_HS_DBG_ASSERT(0);
}
- our_effective_addr = conn->our_rpa_addr;
+ our_ota_addr = conn->our_rpa_addr;
}
/* Determine peer address information. */
- peer_effective_addr_type = conn->bhc_addr_type;
- peer_identity_addr = conn->bhc_addr;
+ peer_ota_addr_type = conn->bhc_addr_type;
+ peer_id_addr = conn->bhc_addr;
switch (conn->bhc_addr_type) {
case BLE_ADDR_TYPE_PUBLIC:
- peer_identity_addr_type = BLE_ADDR_TYPE_PUBLIC;
- peer_effective_addr = conn->bhc_addr;
+ peer_id_addr_type = BLE_ADDR_TYPE_PUBLIC;
+ peer_ota_addr = conn->bhc_addr;
break;
case BLE_ADDR_TYPE_RANDOM:
- peer_identity_addr_type = BLE_ADDR_TYPE_RANDOM;
- peer_effective_addr = conn->bhc_addr;
+ peer_id_addr_type = BLE_ADDR_TYPE_RANDOM;
+ peer_ota_addr = conn->bhc_addr;
break;
case BLE_ADDR_TYPE_RPA_PUB_DEFAULT:
- peer_identity_addr_type = BLE_ADDR_TYPE_PUBLIC;
- peer_effective_addr = conn->peer_rpa_addr;
+ peer_id_addr_type = BLE_ADDR_TYPE_PUBLIC;
+ peer_ota_addr = conn->peer_rpa_addr;
break;
case BLE_ADDR_TYPE_RPA_RND_DEFAULT:
- peer_identity_addr_type = BLE_ADDR_TYPE_RANDOM;
- peer_effective_addr = conn->peer_rpa_addr;
+ peer_id_addr_type = BLE_ADDR_TYPE_RANDOM;
+ peer_ota_addr = conn->peer_rpa_addr;
break;
default:
@@ -388,29 +388,29 @@ ble_hs_conn_addrs(struct ble_hs_conn *conn,
break;
}
- if (out_our_effective_addr_type != NULL) {
- *out_our_effective_addr_type = our_effective_addr_type;
+ if (out_our_ota_addr_type != NULL) {
+ *out_our_ota_addr_type = our_ota_addr_type;
}
- if (out_our_effective_addr != NULL) {
- *out_our_effective_addr = our_effective_addr;
+ if (out_our_ota_addr != NULL) {
+ *out_our_ota_addr = our_ota_addr;
}
- if (out_our_identity_addr_type != NULL) {
- *out_our_identity_addr_type = our_identity_addr_type;
+ if (out_our_id_addr_type != NULL) {
+ *out_our_id_addr_type = our_id_addr_type;
}
- if (out_our_identity_addr != NULL) {
- *out_our_identity_addr = our_identity_addr;
+ if (out_our_id_addr != NULL) {
+ *out_our_id_addr = our_id_addr;
}
- if (out_peer_effective_addr_type != NULL) {
- *out_peer_effective_addr_type = peer_effective_addr_type;
+ if (out_peer_ota_addr_type != NULL) {
+ *out_peer_ota_addr_type = peer_ota_addr_type;
}
- if (out_peer_effective_addr != NULL) {
- *out_peer_effective_addr = peer_effective_addr;
+ if (out_peer_ota_addr != NULL) {
+ *out_peer_ota_addr = peer_ota_addr;
}
- if (out_peer_identity_addr_type != NULL) {
- *out_peer_identity_addr_type = peer_identity_addr_type;
+ if (out_peer_id_addr_type != NULL) {
+ *out_peer_id_addr_type = peer_id_addr_type;
}
- if (out_peer_identity_addr != NULL) {
- *out_peer_identity_addr = peer_identity_addr;
+ if (out_peer_id_addr != NULL) {
+ *out_peer_id_addr = peer_id_addr;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f935a799/net/nimble/host/src/ble_hs_conn_priv.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_conn_priv.h b/net/nimble/host/src/ble_hs_conn_priv.h
index 1ef4829..e6d940e 100644
--- a/net/nimble/host/src/ble_hs_conn_priv.h
+++ b/net/nimble/host/src/ble_hs_conn_priv.h
@@ -76,14 +76,14 @@ struct ble_l2cap_chan *ble_hs_conn_chan_find(struct ble_hs_conn *conn,
int ble_hs_conn_chan_insert(struct ble_hs_conn *conn,
struct ble_l2cap_chan *chan);
void ble_hs_conn_addrs(struct ble_hs_conn *conn,
- uint8_t *our_effective_addr_type,
- uint8_t **our_effective_addr,
- uint8_t *our_identity_addr_type,
- uint8_t **our_identity_addr,
- uint8_t *peer_effective_addr_type,
- uint8_t **peer_effective_addr,
- uint8_t *peer_identity_addr_type,
- uint8_t **peer_identity_addr);
+ uint8_t *our_ota_addr_type,
+ uint8_t **our_ota_addr,
+ uint8_t *our_id_addr_type,
+ uint8_t **our_id_addr,
+ uint8_t *peer_ota_addr_type,
+ uint8_t **peer_ota_addr,
+ uint8_t *peer_id_addr_type,
+ uint8_t **peer_id_addr);
int ble_hs_conn_init(void);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f935a799/net/nimble/host/src/ble_sm.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_sm.c b/net/nimble/host/src/ble_sm.c
index 1189bb5..68c0c0d 100644
--- a/net/nimble/host/src/ble_sm.c
+++ b/net/nimble/host/src/ble_sm.c
@@ -527,8 +527,8 @@ ble_sm_ia_ra(struct ble_sm_proc *proc,
uint8_t *out_rat, uint8_t *out_ra)
{
struct ble_hs_conn *conn;
- uint8_t *peer_effective_addr;
- uint8_t *our_effective_addr;
+ uint8_t *peer_ota_addr;
+ uint8_t *our_ota_addr;
uint8_t peer_id_addr_type;
uint8_t our_id_addr_type;
@@ -538,23 +538,23 @@ ble_sm_ia_ra(struct ble_sm_proc *proc,
}
ble_hs_conn_addrs(conn,
- NULL, &our_effective_addr,
+ NULL, &our_ota_addr,
&our_id_addr_type, NULL,
- NULL, &peer_effective_addr,
+ NULL, &peer_ota_addr,
&peer_id_addr_type, NULL);
if (proc->flags & BLE_SM_PROC_F_INITIATOR) {
*out_iat = our_id_addr_type;
- memcpy(out_ia, our_effective_addr, 6);
+ memcpy(out_ia, our_ota_addr, 6);
*out_rat = peer_id_addr_type;
- memcpy(out_ra, peer_effective_addr, 6);
+ memcpy(out_ra, peer_ota_addr, 6);
} else {
*out_iat = peer_id_addr_type;
- memcpy(out_ia, peer_effective_addr, 6);
+ memcpy(out_ia, peer_ota_addr, 6);
*out_rat = our_id_addr_type;
- memcpy(out_ra, our_effective_addr, 6);
+ memcpy(out_ra, our_ota_addr, 6);
}
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f935a799/net/nimble/host/src/ble_sm_sc.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_sm_sc.c b/net/nimble/host/src/ble_sm_sc.c
index 5939916..5405eaa 100644
--- a/net/nimble/host/src/ble_sm_sc.c
+++ b/net/nimble/host/src/ble_sm_sc.c
@@ -523,9 +523,9 @@ ble_sm_sc_public_key_rx(uint16_t conn_handle, uint8_t op, struct os_mbuf **om,
static int
ble_sm_sc_dhkey_addrs(struct ble_sm_proc *proc,
uint8_t *out_our_id_addr_type,
- uint8_t **out_our_effective_addr,
+ uint8_t **out_our_ota_addr,
uint8_t *out_peer_id_addr_type,
- uint8_t **out_peer_effective_addr)
+ uint8_t **out_peer_ota_addr)
{
struct ble_hs_conn *conn;
@@ -535,9 +535,9 @@ ble_sm_sc_dhkey_addrs(struct ble_sm_proc *proc,
}
ble_hs_conn_addrs(conn,
- NULL, out_our_effective_addr,
+ NULL, out_our_ota_addr,
out_our_id_addr_type, NULL,
- NULL, out_peer_effective_addr,
+ NULL, out_peer_ota_addr,
out_peer_id_addr_type, NULL);
return 0;
@@ -557,8 +557,8 @@ ble_sm_sc_dhkey_check_exec(struct ble_sm_proc *proc, struct ble_sm_result *res,
void *arg)
{
struct ble_sm_dhkey_check cmd;
- uint8_t *our_effective_addr;
- uint8_t *peer_effective_addr;
+ uint8_t *our_ota_addr;
+ uint8_t *peer_ota_addr;
uint8_t peer_id_addr_type;
uint8_t our_id_addr_type;
uint8_t iocap[3];
@@ -571,16 +571,16 @@ ble_sm_sc_dhkey_check_exec(struct ble_sm_proc *proc, struct ble_sm_result *res,
}
rc = ble_sm_sc_dhkey_addrs(proc,
- &our_id_addr_type, &our_effective_addr,
- &peer_id_addr_type, &peer_effective_addr);
+ &our_id_addr_type, &our_ota_addr,
+ &peer_id_addr_type, &peer_ota_addr);
if (rc != 0) {
goto err;
}
rc = ble_sm_alg_f6(proc->mackey, ble_sm_our_pair_rand(proc),
ble_sm_peer_pair_rand(proc), proc->tk, iocap,
- our_id_addr_type, our_effective_addr,
- peer_id_addr_type, peer_effective_addr,
+ our_id_addr_type, our_ota_addr,
+ peer_id_addr_type, peer_ota_addr,
cmd.value);
if (rc != 0) {
goto err;
@@ -609,8 +609,8 @@ ble_sm_dhkey_check_process(struct ble_sm_proc *proc,
struct ble_sm_result *res)
{
uint8_t exp_value[16];
- uint8_t *peer_effective_addr;
- uint8_t *our_effective_addr;
+ uint8_t *peer_ota_addr;
+ uint8_t *our_ota_addr;
uint8_t peer_id_addr_type;
uint8_t our_id_addr_type;
uint8_t iocap[3];
@@ -624,9 +624,9 @@ ble_sm_dhkey_check_process(struct ble_sm_proc *proc,
res->app_status = ble_sm_sc_dhkey_addrs(proc,
&our_id_addr_type,
- &our_effective_addr,
+ &our_ota_addr,
&peer_id_addr_type,
- &peer_effective_addr);
+ &peer_ota_addr);
if (res->app_status != 0) {
res->sm_err = BLE_SM_ERR_UNSPECIFIED;
res->enc_cb = 1;
@@ -641,8 +641,8 @@ ble_sm_dhkey_check_process(struct ble_sm_proc *proc,
ble_sm_peer_pair_rand(proc),
ble_sm_our_pair_rand(proc),
proc->tk, iocap,
- peer_id_addr_type, peer_effective_addr,
- our_id_addr_type, our_effective_addr,
+ peer_id_addr_type, peer_ota_addr,
+ our_id_addr_type, our_ota_addr,
exp_value);
if (res->app_status != 0) {
res->sm_err = BLE_SM_ERR_UNSPECIFIED;