mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-29 03:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

gap: don't emit security level while security request is active. fixes l2cap disconnect caused by parallel SDP connection

Browse Source
This commit is contained in:
Matthias Ringwald 2018-04-30 21:27:10 +02:00
parent 7f6c636291
commit 83d08d7c4e
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hci.c
View File

@ -4052,12 +4052,28 @@ void gap_request_security_level(hci_con_handle_t con_handle, gap_security_level_
return; return;
} }
gap_security_level_t current_level = gap_security_level(con_handle); gap_security_level_t current_level = gap_security_level(con_handle);
log_info("gap_request_security_level %u, current level %u", requested_level, current_level); log_info("gap_request_security_level requested level %u, planned level %u, current level %u",
if (current_level >= requested_level){ requested_level, connection->requested_security_level, current_level);
// assumption: earlier requested security higher than current level => security request is active
if (current_level < connection->requested_security_level){
if (connection->requested_security_level < requested_level){
// increase requested level as new level is higher
// TODO: handle re-authentication when done
connection->requested_security_level = requested_level;
}
return;
}
// no request active, notify if security sufficient
if (requested_level <= current_level){
hci_emit_security_level(con_handle, current_level); hci_emit_security_level(con_handle, current_level);
return; return;
} }
// start pairing to increase security level
connection->requested_security_level = requested_level; connection->requested_security_level = requested_level;
#if 0 #if 0
@ -4077,7 +4093,7 @@ void gap_request_security_level(hci_con_handle_t con_handle, gap_security_level_
} }
#endif #endif
// try to authenticate connection // start to authenticate connection
connection->bonding_flags |= BONDING_SEND_AUTHENTICATE_REQUEST; connection->bonding_flags |= BONDING_SEND_AUTHENTICATE_REQUEST;
hci_run(); hci_run();
} }