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

gap: return command disallowed if disconnect already requested

Browse Source
This commit is contained in:
Matthias Ringwald 2024-06-28 11:05:47 +02:00
parent 66093044db
commit 61972f0a59
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- HID Host: return complete HID report - HID Host: return complete HID report
### Changed ### Changed
- GAP: return command disallowed if disconnect already requested
## Release v1.6.1 ## Release v1.6.1

22
src/hci.c
View File

@ -9035,13 +9035,23 @@ uint8_t gap_disconnect(hci_con_handle_t handle){
hci_emit_disconnection_complete(handle, 0); hci_emit_disconnection_complete(handle, 0);
return 0; return 0;
} }
// ignore if already disconnected uint8_t status = ERROR_CODE_SUCCESS;
if (conn->state == RECEIVED_DISCONNECTION_COMPLETE){ switch (conn->state){
return 0; case RECEIVED_DISCONNECTION_COMPLETE:
// ignore if remote just disconnected
break;
case SEND_DISCONNECT:
case SENT_DISCONNECT:
// disconnect already requested or sent
status = ERROR_CODE_COMMAND_DISALLOWED;
break;
default:
// trigger hci_disconnect
conn->state = SEND_DISCONNECT;
hci_run();
break;
} }
conn->state = SEND_DISCONNECT; return status;
hci_run();
return 0;
} }
int gap_read_rssi(hci_con_handle_t con_handle){ int gap_read_rssi(hci_con_handle_t con_handle){