mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-30 15:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: introduce mesh_lower_transport_send_unsegmented_pdu

Browse Source
This commit is contained in:
Matthias Ringwald 2019-04-13 23:27:31 +02:00
parent c2cb6fe265
commit 8b5057468e
4 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/ble/mesh/mesh_lower_transport.c
View File

@ -116,30 +116,6 @@ static mesh_transport_pdu_t * lower_transport_outgoing_pdu;
static mesh_network_pdu_t * lower_transport_outgoing_segment;
static uint16_t lower_transport_outgoing_seg_o;
// 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 = 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;
}
static void mesh_lower_transport_process_unsegmented_control_message(mesh_network_pdu_t *network_pdu){
uint8_t * lower_transport_pdu = mesh_network_pdu_data(network_pdu);
uint8_t opcode = lower_transport_pdu[0];
@ -195,11 +171,25 @@ static void mesh_lower_transport_send_ack(uint16_t netkey_index, uint8_t ttl, ui
// setup ack message
uint8_t ack_msg[7];
mesh_lower_transport_setup_segmented_acknowledge_message(ack_msg, 0, seq_zero, block_ack);
// send ack
int i;
for (i=0;i<1;i++){
mesh_network_send(netkey_index, 1, ttl, mesh_lower_transport_next_seq(), primary_element_address, dest, ack_msg, sizeof(ack_msg));
}
//
// "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;
// allocate network_pdu
mesh_network_pdu_t * network_pdu = mesh_network_pdu_get();
if (!network_pdu) return;
// setup network_pdu
mesh_network_setup_pdu(network_pdu, netkey_index, network_key->nid, 1, ttl, mesh_lower_transport_next_seq(), primary_element_address, dest, ack_msg, sizeof(ack_msg));
// send network_pdu
mesh_network_send_pdu(network_pdu);
}
static void mesh_lower_transport_send_ack_for_transport_pdu(mesh_transport_pdu_t *transport_pdu){
@ -599,6 +589,10 @@ void mesh_lower_transport_send_segmented_pdu(mesh_transport_pdu_t *transport_pdu
mesh_lower_transport_send_segmented_pdu_once(transport_pdu);
}
void mesh_lower_transport_send_unsegmented_pdu(mesh_network_pdu_t *network_pdu){
mesh_network_send_pdu(network_pdu);
}
static void mesh_lower_transport_tx_ack_timeout(btstack_timer_source_t * ts){
mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) btstack_run_loop_get_timer_context(ts);
printf("[+] Lower transport, acknowledgement timer fired for %p\n", transport_pdu);

1
src/ble/mesh/mesh_lower_transport.h
View File

@ -92,6 +92,7 @@ uint32_t mesh_lower_transport_peek_seq(void);
void mesh_lower_transport_message_processed_by_higher_layer(mesh_pdu_t * pdu);
void mesh_lower_transport_send_unsegmented_pdu(mesh_network_pdu_t *network_pdu);
void mesh_lower_transport_send_segmented_pdu(mesh_transport_pdu_t *transport_pdu);
// test

2
test/mesh/mesh.c
View File

@ -164,7 +164,7 @@ static uint8_t mesh_network_send(uint16_t netkey_index, uint8_t ctl, uint8_t ttl
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);
mesh_lower_transport_send_unsegmented_pdu(network_pdu);
return 0;
}

4
test/mesh/mesh_transport.c
View File

@ -472,7 +472,7 @@ static void mesh_upper_transport_send_unsegmented_access_pdu_ccm(void * arg){
mesh_print_hex("TransMIC", &upper_transport_pdu[upper_transport_pdu_len], 4);
network_pdu->len += 4;
// send network pdu
mesh_network_send_pdu(network_pdu);
mesh_lower_transport_send_unsegmented_pdu(network_pdu);
}
static void mesh_upper_transport_send_segmented_access_pdu_ccm(void * arg){
@ -610,7 +610,7 @@ uint8_t mesh_upper_transport_setup_segmented_access_pdu(mesh_transport_pdu_t * t
}
void mesh_upper_transport_send_unsegmented_control_pdu(mesh_network_pdu_t * network_pdu){
mesh_network_send_pdu(network_pdu);
mesh_lower_transport_send_unsegmented_pdu(network_pdu);
}
void mesh_upper_transport_send_segmented_control_pdu(mesh_transport_pdu_t * transport_pdu){