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

Fixed connection request handling, read UUIDs in network byte order

Browse Source 
Initialise service struct memory after allocation
This commit is contained in:
ole.reinhardt@googlemail.com 2014-11-19 01:01:11 +00:00
parent bb82004450
commit 34e07d98fe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bnep.c
View File

@ -612,8 +612,8 @@ static int bnep_handle_connection_request(bnep_channel_t *channel, uint8_t *pack
/* Check source and destination UUIDs for valid combinations */ /* Check source and destination UUIDs for valid combinations */
if (response_code == BNEP_RESP_SETUP_SUCCESS) { if (response_code == BNEP_RESP_SETUP_SUCCESS) {
channel->uuid_dest = READ_BT_16(packet, 2 + uuid_offset); channel->uuid_dest = READ_NET_16(packet, 2 + uuid_offset);
channel->uuid_source = READ_BT_16(packet, 2 + uuid_offset + uuid_size); channel->uuid_source = READ_NET_16(packet, 2 + uuid_offset + uuid_size);
if ((channel->uuid_dest != BNEP_UUID_PANU) && if ((channel->uuid_dest != BNEP_UUID_PANU) &&
(channel->uuid_dest != BNEP_UUID_NAP) && (channel->uuid_dest != BNEP_UUID_NAP) &&
@ -978,7 +978,7 @@ static int bnep_hci_event_handler(uint8_t *packet, uint16_t size)
channel = bnep_channel_for_addr(&event_addr); channel = bnep_channel_for_addr(&event_addr);
if (channel) { if (channel) {
log_error("INCOMING_CONNECTION (l2cap_cid 0x%02x) for PSM_BNEP => decline - channel already exists", l2cap_cid); log_error("INCOMING_CONNECTION (l2cap_cid 0x%02x) for PSM_BNEP => decline - channel already exists", l2cap_cid);
l2cap_decline_connection_internal(l2cap_cid, 0x04); // no resources available l2cap_decline_connection_internal(l2cap_cid, 0x04); // no resources available
return 1; return 1;
@ -1377,7 +1377,8 @@ void bnep_register_service(void * connection, uint16_t service_uuid, uint16_t ma
bnep_emit_service_registered(connection, BTSTACK_MEMORY_ALLOC_FAILED, service_uuid); bnep_emit_service_registered(connection, BTSTACK_MEMORY_ALLOC_FAILED, service_uuid);
return; return;
} }
memset(service, 0, sizeof(bnep_service_t));
/* register with l2cap if not registered before, max MTU */ /* register with l2cap if not registered before, max MTU */
l2cap_register_service_internal(NULL, bnep_packet_handler, PSM_BNEP, 0xffff, bnep_security_level); l2cap_register_service_internal(NULL, bnep_packet_handler, PSM_BNEP, 0xffff, bnep_security_level);