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

avrcp: reject incoming second l2cap connection

Browse Source
This commit is contained in:
Matthias Ringwald 2023-08-15 23:22:15 +02:00
parent ad03e5562e
commit e39127d3f3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- HFP AG: fix setup of audio connection in service level established event
- HFP AG: fix BCM WBS setup
- HID Device: set Report Mode as default
- AVRCP: reject incoming second l2cap connection
### Changed
- btstack_crypto: allow MBEDTLS config via MBEDTLS_CONFIG_FILE

14
src/classic/avrcp.c
View File

@ -983,6 +983,7 @@ static void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t
uint8_t status;
bool decline_connection;
bool outoing_active;
bool connection_already_established;
hci_con_handle_t con_handle;
avrcp_connection_t * connection_controller;
@ -1002,12 +1003,17 @@ static void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t
con_handle = l2cap_event_incoming_connection_get_handle(packet);
outoing_active = false;
connection_already_established = false;
connection_target = avrcp_get_connection_for_bd_addr_for_role(AVRCP_TARGET, event_addr);
if (connection_target != NULL){
if (connection_target->state == AVCTP_CONNECTION_W4_L2CAP_CONNECTED){
outoing_active = true;
connection_target->incoming_declined = true;
}
if (connection_target->state >= AVCTP_CONNECTION_OPENED){
connection_already_established = true;
}
}
connection_controller = avrcp_get_connection_for_bd_addr_for_role(AVRCP_CONTROLLER, event_addr);
@ -1016,9 +1022,12 @@ static void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t
outoing_active = true;
connection_controller->incoming_declined = true;
}
if (connection_controller->state >= AVCTP_CONNECTION_OPENED){
connection_already_established = true;
}
}
decline_connection = outoing_active;
decline_connection = outoing_active || connection_already_established;
if (decline_connection == false){
uint16_t avrcp_cid;
if ((connection_controller == NULL) || (connection_target == NULL)){
@ -1040,9 +1049,10 @@ static void avrcp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t
}
}
if (decline_connection){
log_info("Decline connection 0x%04x: outgoing active %u, connection already established: %u", local_cid, outoing_active, connection_already_established);
l2cap_decline_connection(local_cid);
} else {
log_info("AVRCP: L2CAP_EVENT_INCOMING_CONNECTION local cid 0x%02x, state %d", local_cid, connection_controller->state);
log_info("AVRCP: L2CAP_EVENT_INCOMING_CONNECTION local cid 0x%04x, state %d", local_cid, connection_controller->state);
l2cap_accept_connection(local_cid);
}
break;