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

avrcp target: reject invalid pid

Browse Source
This commit is contained in:
Milanka Ringwald 2018-04-27 14:12:22 +02:00
parent 6704943572
commit 355a220f69
3 changed files with 57 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/classic/avrcp.h
View File

@ -399,7 +399,8 @@ typedef struct {
// PID check
uint8_t reject_transport_header;
uint8_t transport_header;
uint16_t invalid_pid;
// command
uint8_t transaction_label;
avrcp_command_opcode_t command_opcode;

70
src/classic/avrcp_target.c
View File

@ -605,8 +605,8 @@ uint8_t avrcp_target_play_status(uint16_t avrcp_cid, uint32_t song_length_ms, ui
}
static uint8_t avrcp_target_now_playing_info(avrcp_connection_t * connection){
connection->now_playing_info_response = 1;
if (connection->state != AVCTP_CONNECTION_OPENED) return ERROR_CODE_COMMAND_DISALLOWED;
connection->now_playing_info_response = 1;
connection->command_opcode = AVRCP_CMD_OPCODE_VENDOR_DEPENDENT;
connection->command_type = AVRCP_CTYPE_RESPONSE_IMPLEMENTED_STABLE;
connection->subunit_type = AVRCP_SUBUNIT_TYPE_PANEL;
@ -764,30 +764,44 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
UNUSED(size);
// uint8_t opcode;
uint16_t pid = 0;
uint8_t transport_header = packet[0];
connection->transaction_label = transport_header >> 4;
// uint8_t packet_type = (transport_header & 0x0F) >> 2;
// uint8_t frame_type = (transport_header & 0x03) >> 1;
avrcp_packet_type_t packet_type = (transport_header & 0x0F) >> 2;
switch (packet_type){
case AVRCP_SINGLE_PACKET:
pid = big_endian_read_16(packet, 1);
break;
case AVRCP_START_PACKET:
pid = big_endian_read_16(packet, 2);
break;
default:
break;
}
switch (packet_type){
case AVRCP_SINGLE_PACKET:
case AVRCP_START_PACKET:
if (pid != BLUETOOTH_SERVICE_CLASS_AV_REMOTE_CONTROL){
log_info("Invalid pid 0x%02x, expected 0x%02x", connection->invalid_pid, BLUETOOTH_SERVICE_CLASS_AV_REMOTE_CONTROL);
connection->reject_transport_header = 1;
connection->invalid_pid = pid;
connection->transport_header = (connection->transaction_label << 4) | (AVRCP_SINGLE_PACKET << 2 ) | (AVRCP_RESPONSE_FRAME << 1) | 1;
connection->state = AVCTP_W2_SEND_RESPONSE;
avrcp_request_can_send_now(connection, connection->l2cap_signaling_cid);
return;
}
break;
default:
break;
}
uint16_t pid = big_endian_read_16(packet, 1);
printf("PID 0x%02x, BLUETOOTH_SERVICE_CLASS_AV_REMOTE_CONTROL 0x%02x, header 0x%02x\n",pid, BLUETOOTH_SERVICE_CLASS_AV_REMOTE_CONTROL, transport_header);
if (pid != BLUETOOTH_SERVICE_CLASS_AV_REMOTE_CONTROL){
connection->reject_transport_header = 1;
connection->transport_header = (connection->transaction_label << 4) | (AVRCP_SINGLE_PACKET << 2 ) | (AVRCP_RESPONSE_FRAME << 1) | 0;
printf("reject pid, header 0x%02x\n", connection->transport_header);
connection->state = AVCTP_W2_SEND_RESPONSE;
avrcp_request_can_send_now(connection, connection->l2cap_signaling_cid);
return;
}
// avrcp_command_type_t ctype = (avrcp_command_type_t) packet[3];
// uint8_t byte_value = packet[4];
avrcp_subunit_type_t subunit_type = (avrcp_subunit_type_t) (packet[4] >> 3);
avrcp_subunit_id_t subunit_id = (avrcp_subunit_id_t) (packet[4] & 0x07);
// opcode = packet[pos++];
// printf(" Transport header 0x%02x (transaction_label %d, packet_type %d, frame_type %d, ipid %d), pid 0x%4x\n",
// transport_header, transaction_label, packet_type, frame_type, ipid, pid);
// printf_hexdump(packet+pos, size-pos);
@ -1118,16 +1132,6 @@ static void avrcp_target_packet_handler(uint8_t packet_type, uint16_t channel, u
log_error("Connection not found\n");
break;
}
if (connection->reject_transport_header){
connection->reject_transport_header = 0;
printf("send reject_transport_header \n");
l2cap_reserve_packet_buffer();
uint8_t * out_buffer = l2cap_get_outgoing_buffer();
out_buffer[0] = connection->transport_header;
l2cap_send_prepared(connection->l2cap_signaling_cid, 1);
break;
}
if (connection->abort_continue_response){
connection->abort_continue_response = 0;
@ -1190,6 +1194,20 @@ static void avrcp_target_packet_handler(uint8_t packet_type, uint16_t channel, u
break;
}
if (connection->reject_transport_header){
printf(" reject_transport_header\n");
connection->state = AVCTP_CONNECTION_OPENED;
connection->reject_transport_header = 0;
l2cap_reserve_packet_buffer();
uint8_t * out_buffer = l2cap_get_outgoing_buffer();
out_buffer[0] = connection->transport_header;
big_endian_store_16(out_buffer, 1, connection->invalid_pid);
l2cap_send_prepared(connection->l2cap_signaling_cid, 3);
avrcp_request_can_send_now(connection, connection->l2cap_signaling_cid);
break;
}
switch (connection->state){
case AVCTP_W2_SEND_RESPONSE:
connection->state = AVCTP_CONNECTION_OPENED;

96
test/pts/avrcp_target_test.c
View File

@ -731,7 +731,8 @@ static void show_usage(void){
printf("h - trigger notification BATT_STATUS_CHANGED\n");
printf("l - trigger notification NOW_PLAYING_CONTENT_CHANGED\n");
printf("t - select track\n");
printf("t - select track with short info\n");
printf("t - select track with long info\n");
// printf("x - start streaming sine\n");
@ -768,112 +769,37 @@ static void stdin_process(char * cmd, int size){
case '\n':
case '\r':
break;
case 'a':
printf("AVRCP: trigger notification PLAYBACK_STATUS_CHANGED\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_PLAYBACK_STATUS_CHANGED);
break;
case 's':{
printf("AVRCP: trigger notification TRACK_CHANGED\n");
uint8_t track_id[8] = {0x00, 0x03, 0x02, 0x01, 0x00, 0x03, 0x02, 0x01};
avrcp_target_track_changed(avrcp_cid, track_id);
break;
}
case 'd':
printf("AVRCP: trigger notification TRACK_REACHED_END\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_TRACK_REACHED_END);
break;
case 'f':
printf("AVRCP: trigger notification TRACK_REACHED_START\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_TRACK_REACHED_START);
break;
case 'g':
printf("AVRCP: trigger notification PLAYBACK_POS_CHANGED\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_PLAYBACK_POS_CHANGED);
break;
case 'h':
printf("AVRCP: trigger notification BATT_STATUS_CHANGED\n");
avrcp_target_battery_status_changed(avrcp_cid, AVRCP_BATTERY_STATUS_CRITICAL);
break;
case 'j':
printf("AVRCP: trigger notification SYSTEM_STATUS_CHANGED\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_SYSTEM_STATUS_CHANGED);
break;
case 'k':
printf("AVRCP: trigger notification PLAYER_APPLICATION_SETTING_CHANGED\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_PLAYER_APPLICATION_SETTING_CHANGED);
break;
case 'l':
printf("AVRCP: trigger notification NOW_PLAYING_CONTENT_CHANGED\n");
avrcp_target_playing_content_changed(avrcp_cid);
break;
case 'm':
printf("AVRCP: trigger notification AVAILABLE_PLAYERS_CHANGED\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_AVAILABLE_PLAYERS_CHANGED);
break;
case 'n':
printf("AVRCP: trigger notification ADDRESSED_PLAYER_CHANGED\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_ADDRESSED_PLAYER_CHANGED);
break;
case 'y':
printf("AVRCP: trigger notification UIDS_CHANGED\n");
// avrcp_target_trigger_notification(avrcp_cid, AVRCP_NOTIFICATION_EVENT_UIDS_CHANGED);
break;
case 'v':
printf("AVRCP: trigger notification VOLUME_CHANGED 20per\n");
avrcp_target_volume_changed(avrcp_cid, 20);
break;
case 't':
if (avrcp_connected){
avrcp_target_set_now_playing_info(avrcp_cid, &tracks[data_source], sizeof(tracks)/sizeof(avrcp_track_t));
printf("AVRCP: Set now playing info, with short info\n");
avrcp_target_set_now_playing_info(avrcp_cid, &tracks[0], sizeof(tracks)/sizeof(avrcp_track_t));
}
break;
case 'T':
if (avrcp_connected){
printf("AVRCP: Set now playing info, with long info\n");
avrcp_target_set_now_playing_info(avrcp_cid, &tracks[2], sizeof(tracks)/sizeof(avrcp_track_t));
}
break;
// case 'p':
// if (avrcp_connected){
// avrcp_target_volume_changed(avrcp_cid, &tracks[data_source], sizeof(tracks)/sizeof(avrcp_track_t));
// }
// break;
// case 't':
// printf("STREAM_PTS_TEST.\n");
// data_source = STREAM_PTS_TEST;
// if (avrcp_connected){
// avrcp_target_set_now_playing_info(avrcp_cid, &tracks[data_source], sizeof(tracks)/sizeof(avrcp_track_t));
// }
// if (!media_tracker.stream_opened) break;
// status = a2dp_source_start_stream(media_tracker.a2dp_cid, media_tracker.local_seid);
// break;
// case 'x':
// if (avrcp_connected){
// avrcp_target_set_now_playing_info(avrcp_cid, &tracks[data_source], sizeof(tracks)/sizeof(avrcp_track_t));
// }
// printf("Playing sine.\n");
// data_source = STREAM_SINE;
// if (!media_tracker.stream_opened) break;
// status = a2dp_source_start_stream(media_tracker.a2dp_cid, media_tracker.local_seid);
// break;
// case 'z':
// if (avrcp_connected){
// avrcp_target_set_now_playing_info(avrcp_cid, &tracks[data_source], sizeof(tracks)/sizeof(avrcp_track_t));
// }
// printf("Playing mod.\n");
// data_source = STREAM_MOD;
// if (!media_tracker.stream_opened) break;
// status = a2dp_source_start_stream(media_tracker.a2dp_cid, media_tracker.local_seid);
// break;
// case 'p':
// if (!media_tracker.connected) break;
// printf("Pause stream.\n");
// status = a2dp_source_pause_stream(media_tracker.a2dp_cid, media_tracker.local_seid);
// break;
// case '0':
// if (avrcp_connected){
// avrcp_target_set_now_playing_info(avrcp_cid, NULL, sizeof(tracks)/sizeof(avrcp_track_t));
// printf("Reset now playing info\n");
// }
// break;
case 'p':