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 provisioning data in mesh_node_store_provisioning_data

Browse Source
This commit is contained in:
Matthias Ringwald 2019-07-11 22:54:10 +02:00
parent c0956dd0a8
commit a87e78cf94
4 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/mesh/mesh.c
View File

@ -75,8 +75,6 @@ static btstack_packet_callback_registration_t hci_event_callback_registration;
static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
static uint16_t pb_transport_cid = MESH_PB_TRANSPORT_INVALID_CID;
// pin entry
static int ui_chars_for_pin;
static uint8_t ui_pin[17];
@ -103,7 +101,11 @@ static mesh_generic_on_off_state_t mesh_generic_on_off_state;
// printf("%20s: 0x%x", name, (int) value);
// }
static void mesh_network_key_dump(const mesh_network_key_t * key){
static void mesh_provisioning_dump(const mesh_provisioning_data_t * data){
mesh_network_key_t * key = data->network_key;
printf("UnicastAddr: 0x%02x\n", data->unicast_address);
printf("DevKey: "); printf_hexdump(data->device_key, 16);
printf("Flags: 0x%02x\n", data->flags);
printf("NetKey: "); printf_hexdump(key->net_key, 16);
printf("-- Derived from NetKey --\n");
printf("NID: 0x%02x\n", key->nid);
@ -114,12 +116,6 @@ static void mesh_network_key_dump(const mesh_network_key_t * key){
printf("IdentityKey: "); printf_hexdump(key->identity_key, 16);
}
static void mesh_provisioning_dump(const mesh_provisioning_data_t * data){
printf("UnicastAddr: 0x%02x\n", data->unicast_address);
printf("DevKey: "); printf_hexdump(data->device_key, 16);
printf("Flags: 0x%02x\n", data->flags);
}
// 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){
@ -248,18 +244,15 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
static void mesh_provisioning_message_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
if (packet_type != HCI_EVENT_PACKET) return;
mesh_provisioning_data_t provisioning_data;
mesh_network_key_t * primary_network_key;
mesh_subnet_t * primary_subnet;
switch(packet[0]){
case HCI_EVENT_MESH_META:
switch(packet[2]){
case MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN:
printf("Provisioner link opened");
pb_transport_cid = mesh_subevent_pb_transport_link_open_get_pb_transport_cid(packet);
break;
case MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED:
pb_transport_cid = MESH_PB_TRANSPORT_INVALID_CID;
printf("Provisioner link close");
break;
case MESH_SUBEVENT_PB_PROV_ATTENTION_TIMER:
printf("Attention Timer: %u\n", packet[3]);
@ -276,35 +269,19 @@ static void mesh_provisioning_message_handler (uint8_t packet_type, uint16_t cha
// get provisioning data
provisioning_device_data_get(&provisioning_data);
// and store in TLV
mesh_node_store_provisioning_data(&provisioning_data);
// setup after provisioned
// setup node after provisioned
mesh_access_setup_from_provisioning_data(&provisioning_data);
// start advertising with node id after provisioning
mesh_proxy_set_advertising_with_node_id(provisioning_data.network_key->netkey_index, MESH_NODE_IDENTITY_STATE_ADVERTISING_RUNNING);
// store provisioning data and primary network key in TLV
mesh_node_store_provisioning_data();
// store IV Index and sequence number
mesh_store_iv_index_and_sequence_number();
// store primary network key
primary_network_key = provisioning_device_data_get_network_key();
mesh_store_network_key(primary_network_key);
// dump data
// dump provisioning data
mesh_provisioning_dump(&provisioning_data);
mesh_network_key_dump(primary_network_key);
provisioned = 1;
// start advertising with node id after provisioning
mesh_proxy_set_advertising_with_node_id(primary_network_key->netkey_index, MESH_NODE_IDENTITY_STATE_ADVERTISING_RUNNING);
// start sending Secure Network Beacons
primary_subnet = mesh_subnet_get_by_netkey_index(0);
beacon_secure_network_start(primary_subnet);
break;
default:
break;

16
test/mesh/mesh_access.c
View File

@ -1326,6 +1326,18 @@ static uint32_t sequence_number_storage_trigger;
#define MESH_SEQUENCE_NUMBER_STORAGE_INTERVAL 1000
void mesh_store_iv_index_after_provisioning(uint32_t iv_index){
iv_index_and_sequence_number_t data;
mesh_access_setup_tlv();
uint32_t tag = mesh_tag_for_iv_index_and_seq_number();
data.iv_index = iv_index;
data.seq_number = 0;
btstack_tlv_singleton_impl->store_tag(btstack_tlv_singleton_context, tag, (uint8_t *) &data, sizeof(data));
sequence_number_last_stored = data.seq_number;
sequence_number_storage_trigger = sequence_number_last_stored + MESH_SEQUENCE_NUMBER_STORAGE_INTERVAL;
}
void mesh_store_iv_index_and_sequence_number(void){
iv_index_and_sequence_number_t data;
mesh_access_setup_tlv();
@ -1714,6 +1726,10 @@ void mesh_access_setup_from_provisioning_data(const mesh_provisioning_data_t * p
// setup primary network
mesh_subnet_setup_for_netkey_index(provisioning_data->network_key->netkey_index);
// start sending Secure Network Beacons
mesh_subnet_t * provisioned_subnet = mesh_subnet_get_by_netkey_index(provisioning_data->network_key->netkey_index);
beacon_secure_network_start(provisioned_subnet);
// Mesh Proxy
#ifdef ENABLE_MESH_PROXY_SERVER
// Setup Proxy

1
test/mesh/mesh_access.h
View File

@ -371,6 +371,7 @@ void mesh_model_unbind_appkey(mesh_model_t * mesh_model, uint16_t appkey_index);
int mesh_model_contains_appkey(mesh_model_t * mesh_model, uint16_t appkey_index);
// Mesh IV Index and sequence number
void mesh_store_iv_index_after_provisioning(uint32_t iv_index);
void mesh_store_iv_index_and_sequence_number(void);
void mesh_restore_iv_index_and_sequence_number(void);

2
test/mesh/mesh_configuration_server.h
View File

@ -99,7 +99,7 @@ void mesh_node_reset(void);
int mesh_node_startup_from_tlv(void);
void mesh_node_store_provisioning_data(void);
void mesh_node_store_provisioning_data(mesh_provisioning_data_t * provisioning_data);
// PTS Testing
void config_nekey_list_set_max(uint16_t max);