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

reject set configuration if sep in use

Browse Source
This commit is contained in:
Milanka Ringwald 2016-12-14 12:04:47 +01:00
parent deeb51ce0e
commit c94d58dc88
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/avdtp/avdtp.h
View File

@ -331,7 +331,7 @@ typedef struct {
uint8_t in_use; // 1 bit, 0 - not in use, 1 - in use uint8_t in_use; // 1 bit, 0 - not in use, 1 - in use
avdtp_media_type_t media_type; // 4 bit avdtp_media_type_t media_type; // 4 bit
avdtp_sep_type_t type; // 1 bit, 0 - SRC, 1 - SNK avdtp_sep_type_t type; // 1 bit, 0 - SRC, 1 - SNK
uint16_t registered_service_categories; uint16_t registered_service_categories;
avdtp_capabilities_t capabilities; avdtp_capabilities_t capabilities;
} avdtp_sep_t; } avdtp_sep_t;

26
test/avdtp/avdtp_acceptor.c
View File

@ -246,8 +246,10 @@ int avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, avdtp_st
avdtp_sep_t sep; avdtp_sep_t sep;
sep.seid = connection->signaling_packet.command[3] >> 2; sep.seid = connection->signaling_packet.command[3] >> 2;
sep.registered_service_categories = avdtp_unpack_service_capabilities(connection, &sep.capabilities, connection->signaling_packet.command+4, packet_size-4); sep.registered_service_categories = avdtp_unpack_service_capabilities(connection, &sep.capabilities, connection->signaling_packet.command+4, packet_size-4);
sep.in_use = 1;
if (connection->error_code){ if (connection->error_code){
// fire capabilities parsing errors
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier; connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE; stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE;
break; break;
@ -255,20 +257,36 @@ int avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, avdtp_st
printf(" ACP .. seid %d\n", sep.seid); printf(" ACP .. seid %d\n", sep.seid);
// find or add sep // find or add sep
int i; int i;
for (i=0; i < stream_endpoint->remote_seps_num; i++){ for (i=0; i < stream_endpoint->remote_seps_num; i++){
if (stream_endpoint->remote_seps[i].seid == sep.seid){ if (stream_endpoint->remote_seps[i].seid == sep.seid){
stream_endpoint->remote_sep_index = i; stream_endpoint->remote_sep_index = i;
} }
} }
if (stream_endpoint->remote_sep_index == 0xFF){ if (stream_endpoint->remote_sep_index != 0xFF){
if (stream_endpoint->remote_seps[stream_endpoint->remote_sep_index].in_use){
// reject if already configured
connection->error_code = SEP_IN_USE;
// find first registered category and fire the error
connection->reject_service_category = 0;
for (i = 1; i < 9; i++){
if (get_bit16(sep.registered_service_categories, i-1)){
connection->reject_service_category = i;
break;
}
}
connection->reject_signal_identifier = connection->signaling_packet.signal_identifier;
stream_endpoint->acceptor_config_state = AVDTP_ACCEPTOR_W2_REJECT_CATEGORY_WITH_ERROR_CODE;
}
} else {
// add new
printf(" ACP: seid %d not found in %p\n", sep.seid, stream_endpoint); printf(" ACP: seid %d not found in %p\n", sep.seid, stream_endpoint);
stream_endpoint->remote_sep_index = stream_endpoint->remote_seps_num; stream_endpoint->remote_sep_index = stream_endpoint->remote_seps_num;
stream_endpoint->remote_seps_num++; stream_endpoint->remote_seps_num++;
stream_endpoint->remote_seps[stream_endpoint->remote_sep_index] = sep; stream_endpoint->remote_seps[stream_endpoint->remote_sep_index] = sep;
printf(" ACP: add seid %d, to %p\n", stream_endpoint->remote_seps[stream_endpoint->remote_sep_index].seid, stream_endpoint); printf(" ACP: add seid %d, to %p\n", stream_endpoint->remote_seps[stream_endpoint->remote_sep_index].seid, stream_endpoint);
} }
break; break;
} }
case AVDTP_SI_RECONFIGURE:{ case AVDTP_SI_RECONFIGURE:{

2
test/avdtp/avdtp_test.c
View File

@ -60,7 +60,7 @@
#define NUM_CHANNELS 2 #define NUM_CHANNELS 2
#define SAMPLE_RATE 44100 #define SAMPLE_RATE 44100
#define SMG_BI //#define SMG_BI
#ifdef HAVE_PORTAUDIO #ifdef HAVE_PORTAUDIO
#include <portaudio.h> #include <portaudio.h>