mirror of
https://github.com/bluekitchen/btstack.git
synced 2025-02-06 03:40:16 +00:00
sm: fix CTKD over BR/EDR
This commit is contained in:
parent
8e0bef02fe
commit
20964aa9e7
@ -13,7 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|||||||
### Fixed
|
### Fixed
|
||||||
- RFCOMM: shut down multiplexer after closing last channel instead of multiplexer idle timer
|
- RFCOMM: shut down multiplexer after closing last channel instead of multiplexer idle timer
|
||||||
- HID Host: return complete HID report
|
- HID Host: return complete HID report
|
||||||
|
- SM: fix CTDK key distribution over BR/EDR
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
- GAP: return command disallowed if disconnect already requested
|
- GAP: return command disallowed if disconnect already requested
|
||||||
|
|
||||||
|
@ -3319,10 +3319,16 @@ static void sm_run(void){
|
|||||||
sm_send_connectionless(connection, (uint8_t *) &setup->sm_s_pres, sizeof(sm_pairing_packet_t));
|
sm_send_connectionless(connection, (uint8_t *) &setup->sm_s_pres, sizeof(sm_pairing_packet_t));
|
||||||
break;
|
break;
|
||||||
case SM_BR_EDR_DISTRIBUTE_KEYS:
|
case SM_BR_EDR_DISTRIBUTE_KEYS:
|
||||||
|
// send next key
|
||||||
if (setup->sm_key_distribution_send_set != 0) {
|
if (setup->sm_key_distribution_send_set != 0) {
|
||||||
sm_run_distribute_keys(connection);
|
sm_run_distribute_keys(connection);
|
||||||
|
}
|
||||||
|
|
||||||
|
// more to send?
|
||||||
|
if (setup->sm_key_distribution_send_set != 0){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// keys are sent
|
// keys are sent
|
||||||
if (IS_RESPONDER(connection->sm_role)) {
|
if (IS_RESPONDER(connection->sm_role)) {
|
||||||
// responder -> receive master keys if there are any
|
// responder -> receive master keys if there are any
|
||||||
|
Loading…
x
Reference in New Issue
Block a user