mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-16 08:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

reject invalid suspend sink acp

Browse Source
This commit is contained in:
Milanka Ringwald 2016-12-21 16:42:32 +01:00
parent 2c137daffd
commit 76ccdd8c99
4 changed files with 118 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/avdtp/avdtp.h
View File

@ -320,6 +320,8 @@ typedef enum {
AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM, AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM,
AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM, AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM,
AVDTP_ACCEPTOR_W2_ANSWER_ABORT_STREAM, AVDTP_ACCEPTOR_W2_ANSWER_ABORT_STREAM,
AVDTP_ACCEPTOR_W2_SUSPEND_STREAM_WITH_SEID,
AVDTP_ACCEPTOR_W2_ANSWER_SUSPEND_STREAM,
AVDTP_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE, AVDTP_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE,
AVDTP_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE, AVDTP_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE,
AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD, AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD,
@ -348,7 +350,8 @@ typedef enum {
AVDTP_SIGNALING_CONNECTION_ACCEPTOR_IDLE, AVDTP_SIGNALING_CONNECTION_ACCEPTOR_IDLE,
AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_ANSWER_DISCOVER_SEPS, AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_ANSWER_DISCOVER_SEPS,
AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE, AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE,
AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE,
AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_GENERAL_REJECT_WITH_ERROR_CODE
} avdtp_acceptor_connection_state_t; } avdtp_acceptor_connection_state_t;
typedef enum { typedef enum {
@ -392,7 +395,9 @@ typedef struct {
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 wait_to_send_self;
uint8_t confirm_suspend;
uint8_t suspended_seids[MAX_NUM_SEPS];
uint8_t num_suspended_seids;
uint8_t reject_service_category; uint8_t reject_service_category;
avdtp_signal_identifier_t reject_signal_identifier; avdtp_signal_identifier_t reject_signal_identifier;

55
test/avdtp/avdtp_acceptor.c
View File

@ -381,9 +381,45 @@ int avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, avdtp_st
} }
break; break;
case AVDTP_SI_ABORT: case AVDTP_SI_ABORT:
printf(" ACP: AVDTP_ACCEPTOR_W2_ANSWER_ABORT_STREAM\n"); switch (stream_endpoint->state){
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_ABORTING; case AVDTP_STREAM_ENDPOINT_CONFIGURED:
stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_ABORT_STREAM; case AVDTP_STREAM_ENDPOINT_CLOSING:
case AVDTP_STREAM_ENDPOINT_OPENED:
case AVDTP_STREAM_ENDPOINT_STREAMING:
printf(" ACP: AVDTP_ACCEPTOR_W2_ANSWER_ABORT_STREAM\n");
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_ABORTING;
stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_ABORT_STREAM;
break;
default:
printf(" ACP: AVDTP_SI_ABORT, bad state %d \n", stream_endpoint->state);
stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE;
connection->error_code = BAD_STATE;
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
break;
}
break;
case AVDTP_SI_SUSPEND:
switch (stream_endpoint->state){
case AVDTP_STREAM_ENDPOINT_OPENED:
case AVDTP_STREAM_ENDPOINT_STREAMING:
printf(" ACP: AVDTP_ACCEPTOR_W2_ANSWER_SUSPEND_STREAM\n");
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED;
connection->num_suspended_seids--;
if (connection->num_suspended_seids <= 0){
printf(" ACP: AVDTP_ACCEPTOR_W2_ANSWER_SUSPEND_STREAM\n");
stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_ANSWER_SUSPEND_STREAM;
}
break;
default:
printf(" ACP: AVDTP_SI_SUSPEND, bad state \n");
stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE;
connection->error_code = BAD_STATE;
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
break;
}
//stream_endpoint->state = AVDTP_STREAM_ENDPOINT_SUSPENDING;
//stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_SUSPEND_STREAM;
break; break;
default: default:
printf(" ACP: NOT IMPLEMENTED, Reject signal_identifier %02x\n", connection->signaling_packet.signal_identifier); printf(" ACP: NOT IMPLEMENTED, Reject signal_identifier %02x\n", connection->signaling_packet.signal_identifier);
@ -411,6 +447,13 @@ int avdtp_acceptor_send_response_reject_service_category(uint16_t cid, avdtp_si
return l2cap_send(cid, command, sizeof(command)); return l2cap_send(cid, command, sizeof(command));
} }
int avdtp_acceptor_send_response_general_reject(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label){
uint8_t command[2];
command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_GENERAL_REJECT_MSG);
command[1] = (uint8_t)identifier;
return l2cap_send(cid, command, sizeof(command));
}
static int avdtp_acceptor_send_response_reject(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label){ static int avdtp_acceptor_send_response_reject(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label){
uint8_t command[2]; uint8_t command[2];
command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_RESPONSE_REJECT_MSG); command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_RESPONSE_REJECT_MSG);
@ -532,6 +575,7 @@ int avdtp_acceptor_stream_config_subsm_run(avdtp_connection_t * connection, avdt
case AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM: case AVDTP_ACCEPTOR_W2_ANSWER_START_STREAM:
printf(" ACP: DONE \n"); printf(" ACP: DONE \n");
printf(" -> AVDTP_STREAM_ENDPOINT_STREAMING \n"); printf(" -> AVDTP_STREAM_ENDPOINT_STREAMING \n");
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_STREAMING;
avdtp_acceptor_send_accept_response(cid, trid, AVDTP_SI_START); avdtp_acceptor_send_accept_response(cid, trid, AVDTP_SI_START);
break; break;
case AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM: case AVDTP_ACCEPTOR_W2_ANSWER_CLOSE_STREAM:
@ -542,6 +586,11 @@ int avdtp_acceptor_stream_config_subsm_run(avdtp_connection_t * connection, avdt
printf(" ACP: DONE\n"); printf(" ACP: DONE\n");
avdtp_acceptor_send_accept_response(cid, trid, AVDTP_SI_ABORT); avdtp_acceptor_send_accept_response(cid, trid, AVDTP_SI_ABORT);
break; break;
case AVDTP_ACCEPTOR_W2_ANSWER_SUSPEND_STREAM:
printf(" ACP: DONE\n");
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED;
avdtp_acceptor_send_accept_response(cid, trid, AVDTP_SI_SUSPEND);
break;
case AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD: case AVDTP_ACCEPTOR_W2_REJECT_UNKNOWN_CMD:
printf(" ACP: DONE REJECT\n"); printf(" ACP: DONE REJECT\n");
connection->reject_signal_identifier = 0; connection->reject_signal_identifier = 0;

1
test/avdtp/avdtp_acceptor.h
View File

@ -56,6 +56,7 @@ int avdtp_acceptor_stream_config_subsm_run(avdtp_connection_t * connection, avd
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); 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);
int avdtp_acceptor_send_response_reject_service_category(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t category, uint8_t error_code, uint8_t transaction_label); int avdtp_acceptor_send_response_reject_service_category(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t category, uint8_t error_code, uint8_t transaction_label);
int avdtp_acceptor_send_response_general_reject(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label);
#if defined __cplusplus #if defined __cplusplus
} }

82
test/avdtp/avdtp_sink.c
View File

@ -351,12 +351,12 @@ static avdtp_stream_endpoint_t * get_avdtp_stream_endpoint_for_connection(avdtp_
return NULL; return NULL;
} }
static int avdtp_acceptor_send_accept_response(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label){ // static int avdtp_acceptor_send_accept_response(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label){
uint8_t command[2]; // uint8_t command[2];
command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_RESPONSE_ACCEPT_MSG); // command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_RESPONSE_ACCEPT_MSG);
command[1] = (uint8_t)identifier; // command[1] = (uint8_t)identifier;
return l2cap_send(cid, command, sizeof(command)); // return l2cap_send(cid, command, sizeof(command));
} // }
static int avdtp_send_seps_response(uint16_t cid, uint8_t transaction_label, avdtp_stream_endpoint_t * endpoints){ static int avdtp_send_seps_response(uint16_t cid, uint8_t transaction_label, avdtp_stream_endpoint_t * endpoints){
uint8_t command[2+2*MAX_NUM_SEPS]; uint8_t command[2+2*MAX_NUM_SEPS];
@ -417,12 +417,12 @@ static void avdtp_sink_handle_can_send_now(avdtp_connection_t * connection, uint
} else if (connection->wait_to_send_self){ } else if (connection->wait_to_send_self){
connection->wait_to_send_self = 0; connection->wait_to_send_self = 0;
if (connection->confirm_suspend){ // if (connection->confirm_suspend){
printf(" -> STREAMS SUSPENDED\n"); // printf(" -> STREAMS SUSPENDED\n");
connection->confirm_suspend = 0; // connection->confirm_suspend = 0;
avdtp_acceptor_send_accept_response(connection->l2cap_signaling_cid, AVDTP_SI_SUSPEND, connection->acceptor_transaction_label); // avdtp_acceptor_send_accept_response(connection->l2cap_signaling_cid, AVDTP_SI_SUSPEND, connection->acceptor_transaction_label);
return; // return;
} // }
switch (connection->acceptor_connection_state){ switch (connection->acceptor_connection_state){
case AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_ANSWER_DISCOVER_SEPS: case AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_ANSWER_DISCOVER_SEPS:
@ -439,6 +439,9 @@ static void avdtp_sink_handle_can_send_now(avdtp_connection_t * connection, uint
connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_IDLE; connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_IDLE;
avdtp_acceptor_send_response_reject_service_category(connection->l2cap_signaling_cid, connection->reject_signal_identifier, connection->reject_service_category, connection->error_code, connection->acceptor_transaction_label); avdtp_acceptor_send_response_reject_service_category(connection->l2cap_signaling_cid, connection->reject_signal_identifier, connection->reject_service_category, connection->error_code, connection->acceptor_transaction_label);
return; return;
case AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_GENERAL_REJECT_WITH_ERROR_CODE:
connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_IDLE;
avdtp_acceptor_send_response_general_reject(connection->l2cap_signaling_cid, connection->reject_signal_identifier, connection->acceptor_transaction_label);
default: default:
break; break;
} }
@ -464,7 +467,7 @@ static void avdtp_sink_handle_can_send_now(avdtp_connection_t * connection, uint
/* END: tracking can send now requests pro l2cap cid */ /* END: tracking can send now requests pro l2cap cid */
static int handle_l2cap_data_packet_for_stream_endpoint(avdtp_connection_t * connection, avdtp_stream_endpoint_t * stream_endpoint, uint8_t *packet, uint16_t size){ static int handle_l2cap_data_packet_for_stream_endpoint(avdtp_connection_t * connection, avdtp_stream_endpoint_t * stream_endpoint, uint8_t *packet, uint16_t size){
avdtp_read_signaling_header(&connection->signaling_packet, packet, size); avdtp_read_signaling_header(&connection->signaling_packet, packet, size);
if (connection->signaling_packet.message_type == AVDTP_CMD_MSG){ if (connection->signaling_packet.message_type == AVDTP_CMD_MSG){
if (avdtp_acceptor_stream_config_subsm(connection, stream_endpoint, packet, size)){ if (avdtp_acceptor_stream_config_subsm(connection, stream_endpoint, packet, size)){
avdtp_sink_request_can_send_now_acceptor(connection, connection->l2cap_signaling_cid); avdtp_sink_request_can_send_now_acceptor(connection, connection->l2cap_signaling_cid);
@ -506,7 +509,7 @@ static int handle_l2cap_data_packet_for_signaling_connection(avdtp_connection_t
connection->query_seid = packet[2] >> 2; connection->query_seid = packet[2] >> 2;
stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid); stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid);
if (!stream_endpoint){ if (!stream_endpoint){
printf(" ACP: RESPONSE REJECT BAD_ACP_SEID\n"); printf(" ACP: cmd %d - RESPONSE REJECT BAD_ACP_SEID\n", connection->signaling_packet.signal_identifier);
connection->error_code = BAD_ACP_SEID; connection->error_code = BAD_ACP_SEID;
connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE; connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE;
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier; connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
@ -518,7 +521,7 @@ static int handle_l2cap_data_packet_for_signaling_connection(avdtp_connection_t
connection->query_seid = packet[2] >> 2; connection->query_seid = packet[2] >> 2;
stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid); stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid);
if (!stream_endpoint){ if (!stream_endpoint){
printf(" ACP: CATEGORY RESPONSE REJECT BAD_ACP_SEID\n"); printf(" ACP: AVDTP_SI_RECONFIGURE - CATEGORY RESPONSE REJECT BAD_ACP_SEID\n");
connection->error_code = BAD_ACP_SEID; connection->error_code = BAD_ACP_SEID;
connection->reject_service_category = 0; connection->reject_service_category = 0;
connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE; connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE;
@ -532,7 +535,7 @@ static int handle_l2cap_data_packet_for_signaling_connection(avdtp_connection_t
connection->query_seid = packet[2] >> 2; connection->query_seid = packet[2] >> 2;
stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid); stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid);
if (!stream_endpoint){ if (!stream_endpoint){
printf(" ACP: RESPONSE REJECT BAD_STATE\n"); printf(" ACP: AVDTP_SI_OPEN - RESPONSE REJECT BAD_STATE\n");
connection->error_code = BAD_STATE; connection->error_code = BAD_STATE;
connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE; connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_WITH_ERROR_CODE;
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier; connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
@ -543,18 +546,49 @@ static int handle_l2cap_data_packet_for_signaling_connection(avdtp_connection_t
case AVDTP_SI_SUSPEND:{ case AVDTP_SI_SUSPEND:{
int i; int i;
int request_to_send = 0;
printf(" ACP: AVDTP_SI_SUSPEND seids: ");
connection->num_suspended_seids = 0;
for (i=2; i<size; i++){ for (i=2; i<size; i++){
stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(packet[i] >> 2); connection->suspended_seids[connection->num_suspended_seids] = packet[i] >> 2;
if (!stream_endpoint) continue; printf("%d, \n", connection->suspended_seids[connection->num_suspended_seids]);
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED; connection->num_suspended_seids++;
} }
connection->confirm_suspend = 1;
avdtp_sink_request_can_send_now_self(connection, connection->l2cap_signaling_cid); if (connection->num_suspended_seids == 0) {
return 1; printf(" ACP: CATEGORY RESPONSE REJECT BAD_ACP_SEID\n");
connection->error_code = BAD_ACP_SEID;
connection->reject_service_category = connection->query_seid;
connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE;
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
avdtp_sink_request_can_send_now_self(connection, connection->l2cap_signaling_cid);
return 1;
}
// deal with first susspended seid
for (i = 0; i < connection->num_suspended_seids; i++){
connection->query_seid = connection->suspended_seids[i];
stream_endpoint = get_avdtp_stream_endpoint_for_active_seid(connection->query_seid);
if (!stream_endpoint){
printf(" ACP: stream_endpoint not found, CATEGORY RESPONSE REJECT BAD_ACP_SEID\n");
connection->error_code = BAD_ACP_SEID;
connection->reject_service_category = connection->query_seid;
connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE;
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
avdtp_sink_request_can_send_now_self(connection, connection->l2cap_signaling_cid);
connection->num_suspended_seids = 0;
return 1;
}
request_to_send = handle_l2cap_data_packet_for_stream_endpoint(connection, stream_endpoint, packet, size);
}
return request_to_send;
} }
default: default:
printf("AVDTP_CMD_MSG signal %d not implemented\n", connection->signaling_packet.signal_identifier); connection->acceptor_connection_state = AVDTP_SIGNALING_CONNECTION_ACCEPTOR_W2_GENERAL_REJECT_WITH_ERROR_CODE;
break; connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
avdtp_sink_request_can_send_now_self(connection, connection->l2cap_signaling_cid);
printf("AVDTP_CMD_MSG signal %d not implemented, general reject\n", connection->signaling_packet.signal_identifier);
return 1;
} }
break; break;
case AVDTP_RESPONSE_ACCEPT_MSG: case AVDTP_RESPONSE_ACCEPT_MSG: