mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-12 15:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

implmented continuation handling for sdp_handle_service_search_attribute_request

Browse Source
This commit is contained in:
matthias.ringwald 2010-06-13 10:30:43 +00:00
parent 231e1adb5d
commit d370e7cf04
3 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/btstack/sdp_util.h
View File

@ -74,6 +74,6 @@ void de_add_data( uint8_t *seq, de_type_t type, uint16_t size, uint8_t *data);
int de_get_data_size(uint8_t * header);
#pragma mark SDP
uint16_t sdp_append_attributes_in_attributeIDList(uint8_t *record, uint8_t *attributeIDList, uint16_t startIndex, uint16_t maxBytes, uint8_t *buffer);
int sdp_append_attributes_in_attributeIDList(uint8_t *record, uint8_t *attributeIDList, uint16_t startIndex, uint16_t maxBytes, uint8_t *buffer);
uint8_t * sdp_get_attribute_value_for_attribute_id(uint8_t * record, uint16_t attributeID);
int sdp_record_matches_service_search_pattern(uint8_t *record, uint8_t *serviceSearchPattern);

76
src/sdp.c
View File

@ -298,20 +298,20 @@ int sdp_handle_service_attribute_request(uint8_t * packet){
uint8_t *attributeList = &sdp_response_buffer[pos];
de_create_sequence(attributeList);
// copy specified attributes
continuation_index = sdp_append_attributes_in_attributeIDList(item->service_record, attributeIDList, continuation_index, maximumAttributeByteCount, attributeList);
int result = sdp_append_attributes_in_attributeIDList(item->service_record, attributeIDList, continuation_index, maximumAttributeByteCount, attributeList);
pos += de_get_len(attributeList);
// Continuation State
if (continuation_index) {
if (result >= 0) {
sdp_response_buffer[pos++] = 2;
net_store_16(sdp_response_buffer, pos, continuation_index);
net_store_16(sdp_response_buffer, pos, (uint16_t) result);
pos += 2;
} else {
sdp_response_buffer[pos++] = 0;
}
// update header
net_store_16(sdp_response_buffer, 3, pos - 5); // empty list
net_store_16(sdp_response_buffer, 3, pos - 5); // size of variable payload
net_store_16(sdp_response_buffer, 5, de_get_len(attributeList));
return pos;
@ -326,8 +326,18 @@ int sdp_handle_service_search_attribute_request(uint8_t * packet){
uint16_t serviceSearchPatternLen = de_get_len(serviceSearchPattern);
uint16_t maximumAttributeByteCount = READ_NET_16(packet, 5 + serviceSearchPatternLen);
uint8_t * attributeIDList = &packet[5+serviceSearchPatternLen+2];
// not used yet - uint16_t attributeIDListLen = de_get_len(attributeIDList);
// not used yet - uint8_t * continuationState = &packet[5+serviceSearchPatternLen+2+attributeIDListLen];
uint16_t attributeIDListLen = de_get_len(attributeIDList);
uint8_t * continuationState = &packet[5+serviceSearchPatternLen+2+attributeIDListLen];
// continuation state contains index of next service record to examine
// continuation state contains index of next attribute to examine
uint16_t continuation_service_index = 0;
uint16_t continuation_attribute_index = 0;
int continuation = 0;
if (continuationState[0] == 4){
continuation_service_index = READ_NET_16(continuationState, 1);
continuation_attribute_index = READ_NET_16(continuationState, 3);
}
// header
sdp_response_buffer[0] = SDP_ServiceSearchAttributeResponse;
@ -339,29 +349,53 @@ int sdp_handle_service_search_attribute_request(uint8_t * packet){
de_create_sequence(attributeLists);
// for all service records that match
uint16_t current_service_index = 0;
linked_item_t *it;
for (it = (linked_item_t *) sdp_service_records; it ; it = it->next){
for (it = (linked_item_t *) sdp_service_records; it ; it = it->next, ++current_service_index){
service_record_item_t * item = (service_record_item_t *) it;
// printf("ServiceRecord:\n");
// de_dump_data_element(item->service_record);
if (sdp_record_matches_service_search_pattern(item->service_record, serviceSearchPattern)){
// copy specified attributes
uint8_t * attributes = de_push_sequence(attributeLists);
sdp_append_attributes_in_attributeIDList(item->service_record, attributeIDList, 0, maximumAttributeByteCount, attributes);
de_pop_sequence(attributeLists, attributes);
if (current_service_index >= continuation_service_index ) {
if (sdp_record_matches_service_search_pattern(item->service_record, serviceSearchPattern)){
// check if DES header fits in
uint16_t attributeListsSize = de_get_len(attributeLists);
if (attributeListsSize + 3 > maximumAttributeByteCount) {
continuation = 1;
continuation_attribute_index = 0;
break;
}
// create sequecne and copy specified attributes
uint8_t * attributes = de_push_sequence(attributeLists);
int result = sdp_append_attributes_in_attributeIDList(item->service_record, attributeIDList, continuation_attribute_index,
maximumAttributeByteCount - attributeListsSize, attributes);
de_pop_sequence(attributeLists, attributes);
// no space left?
if (result >= 0){
continuation = 1;
continuation_attribute_index = (uint16_t) result;
break;
}
}
}
}
pos += de_get_len(attributeLists);
// AttributeListsByteCount - at offset 5
net_store_16(sdp_response_buffer, 5, de_get_len(attributeLists));
// Continuation State: none
// @TODO send correct continuation state
sdp_response_buffer[pos++] = 0;
// Continuation State
if (continuation) {
sdp_response_buffer[pos++] = 4;
net_store_16(sdp_response_buffer, pos, continuation_service_index);
net_store_16(sdp_response_buffer, pos, continuation_attribute_index);
pos += 4;
} else {
sdp_response_buffer[pos++] = 0;
}
// update len info
net_store_16(sdp_response_buffer, 3, pos - 5); // empty list
// update header
net_store_16(sdp_response_buffer, 3, pos - 5); // size of variable payload
net_store_16(sdp_response_buffer, 5, de_get_len(attributeLists)); // AttributeListsByteCount
return pos;
}

17
src/sdp_util.c
View File

@ -269,16 +269,15 @@ struct sdp_context_append_attributes {
static int sdp_traversal_append_attributes(uint8_t * element, de_type_t type, de_size_t size, void *my_context){
struct sdp_context_append_attributes * context = (struct sdp_context_append_attributes *) my_context;
// check each Attribute in root DES
int attributeDataSize = de_get_data_size(element);
int attributeLen = de_get_len(element);
// Attribute must be DES with more than sizeof(UINT16 element) and index at least continuation index
if (type == DE_DES && attributeDataSize >= 3 && context->attributeIndex >= context->startIndex){
if (type == DE_DES && context->attributeIndex >= context->startIndex){
int attributeIDPos = de_get_header_size(element);
de_size_t attributeIDSize = de_get_size_type(element+attributeIDPos);
if (attributeIDSize == DE_SIZE_16) {
uint16_t attributeID = READ_NET_16(element, attributeIDPos+1);
if ( sdp_attribute_list_constains_id(context->attributeIDList, attributeID)){
if (context->dataSize + 3< context->maxBytes) {
if (context->dataSize + attributeLen <= context->maxBytes) {
// copy Attribute
memcpy( context->buffer + 3 + context->dataSize, element, attributeLen);
context->dataSize += attributeLen;
@ -293,11 +292,11 @@ static int sdp_traversal_append_attributes(uint8_t * element, de_type_t type, de
context->attributeIndex++;
return 0;
}
// returns index of the next attribute index to process, if not all could be passed on, 0 = all processed
uint16_t sdp_append_attributes_in_attributeIDList(uint8_t *record, uint8_t *attributeIDList, uint16_t startIndex, uint16_t maxBytes, uint8_t *buffer){
// returns index of the next attribute index to process, if not all could be passed on, -1 = all processed
int sdp_append_attributes_in_attributeIDList(uint8_t *record, uint8_t *attributeIDList, uint16_t startIndex, uint16_t maxBytes, uint8_t *buffer){
struct sdp_context_append_attributes context;
context.buffer = buffer;
context.dataSize = READ_NET_16(buffer,1);
context.dataSize = 0;
context.maxBytes = maxBytes;
context.attributeIndex = 0;
context.startIndex = startIndex;
@ -305,10 +304,10 @@ uint16_t sdp_append_attributes_in_attributeIDList(uint8_t *record, uint8_t *attr
context.attributeIDList = attributeIDList;
de_traverse_sequence(record, sdp_traversal_append_attributes, &context);
net_store_16(buffer, 1, context.dataSize);
if (!context.moreData) {
context.attributeIndex = 0;
if (context.moreData) {
return context.attributeIndex;
}
return context.attributeIndex;
return -1;
}
#pragma mark Get AttributeValue for AttributeID