mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-07 16:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

sm: rename sm_boding_requested to sm_pairing_requested

Browse Source
This commit is contained in:
Matthias Ringwald 2018-03-30 19:07:19 +02:00
parent b1ec855b75
commit 09ea1b6290
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ble/sm.c
View File

@ -1269,9 +1269,9 @@ static void sm_address_resolution_handle_event(address_resolution_event_t event)
break; break;
} }
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_LE_CENTRAL
if (!sm_connection->sm_bonding_requested && !sm_connection->sm_security_request_received) break; if (!sm_connection->sm_pairing_requested && !sm_connection->sm_security_request_received) break;
sm_connection->sm_security_request_received = 0; sm_connection->sm_security_request_received = 0;
sm_connection->sm_bonding_requested = 0; sm_connection->sm_pairing_requested = 0;
le_device_db_encryption_get(sm_connection->sm_le_db_index, NULL, NULL, ltk, NULL, NULL, NULL); le_device_db_encryption_get(sm_connection->sm_le_db_index, NULL, NULL, ltk, NULL, NULL, NULL);
if (!sm_is_null_key(ltk)){ if (!sm_is_null_key(ltk)){
sm_connection->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK; sm_connection->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK;
@ -1290,9 +1290,9 @@ static void sm_address_resolution_handle_event(address_resolution_event_t event)
break; break;
} }
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_LE_CENTRAL
if (!sm_connection->sm_bonding_requested && !sm_connection->sm_security_request_received) break; if (!sm_connection->sm_pairing_requested && !sm_connection->sm_security_request_received) break;
sm_connection->sm_security_request_received = 0; sm_connection->sm_security_request_received = 0;
sm_connection->sm_bonding_requested = 0; sm_connection->sm_pairing_requested = 0;
sm_connection->sm_engine_state = SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST; sm_connection->sm_engine_state = SM_INITIATOR_PH1_W2_SEND_PAIRING_REQUEST;
#endif #endif
break; break;
@ -4081,11 +4081,11 @@ void sm_request_pairing(hci_con_handle_t con_handle){
} }
break; break;
default: default:
sm_conn->sm_bonding_requested = 1; sm_conn->sm_pairing_requested = 1;
break; break;
} }
} else if (sm_conn->sm_engine_state == SM_GENERAL_IDLE){ } else if (sm_conn->sm_engine_state == SM_GENERAL_IDLE){
sm_conn->sm_bonding_requested = 1; sm_conn->sm_pairing_requested = 1;
} }
} }
sm_run(); sm_run();

2
src/hci.h
View File

@ -380,7 +380,7 @@ typedef struct sm_connection {
hci_con_handle_t sm_handle; hci_con_handle_t sm_handle;
uint8_t sm_role; // 0 - IamMaster, 1 = IamSlave uint8_t sm_role; // 0 - IamMaster, 1 = IamSlave
uint8_t sm_security_request_received; uint8_t sm_security_request_received;
uint8_t sm_bonding_requested; uint8_t sm_pairing_requested;
uint8_t sm_peer_addr_type; uint8_t sm_peer_addr_type;
bd_addr_t sm_peer_address; bd_addr_t sm_peer_address;
security_manager_state_t sm_engine_state; security_manager_state_t sm_engine_state;