From f93ebdf2d61602122d6c3957db13f59de26032a0 Mon Sep 17 00:00:00 2001 From: Milanka Ringwald Date: Thu, 8 Dec 2016 12:10:11 +0100 Subject: [PATCH] acp close stream --- test/avdtp/avdtp.h | 15 ++++-- test/avdtp/avdtp_acceptor.c | 93 +++++++++++++++++++++++++++++-------- test/avdtp/avdtp_sink.c | 34 +++++++++----- 3 files changed, 109 insertions(+), 33 deletions(-) diff --git a/test/avdtp/avdtp.h b/test/avdtp/avdtp.h index aeb0368c0..21f6ad436 100644 --- a/test/avdtp/avdtp.h +++ b/test/avdtp/avdtp.h @@ -304,7 +304,6 @@ typedef enum { typedef enum { AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE, - AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD, AVDTP_ACCEPTOR_W2_ANSWER_GET_CAPABILITIES, AVDTP_ACCEPTOR_W2_ANSWER_GET_ALL_CAPABILITIES, AVDTP_ACCEPTOR_W2_ANSWER_SET_CONFIGURATION, @@ -313,6 +312,16 @@ typedef enum { AVDTP_ACCEPTOR_W2_ANSWER_OPEN_STREAM, AVDTP_ACCEPTOR_W4_L2CAP_FOR_MEDIA_CONNECTED, AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM, + + // AVDTP_ACCEPTOR_W2_DISCONNECT_L2CAP_FOR_MEDIA, + // AVDTP_ACCEPTOR_W4_L2CAP_FOR_MEDIA_DISCONNECTED, + AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM, + + // AVDTP_ACCEPTOR_W2_DISCONNECT_L2CAP_FOR_SIGNALING, + // AVDTP_ACCEPTOR_W4_L2CAP_FOR_SIGNALING_DISCONNECTED, + + AVDTP_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE, + AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD, AVDTP_ACCEPTOR_STREAMING } avdtp_acceptor_stream_endpoint_state_t; @@ -381,8 +390,6 @@ typedef struct avdtp_stream_endpoint { avdtp_acceptor_stream_endpoint_state_t acceptor_config_state; avdtp_initiator_stream_endpoint_state_t initiator_config_state; - avdtp_signal_identifier_t unknown_signal_identifier; - // active connection avdtp_connection_t * connection; // store remote seps @@ -394,6 +401,8 @@ typedef struct avdtp_stream_endpoint { // register request for L2cap connection release uint8_t disconnect; uint8_t failed_reconfigure_service_category; + avdtp_signal_identifier_t reject_signal_identifier; + uint8_t error_code; } avdtp_stream_endpoint_t; #if defined __cplusplus diff --git a/test/avdtp/avdtp_acceptor.c b/test/avdtp/avdtp_acceptor.c index 2373586f6..0a35991b7 100644 --- a/test/avdtp/avdtp_acceptor.c +++ b/test/avdtp/avdtp_acceptor.c @@ -277,19 +277,31 @@ int avdtp_acceptor_stream_config_subsm(avdtp_stream_endpoint_t * stream_endpoint if (stream_endpoint->state != AVDTP_STREAM_ENDPOINT_OPENED) return 0; printf(" ACP: AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM\n"); stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM; + // TODO remove set acceptor_transaction_label stream_endpoint->connection->acceptor_transaction_label = signaling_header->transaction_label; break; + case AVDTP_SI_CLOSE: + if (stream_endpoint->state != AVDTP_STREAM_ENDPOINT_OPENED && + stream_endpoint->state != AVDTP_STREAM_ENDPOINT_STREAMING){ + printf(" ACP: AVDTP_SI_CLOSE, bad state %d \n", stream_endpoint->state); + stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE; + stream_endpoint->error_code = BAD_STATE; + stream_endpoint->reject_signal_identifier = signaling_header->signal_identifier; + break; + } + printf(" ACP: AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM\n"); + stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CLOSING; + stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM; + break; default: printf(" ACP: NOT IMPLEMENTED, Reject signal_identifier %02x\n", signaling_header->signal_identifier); stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD; - stream_endpoint->unknown_signal_identifier = signaling_header->signal_identifier; + stream_endpoint->reject_signal_identifier = signaling_header->signal_identifier; break; } break; - default: - request_to_send = 0; - break; + return 0; } if (!request_to_send){ @@ -313,66 +325,109 @@ static int avdtp_acceptor_send_response_reject(uint16_t cid, avdtp_signal_ident return l2cap_send(cid, command, sizeof(command)); } +static int avdtp_acceptor_send_response_reject_with_error_code(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t error_code, uint8_t transaction_label){ + uint8_t command[3]; + command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_GENERAL_REJECT_MSG); + command[1] = (uint8_t)identifier; + command[2] = error_code; + return l2cap_send(cid, command, sizeof(command)); +} + int avdtp_acceptor_stream_config_subsm_run(avdtp_connection_t * connection, avdtp_stream_endpoint_t * stream_endpoint){ if (!stream_endpoint) return 0; int sent = 1; - switch (stream_endpoint->acceptor_config_state){ + + uint8_t failed_reconfigure_service_category = stream_endpoint->failed_reconfigure_service_category; + avdtp_signal_identifier_t reject_signal_identifier = stream_endpoint->reject_signal_identifier; + uint8_t error_code = stream_endpoint->error_code; + + avdtp_acceptor_stream_endpoint_state_t acceptor_config_state = stream_endpoint->acceptor_config_state; + stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; + + switch (acceptor_config_state){ case AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE: break; case AVDTP_ACCEPTOR_W2_ANSWER_GET_CAPABILITIES: printf(" ACP: DONE\n"); - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; avdtp_acceptor_send_capabilities_response(connection->l2cap_signaling_cid, connection->acceptor_transaction_label, stream_endpoint->sep); break; case AVDTP_ACCEPTOR_W2_ANSWER_GET_ALL_CAPABILITIES: - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; printf(" ACP: DONE\n"); avdtp_acceptor_send_all_capabilities_response(connection->l2cap_signaling_cid, connection->acceptor_transaction_label, stream_endpoint->sep); break; case AVDTP_ACCEPTOR_W2_ANSWER_SET_CONFIGURATION: printf(" ACP: DONE\n"); - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; stream_endpoint->connection = connection; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CONFIGURED; avdtp_acceptor_send_accept_response(connection->l2cap_signaling_cid, AVDTP_SI_SET_CONFIGURATION, connection->acceptor_transaction_label); break; case AVDTP_ACCEPTOR_W2_ANSWER_GET_CONFIGURATION: printf(" ACP: DONE\n"); - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; avdtp_acceptor_send_stream_configuration_response(connection->l2cap_signaling_cid, connection->acceptor_transaction_label, stream_endpoint->remote_seps[stream_endpoint->remote_sep_index]); break; - case AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD: - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; - printf(" ACP: DONE\n"); - avdtp_acceptor_send_response_reject(connection->l2cap_signaling_cid, stream_endpoint->unknown_signal_identifier, connection->acceptor_transaction_label); - break; case AVDTP_ACCEPTOR_W2_ANSWER_OPEN_STREAM: printf(" ACP: AVDTP_STREAM_ENDPOINT_W4_L2CAP_FOR_MEDIA_CONNECTED\n"); - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_W4_L2CAP_FOR_MEDIA_CONNECTED; avdtp_acceptor_send_accept_response(stream_endpoint->connection->l2cap_signaling_cid, AVDTP_SI_OPEN, stream_endpoint->connection->acceptor_transaction_label); break; case AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM: printf(" ACP: AVDTP_STREAM_ENDPOINT_STREAMING \n"); - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_STREAMING; avdtp_acceptor_send_accept_response(stream_endpoint->connection->l2cap_signaling_cid, AVDTP_SI_START, stream_endpoint->connection->acceptor_transaction_label); break; case AVDTP_ACCEPTOR_W2_ANSWER_RECONFIGURE: printf(" ACP: DONE \n"); - stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; if (stream_endpoint->failed_reconfigure_service_category){ - avdtp_acceptor_send_response_reject_service_category(stream_endpoint->connection->l2cap_signaling_cid, AVDTP_SI_RECONFIGURE, - stream_endpoint->failed_reconfigure_service_category, stream_endpoint->connection->acceptor_transaction_label); stream_endpoint->failed_reconfigure_service_category = 0; + avdtp_acceptor_send_response_reject_service_category(stream_endpoint->connection->l2cap_signaling_cid, AVDTP_SI_RECONFIGURE, + failed_reconfigure_service_category, stream_endpoint->connection->acceptor_transaction_label); + } else { avdtp_acceptor_send_accept_response(stream_endpoint->connection->l2cap_signaling_cid, AVDTP_SI_RECONFIGURE, stream_endpoint->connection->acceptor_transaction_label); } break; + + case AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM: + printf(" ACP: DONE\n"); + // stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED; + stream_endpoint->state = AVDTP_STREAM_ENDPOINT_IDLE; + printf(" ACP: AVDTP_STREAM_ENDPOINT_OPENED\n"); + avdtp_acceptor_send_accept_response(stream_endpoint->connection->l2cap_signaling_cid, AVDTP_SI_CLOSE, connection->acceptor_transaction_label); + break; + + // case AVDTP_ACCEPTOR_W2_DISCONNECT_L2CAP_FOR_MEDIA: + // printf(" ACP: AVDTP_ACCEPTOR_W4_L2CAP_FOR_MEDIA_DISCONNECTED\n"); + // stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W4_L2CAP_FOR_MEDIA_DISCONNECTED; + // l2cap_disconnect(stream_endpoint->l2cap_media_cid, 0); + // break; + // case AVDTP_ACCEPTOR_W2_DISCONNECT_L2CAP_FOR_SIGNALING: + // printf(" ACP: AVDTP_ACCEPTOR_W4_L2CAP_FOR_SIGNALING_DISCONNECTED\n"); + // stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W4_L2CAP_FOR_SIGNALING_DISCONNECTED; + // if (!stream_endpoint->connection){ + // stream_endpoint->state = AVDTP_STREAM_ENDPOINT_IDLE; + // stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_STREAM_CONFIG_IDLE; + // return 0; + // } + // l2cap_disconnect(stream_endpoint->connection->l2cap_signaling_cid, 0); + // break; + + case AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD: + printf(" ACP: REJECT\n"); + stream_endpoint->reject_signal_identifier = 0; + avdtp_acceptor_send_response_reject(connection->l2cap_signaling_cid, reject_signal_identifier, connection->acceptor_transaction_label); + break; + + case AVDTP_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE: + printf(" ACP: REJECT\n"); + stream_endpoint->reject_signal_identifier = 0; + stream_endpoint->error_code = 0; + avdtp_acceptor_send_response_reject_with_error_code(connection->l2cap_signaling_cid, reject_signal_identifier, error_code, connection->acceptor_transaction_label); + break; default: printf(" ACP: NOT IMPLEMENTED\n"); return 0; } + return sent; } diff --git a/test/avdtp/avdtp_sink.c b/test/avdtp/avdtp_sink.c index c51b20895..399079e05 100644 --- a/test/avdtp/avdtp_sink.c +++ b/test/avdtp/avdtp_sink.c @@ -493,16 +493,15 @@ static int handle_l2cap_data_packet_for_connection(avdtp_connection_t * connecti case AVDTP_SI_GET_CONFIGURATION: case AVDTP_SI_OPEN: case AVDTP_SI_START: - connection->query_seid = packet[2] >> 2; - stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid); - // printf(" handle_l2cap_data_packet_for_connection 2\n"); - return handle_l2cap_data_packet_for_stream_endpoint(connection, stream_endpoint, packet, size); case AVDTP_SI_RECONFIGURE: + //case AVDTP_SI_CLOSE: + connection->query_seid = packet[2] >> 2; + stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid); + return handle_l2cap_data_packet_for_stream_endpoint(connection, stream_endpoint, packet, size); + case AVDTP_SI_CLOSE: connection->query_seid = packet[2] >> 2; stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid); - printf(" AVDTP_SI_RECONFIGURE handle_l2cap_data_packet_for_connection 2\n"); return handle_l2cap_data_packet_for_stream_endpoint(connection, stream_endpoint, packet, size); - case AVDTP_SI_SUSPEND:{ int i; for (i=2; icon_handle = con_handle; connection->query_seid = 0; connection->state = AVDTP_SIGNALING_CONNECTION_OPENED; - printf(" -> AVDTP_SIGNALING_CONNECTION_OPENED\n"); + printf(" -> AVDTP_SIGNALING_CONNECTION_OPENED, connection %p\n", connection); break; } @@ -684,8 +683,9 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe if (stream_endpoint->l2cap_media_cid == 0){ if (stream_endpoint->state != AVDTP_STREAM_ENDPOINT_W4_L2CAP_FOR_MEDIA_CONNECTED) return; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED; + stream_endpoint->connection = connection; stream_endpoint->l2cap_media_cid = local_cid; - printf(" -> AVDTP_STREAM_ENDPOINT_OPENED\n"); + printf(" -> AVDTP_STREAM_ENDPOINT_OPENED, stream endpoint %p, connection %p\n", stream_endpoint, connection); break; } break; @@ -694,8 +694,10 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe // data: event (8), len(8), channel (16) local_cid = l2cap_event_channel_closed_get_local_cid(packet); connection = get_avdtp_connection_for_l2cap_signaling_cid(local_cid); + printf(" -> L2CAP_EVENT_CHANNEL_CLOSED signaling cid 0x%0x\n", local_cid); + if (connection){ - log_info(" -> L2CAP_EVENT_CHANNEL_CLOSED signaling cid 0x%0x", local_cid); + printf(" -> AVDTP_STREAM_ENDPOINT_IDLE, connection closed\n"); stream_endpoint = get_avdtp_stream_endpoint_for_connection(connection); btstack_linked_list_remove(&avdtp_connections, (btstack_linked_item_t*) connection); if (!stream_endpoint) break; @@ -714,9 +716,19 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe if (!stream_endpoint) return; if (stream_endpoint->l2cap_media_cid == local_cid){ - log_info(" -> L2CAP_EVENT_CHANNEL_CLOSED media cid 0x%0x", local_cid); - stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CONFIGURED; + // printf(" -> L2CAP_EVENT_CHANNEL_CLOSED media cid 0x%0x, stream endpoint %p, connection %p", local_cid, stream_endpoint, stream_endpoint->connection); stream_endpoint->l2cap_media_cid = 0; + if (stream_endpoint->state == AVDTP_STREAM_ENDPOINT_CLOSING){ + if (stream_endpoint->connection){ + // stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_CLOSED; + // avdtp_sink_request_can_send_now_acceptor(stream_endpoint->connection, stream_endpoint->connection->l2cap_signaling_cid); + break; + } else { + printf(" closing media channel, no signaling connection registered\n"); + } + break; + } + stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CONFIGURED; break; }