mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-27 03:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: emit pb-adv link open failed if device does not responds

Browse Source
This commit is contained in:
Matthias Ringwald 2020-04-22 21:16:36 +02:00
parent e6542936bd
commit d16ad46bc4
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mesh/pb_adv.c
View File

@ -54,7 +54,8 @@
#include "mesh/provisioning.h"
#define PB_ADV_LINK_OPEN_RETRANSMIT_MS 1000
#define PB_ADV_LINK_OPEN_TIMEOUT_MS 60000
#define PB_ADV_LINK_OPEN_RETRIES (PB_ADV_LINK_OPEN_TIMEOUT_MS / PB_ADV_LINK_OPEN_RETRANSMIT_MS)
static void pb_adv_run(void);
/* taps: 32 31 29 1; characteristic polynomial: x^32 + x^31 + x^29 + x + 1 */
@ -91,6 +92,7 @@ static link_state_t link_state;
#ifdef ENABLE_MESH_PROVISIONER
static const uint8_t * pb_adv_peer_device_uuid;
static uint8_t pb_adv_provisioner_open_countdown;
#endif
static uint8_t pb_adv_msg_in_buffer[MESH_PB_ADV_MAX_PDU_SIZE]; // TODO: how large are prov messages?
@ -178,7 +180,7 @@ static void pb_adv_handle_bearer_control(uint32_t link_id, uint8_t transaction_n
printf("PB-ADV: Link Open %08x\n", pb_adv_link_id);
link_state = LINK_STATE_W2_SEND_ACK;
adv_bearer_request_can_send_now_for_provisioning_pdu();
pb_adv_emit_link_open(0, pb_adv_cid);
pb_adv_emit_link_open(ERROR_CODE_SUCCESS, pb_adv_cid);
break;
case LINK_STATE_OPEN:
if (pb_adv_link_id != link_id) break;
@ -200,7 +202,7 @@ static void pb_adv_handle_bearer_control(uint32_t link_id, uint8_t transaction_n
btstack_run_loop_remove_timer(&pb_adv_random_delay_timer);
log_info("link open, id %08x", pb_adv_link_id);
printf("PB-ADV: Link Open %08x\n", pb_adv_link_id);
pb_adv_emit_link_open(0, pb_adv_cid);
pb_adv_emit_link_open(ERROR_CODE_SUCCESS, pb_adv_cid);
break;
#endif
case MESH_GENERIC_PROVISIONING_LINK_CLOSE: // Close a session on a bearer
@ -454,6 +456,11 @@ static void pb_adv_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
case MESH_SUBEVENT_CAN_SEND_NOW:
#ifdef ENABLE_MESH_PROVISIONER
if (link_state == LINK_STATE_W4_ACK){
pb_adv_provisioner_open_countdown--;
if (pb_adv_provisioner_open_countdown == 0){
pb_adv_emit_link_open(ERROR_CODE_PAGE_TIMEOUT, pb_adv_cid);
break;
}
// build packet
uint8_t buffer[22];
big_endian_store_32(buffer, 0, pb_adv_link_id);
@ -623,6 +630,7 @@ uint16_t pb_adv_create_link(const uint8_t * device_uuid){
pb_adv_peer_device_uuid = device_uuid;
pb_adv_provisioner_role = 1;
pb_adv_provisioner_open_countdown = PB_ADV_LINK_OPEN_RETRIES;
// create new 32-bit link id
pb_adv_link_id = pb_adv_random();

8
src/mesh/provisioning_provisioner.c
View File

@ -646,9 +646,17 @@ static void provisioning_handle_pdu(uint8_t packet_type, uint16_t channel, uint8
if (packet[0] != HCI_EVENT_MESH_META) break;
switch (packet[2]){
case MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN:
switch (mesh_subevent_pb_transport_link_open_get_status(packet)) {
case ERROR_CODE_SUCCESS:
printf("Link opened, sending Invite\n");
provisioning_handle_link_opened(pb_adv_cid);
break;
default:
printf("Link open failed, abort\n");
provisioning_done();
break;
}
break;
case MESH_SUBEVENT_PB_TRANSPORT_PDU_SENT:
printf("Outgoing packet acked\n");
prov_waiting_for_outgoing_complete = 0;

9
test/mesh/mesh_pts.c
View File

@ -154,7 +154,14 @@ static void mesh_provisioning_message_handler (uint8_t packet_type, uint16_t cha
case HCI_EVENT_MESH_META:
switch(packet[2]){
case MESH_SUBEVENT_PB_TRANSPORT_LINK_OPEN:
printf("Provisioner link opened");
switch (mesh_subevent_pb_transport_link_open_get_status(packet)){
case ERROR_CODE_SUCCESS:
printf("Provisioner link opened\n");
break;
default:
printf("Provisioner link open failed, status 0x%02x\n", mesh_subevent_pb_transport_link_open_get_status(packet));
break;
}
break;
case MESH_SUBEVENT_PB_TRANSPORT_LINK_CLOSED:
printf("Provisioner link close");