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

hci: use ERROR_CODEs instead of constants, set connection>state = SENT_DISCONNECT upon sending HCI Disconnect

Browse Source
This commit is contained in:
Matthias Ringwald 2020-06-03 15:15:03 +02:00
parent 82721f83fe
commit 6ef3696af0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hci.c
View File

@ -3774,7 +3774,7 @@ static bool hci_run_general_pending_commmands(void){
#endif
case SEND_DISCONNECT:
connection->state = SENT_DISCONNECT;
hci_send_cmd(&hci_disconnect, connection->con_handle, 0x13); // remote closed connection
hci_send_cmd(&hci_disconnect, connection->con_handle, ERROR_CODE_REMOTE_USER_TERMINATED_CONNECTION);
return true;
default:
@ -3873,7 +3873,8 @@ static bool hci_run_general_pending_commmands(void){
if (connection->bonding_flags & BONDING_DISCONNECT_DEDICATED_DONE){
connection->bonding_flags &= ~BONDING_DISCONNECT_DEDICATED_DONE;
connection->bonding_flags |= BONDING_EMIT_COMPLETE_ON_DISCONNECT;
hci_send_cmd(&hci_disconnect, connection->con_handle, 0x13); // authentication done
connection->state = SENT_DISCONNECT;
hci_send_cmd(&hci_disconnect, connection->con_handle, ERROR_CODE_REMOTE_USER_TERMINATED_CONNECTION);
return true;
}
@ -3897,9 +3898,12 @@ static bool hci_run_general_pending_commmands(void){
if (connection->bonding_flags & BONDING_DISCONNECT_SECURITY_BLOCK){
connection->bonding_flags &= ~BONDING_DISCONNECT_SECURITY_BLOCK;
hci_send_cmd(&hci_disconnect, connection->con_handle, 0x0005); // authentication failure
if (connection->state != SENT_DISCONNECT){
connection->state = SENT_DISCONNECT;
hci_send_cmd(&hci_disconnect, connection->con_handle, ERROR_CODE_AUTHENTICATION_FAILURE);
return true;
}
}
#ifdef ENABLE_CLASSIC
uint16_t sniff_min_interval;
@ -4036,7 +4040,7 @@ static void hci_run(void){
hci_shutdown_connection(connection);
// finally, send the disconnect command
hci_send_cmd(&hci_disconnect, con_handle, 0x13); // remote closed connection
hci_send_cmd(&hci_disconnect, con_handle, ERROR_CODE_REMOTE_USER_TERMINATED_CONNECTION);
return;
}
@ -4092,7 +4096,7 @@ static void hci_run(void){
if (!hci_can_send_command_packet_now()) return;
log_info("HCI_STATE_FALLING_ASLEEP, connection %p, handle %u", connection, (uint16_t)connection->con_handle);
hci_send_cmd(&hci_disconnect, connection->con_handle, 0x13); // remote closed connection
hci_send_cmd(&hci_disconnect, connection->con_handle, ERROR_CODE_REMOTE_USER_TERMINATED_CONNECTION);
// send disconnected event right away - causes higher layer connections to get closed, too.
hci_shutdown_connection(connection);