mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-24 06:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

gatt_client/att_server: track mtu exchanged in hci_connection->att_connection

Browse Source
This commit is contained in:
Matthias Ringwald 2020-12-29 15:12:03 +01:00
parent 388fa7c4de
commit dde9ff1e19
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ble/att_db.c
View File

@ -369,6 +369,7 @@ static uint16_t handle_exchange_mtu_request(att_connection_t * att_connection, u
// find min(local max mtu, remote mtu) >= ATT_DEFAULT_MTU and use as mtu for this connection // find min(local max mtu, remote mtu) >= ATT_DEFAULT_MTU and use as mtu for this connection
uint16_t min_mtu = btstack_min(client_rx_mtu, att_connection->max_mtu); uint16_t min_mtu = btstack_min(client_rx_mtu, att_connection->max_mtu);
uint16_t new_mtu = btstack_max(ATT_DEFAULT_MTU, min_mtu); uint16_t new_mtu = btstack_max(ATT_DEFAULT_MTU, min_mtu);
att_connection->mtu_exchanged = true;
att_connection->mtu = new_mtu; att_connection->mtu = new_mtu;
response_buffer[0] = ATT_EXCHANGE_MTU_RESPONSE; response_buffer[0] = ATT_EXCHANGE_MTU_RESPONSE;

1
src/ble/att_db.h
View File

@ -109,6 +109,7 @@ typedef struct att_connection {
hci_con_handle_t con_handle; hci_con_handle_t con_handle;
uint16_t mtu; // initialized to ATT_DEFAULT_MTU (23), negotiated during MTU exchange uint16_t mtu; // initialized to ATT_DEFAULT_MTU (23), negotiated during MTU exchange
uint16_t max_mtu; // local maximal L2CAP_MTU, set to l2cap_max_le_mtu() uint16_t max_mtu; // local maximal L2CAP_MTU, set to l2cap_max_le_mtu()
bool mtu_exchanged;
uint8_t encryption_key_size; uint8_t encryption_key_size;
uint8_t authenticated; uint8_t authenticated;
uint8_t authorized; uint8_t authorized;

11
src/ble/gatt_client.c
View File

@ -1319,8 +1319,17 @@ static void gatt_client_att_packet_handler(uint8_t packet_type, uint16_t handle,
if (size < 3u) break; if (size < 3u) break;
uint16_t remote_rx_mtu = little_endian_read_16(packet, 1); uint16_t remote_rx_mtu = little_endian_read_16(packet, 1);
uint16_t local_rx_mtu = l2cap_max_le_mtu(); uint16_t local_rx_mtu = l2cap_max_le_mtu();
gatt_client->mtu = (remote_rx_mtu < local_rx_mtu) ? remote_rx_mtu : local_rx_mtu; uint16_t mtu = (remote_rx_mtu < local_rx_mtu) ? remote_rx_mtu : local_rx_mtu;
// set gatt client mtu
gatt_client->mtu = mtu;
gatt_client->mtu_state = MTU_EXCHANGED; gatt_client->mtu_state = MTU_EXCHANGED;
// set per connection mtu state
hci_connection_t * hci_connection = hci_connection_for_handle(handle);
hci_connection->att_connection.mtu = gatt_client->mtu;
hci_connection->att_connection.mtu_exchanged = true;
emit_gatt_mtu_exchanged_result_event(gatt_client, gatt_client->mtu); emit_gatt_mtu_exchanged_result_event(gatt_client, gatt_client->mtu);
break; break;
} }

4
src/hci.c
View File

@ -2221,6 +2221,10 @@ static void event_handle_le_connection_complete(const uint8_t * packet){
} }
#endif #endif
// init unenhanced att bearer mtu
conn->att_connection.mtu = ATT_DEFAULT_MTU;
conn->att_connection.mtu_exchanged = false;
// TODO: store - role, peer address type, conn_interval, conn_latency, supervision timeout, master clock // TODO: store - role, peer address type, conn_interval, conn_latency, supervision timeout, master clock
// restart timer // restart timer