mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-29 22:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: store netkey_index in mesh_network_pdu for outgoing packets

Browse Source
This commit is contained in:
Matthias Ringwald 2018-11-02 21:46:29 +01:00
parent 909b261375
commit 4e08d4b43d
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ble/mesh/mesh_network.c
View File

@ -282,6 +282,15 @@ static void mesh_network_send_b(void *arg){
}
static void mesh_network_send_0(mesh_network_pdu_t * network_pdu){
// lookup network by netkey_index
current_network_key = mesh_network_key_list_get(network_pdu->netkey_index);
if (!current_network_key) {
btstack_memory_mesh_network_pdu_free(network_pdu);
mesh_crypto_active = 0;
mesh_network_run();
return;
}
// get network nonce
mesh_network_create_nonce(network_nonce, network_pdu, global_iv_index);
printf("Nonce: ");
@ -524,18 +533,20 @@ uint8_t mesh_network_send(uint16_t netkey_index, uint8_t ctl, uint8_t ttl, uint3
// TODO: check transport_pdu_len depending on ctl
// TODO: lookup network by netkey_index
current_network_key = mesh_network_key_list_get(netkey_index);
if (!current_network_key) return 0;
uint8_t nid = current_network_key->nid;
// lookup network by netkey_index
const mesh_network_key_t * network_key = mesh_network_key_list_get(netkey_index);
if (!network_key) return 0;
// allocate network_pdu
mesh_network_pdu_t * network_pdu = btstack_memory_mesh_network_pdu_get();
if (!network_pdu) return 0;
memset(network_pdu, 0, sizeof(mesh_network_pdu_t));
// set netkey_index
network_pdu->netkey_index = netkey_index;
// setup header
uint8_t nid = network_key->nid;
network_pdu->data[network_pdu->len++] = (global_iv_index << 7) | nid;
uint8_t ctl_ttl = (ctl << 7) | (ttl & 0x7f);
network_pdu->data[network_pdu->len++] = ctl_ttl;

2
src/ble/mesh/mesh_network.h
View File

@ -47,6 +47,7 @@ extern "C" {
typedef struct {
btstack_linked_item_t item;
uint16_t netkey_index;
uint8_t len;
uint8_t data[29];
} mesh_network_pdu_t;
@ -73,7 +74,6 @@ typedef struct {
// k3
uint8_t network_id[8];
} mesh_network_key_t;
/**