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

avdtp_initiator: follow specification for stream endpoint states

Browse Source
This commit is contained in:
Milanka Ringwald 2020-10-01 16:14:33 +02:00
parent 7f162947d9
commit 00e061db23
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/classic/avdtp_initiator.c
View File

@ -236,16 +236,34 @@ void avdtp_initiator_stream_config_subsm(avdtp_connection_t *connection, uint8_t
log_error("AVDTP_SI_CLOSE: stream endpoint is null"); log_error("AVDTP_SI_CLOSE: stream endpoint is null");
break; break;
} }
switch (stream_endpoint->state){
case AVDTP_STREAM_ENDPOINT_OPENED:
case AVDTP_STREAM_ENDPOINT_STREAMING:
stream_endpoint_for_event = stream_endpoint; stream_endpoint_for_event = stream_endpoint;
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CLOSING; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CLOSING;
l2cap_disconnect(stream_endpoint->l2cap_media_cid, 0);
break;
default:
break;
}
break; break;
case AVDTP_SI_ABORT: case AVDTP_SI_ABORT:
if (!stream_endpoint){ if (!stream_endpoint){
log_error("AVDTP_SI_ABORT: stream endpoint is null"); log_error("AVDTP_SI_ABORT: stream endpoint is null");
break; break;
} }
switch (stream_endpoint->state){
case AVDTP_STREAM_ENDPOINT_CONFIGURED:
case AVDTP_STREAM_ENDPOINT_CLOSING:
case AVDTP_STREAM_ENDPOINT_OPENED:
case AVDTP_STREAM_ENDPOINT_STREAMING:
stream_endpoint_for_event = stream_endpoint; stream_endpoint_for_event = stream_endpoint;
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_ABORTING; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_ABORTING;
l2cap_disconnect(stream_endpoint->l2cap_media_cid, 0);
break;
default:
break;
}
break; break;
case AVDTP_SI_DELAYREPORT: case AVDTP_SI_DELAYREPORT:
@ -403,16 +421,18 @@ void avdtp_initiator_stream_config_subsm_run(avdtp_connection_t *connection) {
} }
} }
if (stream_endpoint->stop_stream){ if (stream_endpoint->close_stream){
stream_endpoint->stop_stream = 0; stream_endpoint->close_stream = 0;
if (stream_endpoint->state >= AVDTP_STREAM_ENDPOINT_OPENED){ switch (stream_endpoint->state){
case AVDTP_STREAM_ENDPOINT_OPENED:
case AVDTP_STREAM_ENDPOINT_STREAMING:
connection->initiator_local_seid = stream_endpoint->sep.seid; connection->initiator_local_seid = stream_endpoint->sep.seid;
connection->initiator_remote_seid = stream_endpoint->remote_sep.seid; connection->initiator_remote_seid = stream_endpoint->remote_sep.seid;
connection->initiator_transaction_label = avdtp_get_next_transaction_label(); connection->initiator_transaction_label = avdtp_get_next_transaction_label();
avdtp_initiator_send_signaling_cmd_with_seid(connection->l2cap_signaling_cid, AVDTP_SI_CLOSE, connection->initiator_transaction_label, connection->initiator_remote_seid); avdtp_initiator_send_signaling_cmd_with_seid(connection->l2cap_signaling_cid, AVDTP_SI_CLOSE, connection->initiator_transaction_label, connection->initiator_remote_seid);
return; return;
if (stream_endpoint->close_stream){ default:
stream_endpoint->close_stream = 0; break;
} }
} }
@ -425,7 +445,6 @@ void avdtp_initiator_stream_config_subsm_run(avdtp_connection_t *connection) {
case AVDTP_STREAM_ENDPOINT_STREAMING: case AVDTP_STREAM_ENDPOINT_STREAMING:
connection->initiator_local_seid = stream_endpoint->sep.seid; connection->initiator_local_seid = stream_endpoint->sep.seid;
connection->initiator_remote_seid = stream_endpoint->remote_sep.seid; connection->initiator_remote_seid = stream_endpoint->remote_sep.seid;
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_ABORTING;
connection->initiator_transaction_label = avdtp_get_next_transaction_label(); connection->initiator_transaction_label = avdtp_get_next_transaction_label();
avdtp_initiator_send_signaling_cmd_with_seid(connection->l2cap_signaling_cid, AVDTP_SI_ABORT, connection->initiator_transaction_label, connection->initiator_remote_seid); avdtp_initiator_send_signaling_cmd_with_seid(connection->l2cap_signaling_cid, AVDTP_SI_ABORT, connection->initiator_transaction_label, connection->initiator_remote_seid);
return; return;