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

mesh: fix send of segmented messages to unicast addresses, translate dst field

Browse Source
This commit is contained in:
Matthias Ringwald 2019-01-15 15:45:44 +01:00
parent 57d75359fe
commit 6159937ae3
3 changed files with 82 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/mesh/mesh_message_test.c
View File

@ -192,6 +192,7 @@ TEST_GROUP(MessageTest){
mesh_network_set_proxy_message_handler(&test_proxy_server_callback_handler);
mesh_upper_transport_register_unsegemented_message_handler(&test_upper_transport_unsegmented_callback_handler);
mesh_upper_transport_register_segemented_message_handler(&test_upper_transport_segmented_callback_handler);
mesh_seq_auth_reset();
received_network_pdu = NULL;
recv_upper_transport_pdu_len =0;
sent_network_pdu_len = 0;
@ -747,6 +748,9 @@ TEST(MessageTest, Message20Send){
}
// Message 21
// The Low Power node sends a vendor command to a group address.
// Issue: dst = 0x8105 - which is a Virtual Address associated with a Label UUID
#if 0
char * message21_network_pdus[] = {
(char *) "e8b1051f5e945ae4d611358eaf17796a6c98977f69e5872c4620",
};
@ -771,6 +775,7 @@ TEST(MessageTest, Message21Send){
mesh_upper_transport_set_seq(seq);
test_send_access_message(netkey_index, appkey_index, ttl, src, dest, szmic, message21_upper_transport_pdu, 1, message21_lower_transport_pdus, message21_network_pdus);
}
#endif
// Message 22
char * message22_network_pdus[] = {
@ -786,7 +791,7 @@ TEST(MessageTest, Message22Receive){
mesh_set_iv_index(0x12345677);
uint8_t label_uuid[16];
btstack_parse_hex(message22_label_string, 16, label_uuid);
mesh_virtual_address_set(0xb529, label_uuid);
mesh_virtual_address_register(label_uuid, 0xb529);
test_receive_network_pdus(1, message22_network_pdus, message22_lower_transport_pdus, message22_upper_transport_pdu);
}
@ -795,7 +800,6 @@ TEST(MessageTest, Message22Send){
uint16_t appkey_index = 0;
uint8_t ttl = 3;
uint16_t src = 0x1234;
uint16_t dest = 0xb529;
uint32_t seq = 0x07080b;
uint8_t szmic = 0;
@ -803,8 +807,8 @@ TEST(MessageTest, Message22Send){
mesh_upper_transport_set_seq(seq);
uint8_t label_uuid[16];
btstack_parse_hex(message22_label_string, 16, label_uuid);
mesh_virtual_address_set(0xb529, label_uuid);
test_send_access_message(netkey_index, appkey_index, ttl, src, dest, szmic, message22_upper_transport_pdu, 1, message22_lower_transport_pdus, message22_network_pdus);
uint16_t proxy_dst = mesh_virtual_address_register(label_uuid, 0xb529);
test_send_access_message(netkey_index, appkey_index, ttl, src, proxy_dst, szmic, message22_upper_transport_pdu, 1, message22_lower_transport_pdus, message22_network_pdus);
}
// Message 23
@ -821,7 +825,7 @@ TEST(MessageTest, Message23Receive){
mesh_set_iv_index(0x12345677);
uint8_t label_uuid[16];
btstack_parse_hex(message23_label_string, 16, label_uuid);
mesh_virtual_address_set(0x9736, label_uuid);
mesh_virtual_address_register(label_uuid, 0x9736);
test_receive_network_pdus(1, message23_network_pdus, message23_lower_transport_pdus, message23_upper_transport_pdu);
}
TEST(MessageTest, Message23Send){
@ -829,7 +833,6 @@ TEST(MessageTest, Message23Send){
uint16_t appkey_index = 0;
uint8_t ttl = 3;
uint16_t src = 0x1234;
uint16_t dest = 0x9736;
uint32_t seq = 0x07080c;
uint8_t szmic = 0;
@ -837,8 +840,8 @@ TEST(MessageTest, Message23Send){
mesh_upper_transport_set_seq(seq);
uint8_t label_uuid[16];
btstack_parse_hex(message23_label_string, 16, label_uuid);
mesh_virtual_address_set(0x9736, label_uuid);
test_send_access_message(netkey_index, appkey_index, ttl, src, dest, szmic, message23_upper_transport_pdu, 1, message23_lower_transport_pdus, message23_network_pdus);
uint16_t proxy_dst = mesh_virtual_address_register(label_uuid, 0x9736);
test_send_access_message(netkey_index, appkey_index, ttl, src, proxy_dst, szmic, message23_upper_transport_pdu, 1, message23_lower_transport_pdus, message23_network_pdus);
}
#endif
@ -876,6 +879,9 @@ TEST(MessageTest, Message24Receive){
// mesh_set_iv_index(0x12345677);
// mesh_upper_transport_set_seq(seq);
// uint8_t label_uuid[16];
// btstack_parse_hex(message24_label_string, 16, label_uuid);
// uint16_t proxy_dst = mesh_virtual_address_register(0x9736, label_uuid);
// test_send_access_message(netkey_index, appkey_index, ttl, src, dest, szmic, message24_upper_transport_pdu, 2, message24_lower_transport_pdus, message24_network_pdus);
// }
#endif

81
test/mesh/mesh_transport.c
View File

@ -82,6 +82,7 @@ typedef struct {
} mesh_transport_key_t;
typedef struct {
uint16_t pseudo_dst;
uint16_t hash;
uint8_t label_uuid[16];
} mesh_virtual_address_t;
@ -104,9 +105,20 @@ void mesh_transport_set_device_key(const uint8_t * device_key){
memcpy(mesh_transport_device_key.key, device_key, 16);
}
void mesh_virtual_address_set(uint16_t hash, const uint8_t * label_uuid){
static void mesh_virtual_address_run(void){
}
uint16_t mesh_virtual_address_register(uint8_t * label_uuid, uint16_t hash){
// TODO:: check if already exists
// TODO: calc hash
test_virtual_address.hash = hash;
memcpy(test_virtual_address.label_uuid, label_uuid, 16);
test_virtual_address.pseudo_dst = 0x8000;
mesh_virtual_address_run();
return test_virtual_address.pseudo_dst;
}
void mesh_virtual_address_unregister(uint16_t pseudo_dst){
}
static const mesh_transport_key_t * mesh_transport_key_get(uint16_t appkey_index){
@ -177,6 +189,10 @@ static uint8_t mesh_network_send(uint16_t netkey_index, uint8_t ctl, uint8_t ttl
static uint16_t mesh_seq_auth_single_src = MESH_ADDRESS_UNSASSIGNED;
static uint32_t mesh_seq_auth_single_seq;
void mesh_seq_auth_reset(void){
mesh_seq_auth_single_src = MESH_ADDRESS_UNSASSIGNED;
}
static int mesh_seq_auth_validate(uint16_t src, uint32_t seq){
if (mesh_seq_auth_single_src == MESH_ADDRESS_UNSASSIGNED){
mesh_seq_auth_single_src = src;
@ -867,23 +883,26 @@ static void mesh_upper_transport_send_next_segment(void){
}
if (upper_transport_outgoing_seg_o > seg_n){
printf("[+] Upper transport, send segmented pdu complete\n");
if (!mesh_network_address_unicast(mesh_transport_dst(upper_transport_outgoing_pdu))){
upper_transport_outgoing_seg_o = 0;
// done, more?
if (mesh_upper_transport_retry_count){
printf("[+] Upper transport, message unacknowledged retry count %u\n", mesh_upper_transport_retry_count);
mesh_upper_transport_retry_count--;
} else {
printf("[+] Upper transport, message unacknowledged -> free\n");
// note: same as in seg ack handling code
btstack_memory_mesh_transport_pdu_free(upper_transport_outgoing_pdu);
upper_transport_outgoing_pdu = NULL;
btstack_memory_mesh_network_pdu_free(upper_transport_outgoing_segment);
upper_transport_outgoing_segment = NULL;
return;
}
printf("[+] Upper transport, send segmented pdu complete (dst %x)\n", mesh_transport_dst(upper_transport_outgoing_pdu));
upper_transport_outgoing_seg_o = 0;
// done for unicast, ack timer already set, too
if (mesh_network_address_unicast(mesh_transport_dst(upper_transport_outgoing_pdu))) return;
// done, more?
if (mesh_upper_transport_retry_count == 0){
printf("[+] Upper transport, message unacknowledged -> free\n");
// note: same as in seg ack handling code
btstack_memory_mesh_transport_pdu_free(upper_transport_outgoing_pdu);
upper_transport_outgoing_pdu = NULL;
btstack_memory_mesh_network_pdu_free(upper_transport_outgoing_segment);
upper_transport_outgoing_segment = NULL;
return;
}
// start retry
printf("[+] Upper transport, message unacknowledged retry count %u\n", mesh_upper_transport_retry_count);
mesh_upper_transport_retry_count--;
}
if (mesh_network_address_unicast(mesh_transport_dst(upper_transport_outgoing_pdu))){
@ -1124,7 +1143,6 @@ void mesh_upper_transport_send_segmented_control_pdu(mesh_transport_pdu_t * tran
void mesh_upper_transport_send_unsegmented_access_pdu_digest(void * arg){
mesh_network_pdu_t * network_pdu = (mesh_network_pdu_t *) arg;
uint8_t trans_mic_len = 4;
uint8_t * access_pdu_data = mesh_network_pdu_data(network_pdu) + 1;
uint16_t access_pdu_len = mesh_network_pdu_len(network_pdu) - 1;
btstack_crypto_ccm_encrypt_block(&ccm, access_pdu_len, access_pdu_data, access_pdu_data, &mesh_upper_transport_send_unsegmented_access_pdu_ccm, network_pdu);
@ -1134,6 +1152,13 @@ void mesh_upper_transport_send_unsegmented_access_pdu(mesh_network_pdu_t * netwo
uint16_t appkey_index = network_pdu->appkey_index;
uint16_t aad_len = 0;
// @TODO: provide correct way to set virtual address,
if (mesh_network_address_virtual(mesh_network_dst(network_pdu))){
aad_len = 16;
big_endian_store_16(network_pdu->data, 7, test_virtual_address.hash);
}
// setup nonce
if (appkey_index == MESH_DEVICE_KEY_INDEX){
transport_unsegmented_setup_device_nonce(application_nonce, network_pdu);
@ -1142,7 +1167,6 @@ void mesh_upper_transport_send_unsegmented_access_pdu(mesh_network_pdu_t * netwo
}
uint8_t trans_mic_len = 4;
uint8_t * access_pdu_data = mesh_network_pdu_data(network_pdu) + 1;
uint16_t access_pdu_len = mesh_network_pdu_len(network_pdu) - 1;
// --
@ -1153,11 +1177,7 @@ void mesh_upper_transport_send_unsegmented_access_pdu(mesh_network_pdu_t * netwo
// encrypt ccm
mesh_transport_crypto_active = 1;
uint16_t aad_len = 0;
// @TODO: provide correct way to set virtual address,
if (mesh_network_address_virtual(mesh_network_dst(network_pdu))){
aad_len = 16;
}
btstack_crypto_ccm_init(&ccm, appkey->key, application_nonce, access_pdu_len, aad_len, trans_mic_len);
if (aad_len){
// @TODO: remove test_virtual_address
@ -1169,7 +1189,6 @@ void mesh_upper_transport_send_unsegmented_access_pdu(mesh_network_pdu_t * netwo
void mesh_upper_transport_send_segmented_access_pdu_digest(void *arg){
mesh_transport_pdu_t * transport_pdu = (mesh_transport_pdu_t *) arg;
uint8_t transmic_len = transport_pdu->transmic_len;
uint16_t access_pdu_len = transport_pdu->len;
uint8_t * access_pdu_data = transport_pdu->data;
btstack_crypto_ccm_encrypt_block(&ccm, access_pdu_len,access_pdu_data, access_pdu_data, &mesh_upper_transport_send_segmented_access_pdu_ccm, transport_pdu);
@ -1179,6 +1198,13 @@ void mesh_upper_transport_send_segmented_access_pdu(mesh_transport_pdu_t * trans
uint16_t appkey_index = transport_pdu->appkey_index;
uint16_t aad_len = 0;
// @TODO: provide correct way to set virtual address,
if (mesh_network_address_virtual(mesh_transport_dst(transport_pdu))){
aad_len = 16;
big_endian_store_16(transport_pdu->network_header, 7, test_virtual_address.hash);
}
// setup nonce
if (appkey_index == MESH_DEVICE_KEY_INDEX){
transport_segmented_setup_device_nonce(application_nonce, transport_pdu);
@ -1197,11 +1223,6 @@ void mesh_upper_transport_send_segmented_access_pdu(mesh_transport_pdu_t * trans
mesh_transport_crypto_active = 1;
// encrypt ccm
uint16_t aad_len = 0;
// @TODO: provide correct way to set virtual address,
if (mesh_network_address_virtual(mesh_transport_dst(transport_pdu))){
aad_len = 16;
}
btstack_crypto_ccm_init(&ccm, appkey->key, application_nonce, access_pdu_len, 0, transmic_len);
if (aad_len){
// @TODO: remove test_virtual_address

17
test/mesh/mesh_transport.h
View File

@ -92,11 +92,28 @@ void mesh_upper_transport_send_unsegmented_access_pdu(mesh_network_pdu_t * netwo
void mesh_upper_transport_send_segmented_access_pdu(mesh_transport_pdu_t * transport_pdu);
//
// Virtual Address Management
//
/**
* @brief Register Virtual Address
* @param LabelUUID (16 bytes)
* @returns pseudo_dst that can be used as dst with all mesh_uppert_transport calls
*/
uint16_t mesh_virtual_address_register(uint8_t * label_uuid, uint16_t hash);
/**
* @brief Unregister Virtual Address
* @param pseudo_dst to unregister
*/
void mesh_virtual_address_unregister(uint16_t pseudo_dst);
// test
void mesh_lower_transport_received_mesage(mesh_network_callback_type_t callback_type, mesh_network_pdu_t * network_pdu);
void mesh_transport_dump(void);
void mesh_transport_reset(void);
void mesh_seq_auth_reset(void);
#ifdef __cplusplus
} /* end of extern "C" */