mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-25 09:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: only provide mesh_network_send_pdu to allow for pdu sent callback

Browse Source
This commit is contained in:
Matthias Ringwald 2018-11-21 20:46:08 +01:00
parent 12560ee3f2
commit f635d27a4d
3 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,29 +606,6 @@ void mesh_network_setup_pdu(mesh_network_pdu_t * network_pdu, uint16_t netkey_in
network_pdu->len += transport_pdu_len;
}
uint8_t mesh_network_send(uint16_t netkey_index, uint8_t ctl, uint8_t ttl, uint32_t seq, uint16_t src, uint16_t dest, const uint8_t * transport_pdu_data, uint8_t transport_pdu_len){
// "3.4.5.2: The output filter of the interface connected to advertising or GATT bearers shall drop all messages with TTL value set to 1."
// if (ttl <= 1) return 0;
// TODO: check transport_pdu_len depending on ctl
// 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;
// setup network_pdu
mesh_network_setup_pdu(network_pdu, netkey_index, network_key->nid, ctl, ttl, seq, src, dest, transport_pdu_data, transport_pdu_len);
// send network_pdu
mesh_network_send_pdu(network_pdu);
return 0;
}
void mesh_set_iv_index(uint32_t iv_index){
global_iv_index = iv_index;
}

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

@ -155,19 +155,6 @@ void mesh_network_key_list_add_from_provisioning_data(const mesh_provisioning_da
*/
const mesh_network_key_t * mesh_network_key_list_get(uint16_t netkey_index);
/**
* @brief Send TransportPDU after encryption
* @param nid
* @param ctl
* @param ttl
* @param seq
* @param dest
* @param transport_pdu_data
* @param transport_pdu_len
*/
uint8_t mesh_network_send(uint16_t netkey_index, uint8_t ctl, uint8_t ttl, uint32_t seq, uint16_t src, uint16_t dest,
const uint8_t * transport_pdu_data, uint8_t transport_pdu_len);
/**
* @brief Send network_pdu after encryption
* @param network_pdu

24
test/mesh/mesh.c
View File

@ -324,6 +324,30 @@ static const mesh_application_key_t * mesh_application_key_iterator_get_next(mes
return &test_application_key;
}
// helper network layer, temp
static uint8_t mesh_network_send(uint16_t netkey_index, uint8_t ctl, uint8_t ttl, uint32_t seq, uint16_t src, uint16_t dest, const uint8_t * transport_pdu_data, uint8_t transport_pdu_len){
// "3.4.5.2: The output filter of the interface connected to advertising or GATT bearers shall drop all messages with TTL value set to 1."
// if (ttl <= 1) return 0;
// TODO: check transport_pdu_len depending on ctl
// 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;
// setup network_pdu
mesh_network_setup_pdu(network_pdu, netkey_index, network_key->nid, ctl, ttl, seq, src, dest, transport_pdu_data, transport_pdu_len);
// send network_pdu
mesh_network_send_pdu(network_pdu);
return 0;
}
// stub lower transport