mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-09 21:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug: crash in log, initiator: serch for associated sep

Browse Source
This commit is contained in:
Milanka Ringwald 2017-01-18 15:32:17 +01:00
parent ce9654bbbd
commit 2176119607
3 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/avdtp/avdtp_acceptor.c
View File

@ -230,7 +230,7 @@ void avdtp_acceptor_stream_config_subsm(avdtp_connection_t * connection, uint8_t
stream_endpoint->remote_sep_index = i; stream_endpoint->remote_sep_index = i;
} }
} }
printf(" ACP .. seid %d, index %d, in use %d\n", sep.seid, stream_endpoint->remote_sep_index, stream_endpoint->remote_seps[stream_endpoint->remote_sep_index].in_use ); printf(" ACP .. seid %d, index %d\n", sep.seid, stream_endpoint->remote_sep_index);
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){ if (stream_endpoint->remote_seps[stream_endpoint->remote_sep_index].in_use){

63
test/avdtp/avdtp_initiator.c
View File

@ -47,22 +47,27 @@
#include "avdtp_util.h" #include "avdtp_util.h"
#include "avdtp_initiator.h" #include "avdtp_initiator.h"
// static int avdtp_initiator_send_get_all_capabilities_cmd(uint16_t cid, uint8_t transaction_label, uint8_t sep_id){ static avdtp_stream_endpoint_t * get_avdtp_stream_endpoint_associated_with_acp_seid(uint16_t acp_seid){
// uint8_t command[3]; btstack_linked_list_iterator_t it;
// command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_CMD_MSG); btstack_linked_list_iterator_init(&it, (btstack_linked_list_t *) &stream_endpoints);
// command[1] = AVDTP_SI_GET_ALL_CAPABILITIES; while (btstack_linked_list_iterator_has_next(&it)){
// command[2] = sep_id << 2; avdtp_stream_endpoint_t * stream_endpoint = (avdtp_stream_endpoint_t *)btstack_linked_list_iterator_next(&it);
// return l2cap_send(cid, command, sizeof(command)); if (stream_endpoint->remote_sep_index >= 0 && stream_endpoint->remote_sep_index < MAX_NUM_SEPS){
// } if (stream_endpoint->remote_seps[stream_endpoint->remote_sep_index].seid == acp_seid){
return stream_endpoint;
// static int avdtp_initiator_send_get_capabilities_cmd(uint16_t cid, uint8_t transaction_label, uint8_t sep_id){ }
// uint8_t command[3]; }
// command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_CMD_MSG);
// command[1] = AVDTP_SI_GET_CAPABILITIES; // int i;
// command[2] = sep_id << 2; // for (i=0; i<stream_endpoint->remote_seps_num; i++){
// return l2cap_send(cid, command, sizeof(command)); // if (stream_endpoint->remote_seps[i].seid == acp_seid){
// } // return stream_endpoint;
// }
// }
}
return NULL;
}
static int avdtp_initiator_send_signaling_cmd(uint16_t cid, avdtp_signal_identifier_t identifier, uint8_t transaction_label){ static int avdtp_initiator_send_signaling_cmd(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_CMD_MSG); command[0] = avdtp_header(transaction_label, AVDTP_SINGLE_PACKET, AVDTP_CMD_MSG);
@ -148,7 +153,6 @@ void avdtp_initiator_stream_config_subsm(avdtp_connection_t * connection, uint8_
avdtp_sep_t sep; avdtp_sep_t sep;
sep.seid = connection->query_seid; sep.seid = connection->query_seid;
sep.configured_service_categories = avdtp_unpack_service_capabilities(connection, &sep.configuration, packet+offset, size-offset); sep.configured_service_categories = avdtp_unpack_service_capabilities(connection, &sep.configuration, packet+offset, size-offset);
sep.in_use = 1;
printf(" INT .. seid %d, configured services 0%02x\n", sep.seid, sep.configured_service_categories); printf(" INT .. seid %d, configured services 0%02x\n", sep.seid, sep.configured_service_categories);
@ -228,22 +232,47 @@ void avdtp_initiator_stream_config_subsm(avdtp_connection_t * connection, uint8_
case AVDTP_SI_OPEN: case AVDTP_SI_OPEN:
printf("AVDTP_SI_OPEN\n"); printf("AVDTP_SI_OPEN\n");
stream_endpoint = get_avdtp_stream_endpoint_associated_with_acp_seid(connection->query_seid);
if (!stream_endpoint) {
status = 1;
break;
}
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED;
break; break;
case AVDTP_SI_START: case AVDTP_SI_START:
printf("AVDTP_SI_START\n"); printf("AVDTP_SI_START\n");
stream_endpoint = get_avdtp_stream_endpoint_associated_with_acp_seid(connection->query_seid);
if (!stream_endpoint) {
status = 1;
break;
}
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_STREAMING; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_STREAMING;
break; break;
case AVDTP_SI_SUSPEND: case AVDTP_SI_SUSPEND:
printf("AVDTP_SI_SUSPEND\n"); printf("AVDTP_SI_SUSPEND\n");
stream_endpoint = get_avdtp_stream_endpoint_associated_with_acp_seid(connection->query_seid);
if (!stream_endpoint) {
status = 1;
break;
}
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_OPENED;
break; break;
case AVDTP_SI_CLOSE: case AVDTP_SI_CLOSE:
printf("AVDTP_SI_CLOSE\n"); printf("AVDTP_SI_CLOSE\n");
stream_endpoint = get_avdtp_stream_endpoint_associated_with_acp_seid(connection->query_seid);
if (!stream_endpoint) {
status = 1;
break;
}
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CLOSING; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_CLOSING;
break; break;
case AVDTP_SI_ABORT: case AVDTP_SI_ABORT:
printf("AVDTP_SI_ABORT\n"); printf("AVDTP_SI_ABORT\n");
stream_endpoint = get_avdtp_stream_endpoint_associated_with_acp_seid(connection->query_seid);
if (!stream_endpoint) {
status = 1;
break;
}
stream_endpoint->state = AVDTP_STREAM_ENDPOINT_ABORTING; stream_endpoint->state = AVDTP_STREAM_ENDPOINT_ABORTING;
break; break;
default: default:

12
test/avdtp/avdtp_util.c
View File

@ -490,7 +490,11 @@ void avdtp_signaling_emit_media_codec_other_capability(btstack_packet_handler_t
pos += 2; pos += 2;
little_endian_store_16(event, pos, media_codec.media_codec_information_len); little_endian_store_16(event, pos, media_codec.media_codec_information_len);
pos += 2; pos += 2;
memcpy(event+pos, media_codec.media_codec_information, media_codec.media_codec_information_len); if (media_codec.media_codec_information_len < 100){
memcpy(event+pos, media_codec.media_codec_information, media_codec.media_codec_information_len);
} else {
memcpy(event+pos, media_codec.media_codec_information, 100);
}
(*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event)); (*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event));
} }
@ -598,8 +602,12 @@ static inline void avdtp_signaling_emit_media_codec_other(btstack_packet_handler
pos += 2; pos += 2;
little_endian_store_16(event, pos, media_codec.media_codec_information_len); little_endian_store_16(event, pos, media_codec.media_codec_information_len);
pos += 2; pos += 2;
memcpy(event+pos, media_codec.media_codec_information, media_codec.media_codec_information_len);
if (media_codec.media_codec_information_len < 100){
memcpy(event+pos, media_codec.media_codec_information, media_codec.media_codec_information_len);
} else {
memcpy(event+pos, media_codec.media_codec_information, 100);
}
(*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event)); (*callback)(HCI_EVENT_PACKET, 0, event, sizeof(event));
} }