mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-15 22:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

sm: cache local address in sm_connection_t at connection complete

Browse Source
This commit is contained in:
Matthias Ringwald 2021-06-11 10:15:54 +02:00
parent 6edb4dfb63
commit d5314cbe14
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ble/sm.c
View File

@ -1172,15 +1172,17 @@ static void sm_init_setup(sm_connection_t * sm_conn){
if (IS_RESPONDER(sm_conn->sm_role)){
// slave
local_packet = &setup->sm_s_pres;
gap_le_get_own_address(&setup->sm_s_addr_type, setup->sm_s_address);
setup->sm_m_addr_type = sm_conn->sm_peer_addr_type;
setup->sm_s_addr_type = sm_conn->sm_own_addr_type;
(void)memcpy(setup->sm_m_address, sm_conn->sm_peer_address, 6);
(void)memcpy(setup->sm_s_address, sm_conn->sm_own_address, 6);
} else {
// master
local_packet = &setup->sm_m_preq;
gap_le_get_own_address(&setup->sm_m_addr_type, setup->sm_m_address);
setup->sm_s_addr_type = sm_conn->sm_peer_addr_type;
setup->sm_m_addr_type = sm_conn->sm_own_addr_type;
(void)memcpy(setup->sm_s_address, sm_conn->sm_peer_address, 6);
(void)memcpy(setup->sm_m_address, sm_conn->sm_own_address, 6);
int key_distribution_flags = sm_key_distribution_flags_for_auth_req();
sm_pairing_packet_set_initiator_key_distribution(setup->sm_m_preq, key_distribution_flags);
@ -3508,6 +3510,7 @@ static void sm_event_packet_handler (uint8_t packet_type, uint16_t channel, uint
sm_conn->sm_role = packet[6];
sm_conn->sm_peer_addr_type = packet[7];
reverse_bd_addr(&packet[8], sm_conn->sm_peer_address);
gap_le_get_own_address(&sm_conn->sm_own_addr_type, sm_conn->sm_own_address);
log_info("New sm_conn, role %s", sm_conn->sm_role ? "slave" : "master");

2
src/hci.h
View File

@ -418,6 +418,8 @@ typedef struct sm_connection {
uint8_t sm_pairing_requested;
uint8_t sm_peer_addr_type;
bd_addr_t sm_peer_address;
uint8_t sm_own_addr_type;
bd_addr_t sm_own_address;
security_manager_state_t sm_engine_state;
irk_lookup_state_t sm_irk_lookup_state;
uint8_t sm_pairing_failed_reason;