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: track remote feature Secure Connections (Host) and (Controller)

Browse Source
This commit is contained in:
Matthias Ringwald 2020-05-27 15:42:14 +02:00
parent 2f5c44ba2e
commit 50c51a777f
2 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/hci.c
View File

@ -1926,6 +1926,17 @@ static void hci_handle_remote_features_page_1(hci_connection_t * conn, const uin
if (features[0] & (1 << 0)){
conn->bonding_flags |= BONDING_REMOTE_SUPPORTS_SSP_HOST;
}
// SC Host
if (features[0] & (1 << 3)){
conn->bonding_flags |= BONDING_REMOTE_SUPPORTS_SC_HOST;
}
}
static void hci_handle_remote_features_page_2(hci_connection_t * conn, const uint8_t * features){
// SC Controller
if (features[1] & (1 << 0)){
conn->bonding_flags |= BONDING_REMOTE_SUPPORTS_SC_CONTROLLER;
}
}
static void hci_handle_remote_features_received(hci_connection_t * conn){
@ -2324,9 +2335,33 @@ static void event_handler(uint8_t *packet, int size){
conn = hci_connection_for_handle(handle);
if (!conn) break;
// status = ok, page = 1
if (!packet[2] && packet[5] == 1){
if (!packet[2]) {
uint8_t page_number = packet[5];
uint8_t maximum_page_number = packet[6];
const uint8_t * features = &packet[7];
hci_handle_remote_features_page_1(conn, features);
bool done = false;
switch (page_number){
case 1:
hci_handle_remote_features_page_1(conn, features);
if (maximum_page_number >= 2){
// get Secure Connections (Controller) from Page 2 if available
conn->bonding_flags |= BONDING_REQUEST_REMOTE_FEATURES_PAGE_2;
} else {
// otherwise, assume SC (Controller) == SC (Host)
if ((conn->bonding_flags & BONDING_REMOTE_SUPPORTS_SC_HOST) != 0){
conn->bonding_flags |= BONDING_REMOTE_SUPPORTS_SC_CONTROLLER;
}
done = true;
}
break;
case 2:
hci_handle_remote_features_page_2(conn, features);
done = true;
break;
default:
break;
}
if (!done) break;
}
hci_handle_remote_features_received(conn);
break;

16
src/hci.h
View File

@ -237,13 +237,15 @@ enum {
BONDING_RECEIVED_REMOTE_FEATURES = 0x0008,
BONDING_REMOTE_SUPPORTS_SSP_CONTROLLER = 0x0010,
BONDING_REMOTE_SUPPORTS_SSP_HOST = 0x0020,
BONDING_DISCONNECT_SECURITY_BLOCK = 0x0040,
BONDING_DISCONNECT_DEDICATED_DONE = 0x0080,
BONDING_SEND_AUTHENTICATE_REQUEST = 0x0100,
BONDING_SEND_ENCRYPTION_REQUEST = 0x0200,
BONDING_SEND_READ_ENCRYPTION_KEY_SIZE = 0x0400,
BONDING_DEDICATED = 0x0800,
BONDING_EMIT_COMPLETE_ON_DISCONNECT = 0x1000,
BONDING_REMOTE_SUPPORTS_SC_CONTROLLER = 0x0040,
BONDING_REMOTE_SUPPORTS_SC_HOST = 0x0080,
BONDING_DISCONNECT_SECURITY_BLOCK = 0x0100,
BONDING_DISCONNECT_DEDICATED_DONE = 0x0200,
BONDING_SEND_AUTHENTICATE_REQUEST = 0x0400,
BONDING_SEND_ENCRYPTION_REQUEST = 0x0800,
BONDING_SEND_READ_ENCRYPTION_KEY_SIZE = 0x1000,
BONDING_DEDICATED = 0x2000,
BONDING_EMIT_COMPLETE_ON_DISCONNECT = 0x4000,
};
typedef enum {