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: single mesh_upper_transport_setup_access_pdu_header instead of segmented/unsegmented

Browse Source
This commit is contained in:
Matthias Ringwald 2019-04-22 23:00:20 +02:00
parent 109de5eff3
commit bbc7a0af3e
4 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
test/mesh/mesh.c
View File

@ -1057,7 +1057,7 @@ typedef struct {
typedef struct {
mesh_heartbeat_publication_t heartbeat_publication;
} mesh_configuration_server_model_contextt;
} mesh_configuration_server_model_context;
typedef struct {
// model info: id, operations, etc.
@ -1068,27 +1068,17 @@ typedef struct {
static mesh_heartbeat_publication_t mesh_heartbeat_publication;
static mesh_model_t mesh_configuration_server_model = { &mesh_heartbeat_publication };
static void config_server_send_segmented_message(mesh_model_t *mesh_model, uint16_t netkey_index, uint16_t dest,
mesh_transport_pdu_t *transport_pdu){
static void config_server_send_message(mesh_model_t *mesh_model, uint16_t netkey_index, uint16_t dest,
mesh_pdu_t *pdu){
UNUSED(mesh_model);
// TODO: use addr from element this model belongs to
uint16_t src = primary_element_address;
uint16_t appkey_index = MESH_DEVICE_KEY_INDEX;
uint8_t ttl = mesh_foundation_default_ttl_get();
mesh_upper_transport_setup_segmented_access_pdu_header(transport_pdu, netkey_index, appkey_index, ttl, src, dest, 0);
mesh_upper_transport_send_access_pdu((mesh_pdu_t*) transport_pdu);
mesh_upper_transport_setup_access_pdu_header(pdu, netkey_index, appkey_index, ttl, src, dest, 0);
mesh_upper_transport_send_access_pdu(pdu);
}
static void config_server_send_unsegmented_message(mesh_model_t *mesh_model, uint16_t netkey_index, uint16_t dest,
mesh_network_pdu_t *network_pdu){
UNUSED(mesh_model);
// TODO: use addr from element this model belongs to
uint16_t src = primary_element_address;
uint16_t appkey_index = MESH_DEVICE_KEY_INDEX;
uint8_t ttl = mesh_foundation_default_ttl_get();
mesh_upper_transport_setup_unsegmented_access_pdu_header(network_pdu, netkey_index, appkey_index, ttl, src, dest);
mesh_upper_transport_send_access_pdu((mesh_pdu_t*) network_pdu);
}
static void config_composition_data_status(mesh_model_t * mesh_model, uint16_t netkey_index, uint16_t dest){
printf("Received Config Composition Data Get -> send Config Composition Data Status\n");
@ -1123,7 +1113,7 @@ static void config_composition_data_status(mesh_model_t * mesh_model, uint16_t n
mesh_access_transport_add_uint16(transport_pdu, 0x0002);
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_composition_data_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
@ -1137,7 +1127,7 @@ static void config_model_beacon_status(mesh_model_t * mesh_model, uint16_t netke
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_beacon_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
@ -1166,7 +1156,7 @@ static void config_model_default_ttl_status(mesh_model_t * mesh_model, uint16_t
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_default_ttl_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
@ -1194,7 +1184,7 @@ static void config_friend_status(mesh_model_t * mesh_model, uint16_t netkey_inde
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_friend_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
@ -1226,7 +1216,7 @@ static void config_model_gatt_proxy_status(mesh_model_t * mesh_model, uint16_t n
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_gatt_proxy_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
@ -1255,7 +1245,7 @@ static void config_model_relay_status(mesh_model_t * mesh_model, uint16_t netkey
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_relay_get_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu){
@ -1291,7 +1281,7 @@ static void config_model_network_transmit_status(mesh_model_t * mesh_model, uint
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_model_network_transmit_get_handler(mesh_model_t * mesh_model, mesh_pdu_t * pdu){
@ -1317,7 +1307,7 @@ static void config_appkey_status(mesh_model_t * mesh_model, uint16_t netkey_inde
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_appkey_add_aid(void * arg){
@ -1357,7 +1347,7 @@ static void config_model_subscription_status(mesh_model_t * mesh_model, uint16_t
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_model_subscription_add_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu) {
@ -1384,7 +1374,7 @@ static void config_model_app_status(mesh_model_t * mesh_model, uint16_t netkey_i
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_model_app_bind_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu) {
@ -1419,7 +1409,7 @@ config_model_publication_status_sig(mesh_model_t *mesh_model, uint16_t netkey_in
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void
@ -1434,7 +1424,7 @@ config_model_publication_status_vendor(mesh_model_t *mesh_model, uint16_t netkey
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
// TODO: link to model
@ -1638,7 +1628,7 @@ static void config_heartbeat_publication_status(mesh_model_t *mesh_model, uint16
printf("MESH config_heartbeat_publication_status count = %u => count_log = %u\n", mesh_heartbeat_publication.count, count_log);
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_heartbeat_publication_set_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu) {
@ -1689,7 +1679,7 @@ static void config_node_reset_status(mesh_model_t *mesh_model, uint16_t netkey_i
if (!transport_pdu) return;
// send as segmented access pdu
config_server_send_segmented_message(mesh_model, netkey_index, dest, transport_pdu);
config_server_send_message(mesh_model, netkey_index, dest, (mesh_pdu_t *) transport_pdu);
}
static void config_node_reset_handler(mesh_model_t *mesh_model, mesh_pdu_t * pdu) {

11
test/mesh/mesh_message_test.c
View File

@ -297,17 +297,16 @@ void test_send_access_message(uint16_t netkey_index, uint16_t appkey_index, uin
transport_pdu_len = strlen(control_pdu) / 2;
btstack_parse_hex(control_pdu, transport_pdu_len, transport_pdu_data);
mesh_pdu_t * pdu;
if (count == 1 ){
// send as unsegmented access pdu
mesh_network_pdu_t * network_pdu = mesh_network_pdu_get();
mesh_upper_transport_setup_unsegmented_access_pdu(network_pdu, netkey_index, appkey_index, ttl, src, dest, transport_pdu_data, transport_pdu_len);
mesh_upper_transport_send_access_pdu((mesh_pdu_t*) network_pdu);
pdu = (mesh_pdu_t*) mesh_network_pdu_get();
} else {
// send as segmented access pdu
mesh_transport_pdu_t * transport_pdu = mesh_transport_pdu_get();
mesh_upper_transport_setup_segmented_access_pdu(transport_pdu, netkey_index, appkey_index, ttl, src, dest, szmic, transport_pdu_data, transport_pdu_len);
mesh_upper_transport_send_access_pdu((mesh_pdu_t*)transport_pdu);
pdu = (mesh_pdu_t*) mesh_transport_pdu_get();
}
mesh_upper_transport_setup_access_pdu(pdu, netkey_index, appkey_index, ttl, src, dest, szmic, transport_pdu_data, transport_pdu_len);
mesh_upper_transport_send_access_pdu(pdu);
// check for all network pdus
int i;

25
test/mesh/mesh_transport.c
View File

@ -608,7 +608,7 @@ uint8_t mesh_upper_transport_setup_control_pdu(mesh_pdu_t * pdu, uint16_t netkey
}
}
uint8_t mesh_upper_transport_setup_unsegmented_access_pdu_header(mesh_network_pdu_t * network_pdu, uint16_t netkey_index,
static uint8_t mesh_upper_transport_setup_unsegmented_access_pdu_header(mesh_network_pdu_t * network_pdu, uint16_t netkey_index,
uint16_t appkey_index, uint8_t ttl, uint16_t src, uint16_t dest){
// get app or device key
@ -646,7 +646,7 @@ static uint8_t mesh_upper_transport_setup_unsegmented_access_pdu(mesh_network_pd
return 0;
}
uint8_t mesh_upper_transport_setup_segmented_access_pdu_header(mesh_transport_pdu_t * transport_pdu, uint16_t netkey_index, uint16_t appkey_index, uint8_t ttl, uint16_t src, uint16_t dest,
static uint8_t mesh_upper_transport_setup_segmented_access_pdu_header(mesh_transport_pdu_t * transport_pdu, uint16_t netkey_index, uint16_t appkey_index, uint8_t ttl, uint16_t src, uint16_t dest,
uint8_t szmic){
uint32_t seq = mesh_lower_transport_peek_seq();
@ -693,19 +693,30 @@ static uint8_t mesh_upper_transport_setup_segmented_access_pdu(mesh_transport_pd
transport_pdu->len = access_pdu_len;
return 0;
}
uint8_t mesh_upper_transport_setup_access_pdu_header(mesh_pdu_t * pdu, uint16_t netkey_index, uint16_t appkey_index,
uint8_t ttl, uint16_t src, uint16_t dest, uint8_t szmic){
switch (pdu->pdu_type){
case MESH_PDU_TYPE_NETWORK:
mesh_upper_transport_setup_unsegmented_access_pdu_header((mesh_network_pdu_t *) pdu, netkey_index, appkey_index, ttl, src, dest);
break;
case MESH_PDU_TYPE_TRANSPORT:
mesh_upper_transport_setup_segmented_access_pdu_header((mesh_transport_pdu_t *) pdu, netkey_index, appkey_index, ttl, src, dest, szmic);
break;
default:
break;
}
}
uint8_t mesh_upper_transport_setup_access_pdu(mesh_pdu_t * pdu, uint16_t netkey_index, uint16_t appkey_index,
uint8_t ttl, uint16_t src, uint16_t dest, uint8_t szmic,
const uint8_t * access_pdu_data, uint8_t access_pdu_len){
switch (pdu->pdu_type){
case MESH_PDU_TYPE_NETWORK:
mesh_upper_transport_setup_unsegmented_access_pdu((mesh_network_pdu_t *) pdu, netkey_index, appkey_index, ttl, src, dest, access_pdu_data, access_pdu_len);
break;
return mesh_upper_transport_setup_unsegmented_access_pdu((mesh_network_pdu_t *) pdu, netkey_index, appkey_index, ttl, src, dest, access_pdu_data, access_pdu_len);
case MESH_PDU_TYPE_TRANSPORT:
mesh_upper_transport_setup_segmented_access_pdu((mesh_transport_pdu_t *) pdu, netkey_index, appkey_index, ttl, src, dest, szmic, access_pdu_data, access_pdu_len);
break;
return mesh_upper_transport_setup_segmented_access_pdu((mesh_transport_pdu_t *) pdu, netkey_index, appkey_index, ttl, src, dest, szmic, access_pdu_data, access_pdu_len);
default:
break;
return 1;
}
}

5
test/mesh/mesh_transport.h
View File

@ -73,10 +73,7 @@ void mesh_upper_transport_send_control_pdu(mesh_pdu_t * pdu);
void mesh_upper_transport_register_access_message_handler(void (*callback)(mesh_pdu_t * pdu));
uint8_t mesh_upper_transport_setup_unsegmented_access_pdu_header(mesh_network_pdu_t * network_pdu, uint16_t netkey_index,
uint16_t appkey_index, uint8_t ttl, uint16_t src, uint16_t dest);
uint8_t mesh_upper_transport_setup_segmented_access_pdu_header(mesh_transport_pdu_t * transport_pdu, uint16_t netkey_index, uint16_t appkey_index,
uint8_t mesh_upper_transport_setup_access_pdu_header(mesh_pdu_t * pdu, uint16_t netkey_index, uint16_t appkey_index,
uint8_t ttl, uint16_t src, uint16_t dest, uint8_t szmic);
uint8_t mesh_upper_transport_setup_access_pdu(mesh_pdu_t * pdu, uint16_t netkey_index, uint16_t appkey_index,