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

avdtp: on disconnect call directly l2cap_disconnect on all stream endpoints and then the connection as well

Browse Source
This commit is contained in:
Milanka Ringwald 2020-07-11 15:15:16 +02:00
parent b401ff594c
commit f01aeca4c9
4 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/classic/avdtp.c
View File

@ -391,32 +391,11 @@ void avdtp_handle_can_send_now(avdtp_connection_t * connection, uint16_t l2cap_c
log_debug("call avdtp_initiator_stream_config_subsm_run"); log_debug("call avdtp_initiator_stream_config_subsm_run");
connection->wait_to_send_initiator = 0; connection->wait_to_send_initiator = 0;
avdtp_initiator_stream_config_subsm_run(connection, context); avdtp_initiator_stream_config_subsm_run(connection, context);
} else if (connection->wait_to_send_self){
log_debug("check for disconnect");
connection->wait_to_send_self = 0;
if (connection->disconnect){
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, avdtp_get_stream_endpoints());
while (btstack_linked_list_iterator_has_next(&it)){
avdtp_stream_endpoint_t * stream_endpoint = (avdtp_stream_endpoint_t *)btstack_linked_list_iterator_next(&it);
if (stream_endpoint->connection != connection) continue;
if ((stream_endpoint->state >= AVDTP_STREAM_ENDPOINT_OPENED) && (stream_endpoint->state != AVDTP_STREAM_ENDPOINT_W4_L2CAP_FOR_MEDIA_DISCONNECTED)){
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_W4_L2CAP_FOR_MEDIA_DISCONNECTED;
avdtp_request_can_send_now_self(connection, connection->l2cap_signaling_cid);
l2cap_disconnect(stream_endpoint->l2cap_media_cid, 0);
return;
}
}
connection->disconnect = 0;
connection->state = AVDTP_SIGNALING_CONNECTION_W4_L2CAP_DISCONNECTED;
l2cap_disconnect(connection->l2cap_signaling_cid, 0);
return;
}
} }
// re-register // re-register
int more_to_send = connection->wait_to_send_acceptor || connection->wait_to_send_initiator || connection->wait_to_send_self; bool more_to_send = connection->wait_to_send_acceptor || connection->wait_to_send_initiator;
log_debug("ask for more to send %d: acc-%d, ini-%d, self-%d", more_to_send, connection->wait_to_send_acceptor, connection->wait_to_send_initiator, connection->wait_to_send_self); log_debug("ask for more to send %d: acc-%d, ini-%d", more_to_send, connection->wait_to_send_acceptor, connection->wait_to_send_initiator);
if (more_to_send){ if (more_to_send){
l2cap_request_can_send_now_event(l2cap_cid); l2cap_request_can_send_now_event(l2cap_cid);
@ -871,10 +850,10 @@ void avdtp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
case L2CAP_EVENT_CHANNEL_CLOSED: case L2CAP_EVENT_CHANNEL_CLOSED:
local_cid = l2cap_event_channel_closed_get_local_cid(packet); local_cid = l2cap_event_channel_closed_get_local_cid(packet);
stream_endpoint = avdtp_get_stream_endpoint_for_l2cap_cid(local_cid); stream_endpoint = avdtp_get_stream_endpoint_for_l2cap_cid(local_cid);
log_info("Received L2CAP_EVENT_CHANNEL_CLOSED, cid 0x%2x, connection %p, stream_endpoint %p", local_cid, connection, stream_endpoint);
connection = avdtp_get_connection_for_l2cap_signaling_cid(local_cid); connection = avdtp_get_connection_for_l2cap_signaling_cid(local_cid);
log_info("Received L2CAP_EVENT_CHANNEL_CLOSED, cid 0x%2x, connection %p, stream_endpoint %p", local_cid, connection, stream_endpoint);
if (stream_endpoint){ if (stream_endpoint){
if (stream_endpoint->l2cap_media_cid == local_cid){ if (stream_endpoint->l2cap_media_cid == local_cid){
connection = stream_endpoint->connection; connection = stream_endpoint->connection;
@ -882,9 +861,6 @@ void avdtp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
avdtp_streaming_emit_connection_released(context->avdtp_callback, connection->avdtp_cid, avdtp_local_seid(stream_endpoint)); avdtp_streaming_emit_connection_released(context->avdtp_callback, connection->avdtp_cid, avdtp_local_seid(stream_endpoint));
} }
avdtp_reset_stream_endpoint(stream_endpoint); avdtp_reset_stream_endpoint(stream_endpoint);
if (connection && connection->disconnect){
avdtp_request_can_send_now_self(connection, connection->l2cap_signaling_cid);
}
break; break;
} }
if (stream_endpoint->l2cap_recovery_cid == local_cid){ if (stream_endpoint->l2cap_recovery_cid == local_cid){
@ -904,9 +880,9 @@ void avdtp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet
btstack_linked_list_iterator_t it; btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, avdtp_get_stream_endpoints()); btstack_linked_list_iterator_init(&it, avdtp_get_stream_endpoints());
while (btstack_linked_list_iterator_has_next(&it)){ while (btstack_linked_list_iterator_has_next(&it)){
avdtp_stream_endpoint_t * _stream_endpoint = (avdtp_stream_endpoint_t *)btstack_linked_list_iterator_next(&it); stream_endpoint = (avdtp_stream_endpoint_t *)btstack_linked_list_iterator_next(&it);
if (_stream_endpoint->connection == connection){ if (stream_endpoint->connection == connection){
avdtp_reset_stream_endpoint(_stream_endpoint); avdtp_reset_stream_endpoint(stream_endpoint);
} }
} }
avdtp_signaling_emit_connection_released(context->avdtp_callback, connection->avdtp_cid); avdtp_signaling_emit_connection_released(context->avdtp_callback, connection->avdtp_cid);
@ -947,8 +923,26 @@ uint8_t avdtp_disconnect(uint16_t avdtp_cid){
if (connection->state == AVDTP_SIGNALING_CONNECTION_W4_L2CAP_DISCONNECTED) return ERROR_CODE_SUCCESS; if (connection->state == AVDTP_SIGNALING_CONNECTION_W4_L2CAP_DISCONNECTED) return ERROR_CODE_SUCCESS;
connection->disconnect = 1; btstack_linked_list_iterator_t it;
avdtp_request_can_send_now_self(connection, connection->l2cap_signaling_cid); btstack_linked_list_iterator_init(&it, avdtp_get_stream_endpoints());
while (btstack_linked_list_iterator_has_next(&it)){
avdtp_stream_endpoint_t * stream_endpoint = (avdtp_stream_endpoint_t *)btstack_linked_list_iterator_next(&it);
if (stream_endpoint->connection != connection) continue;
switch (stream_endpoint->state){
case AVDTP_STREAM_ENDPOINT_OPENED:
case AVDTP_STREAM_ENDPOINT_STREAMING:
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_W4_L2CAP_FOR_MEDIA_DISCONNECTED;
l2cap_disconnect(stream_endpoint->l2cap_media_cid, 0);
break;
default:
break;
}
}
connection->state = AVDTP_SIGNALING_CONNECTION_W4_L2CAP_DISCONNECTED;
l2cap_disconnect(connection->l2cap_signaling_cid, 0);
return ERROR_CODE_SUCCESS; return ERROR_CODE_SUCCESS;
} }

3
src/classic/avdtp.h
View File

@ -419,8 +419,6 @@ typedef struct {
avdtp_signaling_packet_t acceptor_signaling_packet; avdtp_signaling_packet_t acceptor_signaling_packet;
avdtp_signaling_packet_t initiator_signaling_packet; avdtp_signaling_packet_t initiator_signaling_packet;
uint8_t disconnect;
uint8_t initiator_local_seid; uint8_t initiator_local_seid;
uint8_t initiator_remote_seid; uint8_t initiator_remote_seid;
@ -435,7 +433,6 @@ typedef struct {
uint8_t acceptor_transaction_label; uint8_t acceptor_transaction_label;
uint8_t wait_to_send_acceptor; uint8_t wait_to_send_acceptor;
uint8_t wait_to_send_initiator; uint8_t wait_to_send_initiator;
uint8_t wait_to_send_self;
uint8_t suspended_seids[AVDTP_MAX_NUM_SEPS]; uint8_t suspended_seids[AVDTP_MAX_NUM_SEPS];
uint8_t num_suspended_seids; uint8_t num_suspended_seids;

7
src/classic/avdtp_util.c
View File

@ -950,13 +950,6 @@ uint8_t avdtp_request_can_send_now_initiator(avdtp_connection_t * connection, ui
return ERROR_CODE_SUCCESS; return ERROR_CODE_SUCCESS;
} }
uint8_t avdtp_request_can_send_now_self(avdtp_connection_t * connection, uint16_t l2cap_cid){
if (!connection) return AVDTP_CONNECTION_DOES_NOT_EXIST;
connection->wait_to_send_self = 1;
l2cap_request_can_send_now_event(l2cap_cid);
return ERROR_CODE_SUCCESS;
}
uint8_t avdtp_local_seid(avdtp_stream_endpoint_t * stream_endpoint){ uint8_t avdtp_local_seid(avdtp_stream_endpoint_t * stream_endpoint){
if (!stream_endpoint) return 0; if (!stream_endpoint) return 0;
return stream_endpoint->sep.seid; return stream_endpoint->sep.seid;

1
src/classic/avdtp_util.h
View File

@ -94,7 +94,6 @@ void avdtp_signaling_emit_media_codec_other_reconfiguration(btstack_packet_handl
uint8_t avdtp_request_can_send_now_acceptor(avdtp_connection_t * connection, uint16_t l2cap_cid); uint8_t avdtp_request_can_send_now_acceptor(avdtp_connection_t * connection, uint16_t l2cap_cid);
uint8_t avdtp_request_can_send_now_initiator(avdtp_connection_t * connection, uint16_t l2cap_cid); uint8_t avdtp_request_can_send_now_initiator(avdtp_connection_t * connection, uint16_t l2cap_cid);
uint8_t avdtp_request_can_send_now_self(avdtp_connection_t * connection, uint16_t l2cap_cid);
void avdtp_reset_stream_endpoint(avdtp_stream_endpoint_t * stream_endpoint); void avdtp_reset_stream_endpoint(avdtp_stream_endpoint_t * stream_endpoint);