mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-14 10:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

sdp_server: skip empty attribute lists in search search attribute response

Browse Source
This commit is contained in:
Matthias Ringwald 2024-11-12 08:57:21 +01:00
parent cc643af329
commit eb404cdcf0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
- RFCOMM: shut down multiplexer after closing last channel instead of multiplexer idle timer
- RFCOMM: fix multiple outgoing channel setup
- SDP Server: skip empty attribute lists in Service Search Attribute Response
- HID Host: return complete HID report
- SM: fix CTKD key distribution over BR/EDR
- SM: fix CTKD after BR/EDR Role Change

14
src/classic/sdp_server.c
View File

@ -373,15 +373,18 @@ static uint16_t sdp_get_size_for_service_search_attribute_response(uint8_t * ser
if (!sdp_record_matches_service_search_pattern(item->service_record, serviceSearchPattern)) continue;
// for all service records that match
total_response_size += 3 + sdp_get_filtered_size(item->service_record, attributeIDList);
// for all service records that match, ignoring empty attribute lists
uint16_t filtered_size = sdp_get_filtered_size(item->service_record, attributeIDList);
if (filtered_size > 0){
total_response_size += 3 + filtered_size;
}
}
return total_response_size;
}
int sdp_handle_service_search_attribute_request(uint8_t * packet, uint16_t remote_mtu){
// SDP header before attribute sevice list: 7
// SDP header before attribute service list: 7
// Continuation, worst case: 5
// get request details
@ -456,7 +459,10 @@ int sdp_handle_service_search_attribute_request(uint8_t * packet, uint16_t remot
// get size of this record
uint16_t filtered_attributes_size = sdp_get_filtered_size(item->service_record, attributeIDList);
// ignore empty lists
if (filtered_attributes_size == 0) continue;
// stop if complete record doesn't fits into response but we already have a partial response
if (((filtered_attributes_size + 3) > maximumAttributeByteCount) && !first_answer) {
continuation = 1;