alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ble_mesh: Expose app key get function

Browse Source
This commit is contained in:
lly 2019-10-24 15:31:42 +08:00
parent 906fb9d6e3
commit b88dbf6348
2 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
components/bt/esp_ble_mesh/mesh_core/transport.c
View File

@ -492,6 +492,7 @@ int bt_mesh_trans_send(struct bt_mesh_net_tx *tx, struct net_buf_simple *msg,
{ {
const u8_t *key = NULL; const u8_t *key = NULL;
u8_t *ad, role; u8_t *ad, role;
u8_t aid;
int err; int err;
if (net_buf_simple_tailroom(msg) < 4) { if (net_buf_simple_tailroom(msg) < 4) {
@ -513,32 +514,13 @@ int bt_mesh_trans_send(struct bt_mesh_net_tx *tx, struct net_buf_simple *msg,
return -EINVAL; return -EINVAL;
} }
if (tx->ctx->app_idx == BLE_MESH_KEY_DEV) { err = bt_mesh_app_key_get(tx->sub, tx->ctx->app_idx, &key,
key = bt_mesh_tx_devkey_get(role, tx->ctx->addr); &aid, role, tx->ctx->addr);
if (!key) { if (err) {
BT_ERR("%s, Failed to get Device Key", __func__); return err;
return -EINVAL;
} }
tx->aid = 0U; tx->aid = aid;
} else {
struct bt_mesh_app_key *app_key = NULL;
app_key = bt_mesh_tx_appkey_get(role, tx->ctx->app_idx, tx->ctx->net_idx);
if (!app_key) {
BT_ERR("%s, Failed to get AppKey", __func__);
return -EINVAL;
}
if (tx->sub->kr_phase == BLE_MESH_KR_PHASE_2 &&
app_key->updated) {
key = app_key->keys[1].val;
tx->aid = app_key->keys[1].id;
} else {
key = app_key->keys[0].val;
tx->aid = app_key->keys[0].id;
}
}
if (!tx->ctx->send_rel || net_buf_simple_tailroom(msg) < 8) { if (!tx->ctx->send_rel || net_buf_simple_tailroom(msg) < 8) {
tx->aszmic = 0U; tx->aszmic = 0U;
@ -1664,3 +1646,41 @@ void bt_mesh_heartbeat_send(void)
bt_mesh_ctl_send(&tx, TRANS_CTL_OP_HEARTBEAT, &hb, sizeof(hb), bt_mesh_ctl_send(&tx, TRANS_CTL_OP_HEARTBEAT, &hb, sizeof(hb),
NULL, NULL, NULL); NULL, NULL, NULL);
} }
int bt_mesh_app_key_get(const struct bt_mesh_subnet *subnet, u16_t app_idx,
const u8_t **key, u8_t *aid, u8_t role, u16_t dst)
{
struct bt_mesh_app_key *app_key;
if (app_idx == BLE_MESH_KEY_DEV) {
*key = bt_mesh_tx_devkey_get(role, dst);
if (!*key) {
BT_ERR("%s, Failed to get Device Key", __func__);
return -EINVAL;
}
*aid = 0U;
return 0;
}
if (!subnet) {
BT_ERR("%s, Invalid subnet", __func__);
return -EINVAL;
}
app_key = bt_mesh_tx_appkey_get(role, app_idx, subnet->net_idx);
if (!app_key) {
BT_ERR("%s, Failed to get AppKey", __func__);
return -ENOENT;
}
if (subnet->kr_phase == BLE_MESH_KR_PHASE_2 && app_key->updated) {
*key = app_key->keys[1].val;
*aid = app_key->keys[1].id;
} else {
*key = app_key->keys[0].val;
*aid = app_key->keys[0].id;
}
return 0;
}

3
components/bt/esp_ble_mesh/mesh_core/transport.h
View File

@ -102,4 +102,7 @@ void bt_mesh_rpl_clear(void);
void bt_mesh_heartbeat_send(void); void bt_mesh_heartbeat_send(void);
int bt_mesh_app_key_get(const struct bt_mesh_subnet *subnet, u16_t app_idx,
const u8_t **key, u8_t *aid, u8_t role, u16_t dst);
#endif /* _TRANSPORT_H_ */ #endif /* _TRANSPORT_H_ */