#define INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C
#include "ServiceDiscoveryProtocol.h"
-const struct
-{
- uint8_t Header;
- uint32_t Data;
-} PROGMEM ServiceDiscoveryServer_Attribute_ServiceHandle = {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit), 0x00000000};
-
-const struct
-{
- uint8_t Header;
- uint16_t Size;
- ClassUUID_t UUIDList[];
-} PROGMEM ServiceDiscoveryServer_Attribute_ServiceClassIDs =
- {
- (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable16Bit), (sizeof(ClassUUID_t) * 1),
- {
- {.Header = (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), .UUID = {BASE_96BIT_UUID, 0x01, 0x00, 0x00, 0x00}}
- }
- };
-
-const struct
-{
- uint8_t Header;
- uint16_t Data;
-} PROGMEM ServiceDiscoveryServer_Attribute_Version = {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), 0x0100};
-
-/** Service Discovery Protocol attribute table, listing all supported attributes of the service. */
-const ServiceAttributeTable_t ServiceDiscoveryServer_Attribute_Table[] PROGMEM =
- {
- {.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE, .Data = &ServiceDiscoveryServer_Attribute_ServiceHandle },
- {.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS, .Data = &ServiceDiscoveryServer_Attribute_ServiceClassIDs },
- {.AttributeID = SDP_ATTRIBUTE_ID_VERSION, .Data = &ServiceDiscoveryServer_Attribute_Version },
-
- SERVICE_ATTRIBUTE_TABLE_TERMINATOR
- };
-
-/** Service Discovery Protocol attribute, indicationg the service's name. */
-const struct
-{
- uint8_t Header;
- uint8_t Length;
- uint8_t Data[];
-} PROGMEM SDP_Attribute_Name = {(SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit), sizeof("SDP"), "SDP"};
-
-/** Service Discovery Protocol attribute, indicationg the service's description. */
-const struct
-{
- uint8_t Header;
- uint8_t Length;
- uint8_t Data[];
-} PROGMEM SDP_Attribute_Description = {(SDP_DATATYPE_String | SDP_DATASIZE_Variable8Bit), sizeof("BT Service Discovery"), "BT Service Discovery"};
-
-/** Service Discovery Protocol attribute, indicationg the service's availability. */
+/** Service Discovery Protocol attribute, indicating the service's availability. */
const struct
{
uint8_t Header;
const struct
{
uint8_t Header;
- uint16_t Data;
-} PROGMEM SDP_Attribute_LanguageOffset = {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), SDP_ATTRIBUTE_LANGOFFSET};
+ uint32_t Data;
+} PROGMEM SDP_Attribute_ServiceHandle = {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit), 0x00010000};
const struct
{
- uint8_t Header;
- uint32_t Data;
-} PROGMEM SDP_Attribute_ServiceHandle = {(SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_32Bit), 0x00000001};
+ uint8_t Header;
+ uint8_t Size;
+ Version_t VersionList[];
+} PROGMEM SDP_Attribute_Version =
+ {
+ .Header = (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable8Bit),
+ .Size = (sizeof(Version_t) * 1),
+ .VersionList =
+ {
+ {.Header = (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit), .Version = 0x0100}
+ }
+ };
const struct
{
ClassUUID_t UUIDList[];
} PROGMEM SDP_Attribute_ServiceClassIDs =
{
- (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable16Bit), (sizeof(ClassUUID_t) * 1),
- {
- {.Header = (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), .UUID = {BASE_96BIT_UUID, 0x00, 0x00, 0x00, 0x01}}
- }
+ .Header = (SDP_DATATYPE_Sequence | SDP_DATASIZE_Variable16Bit),
+ .Size = (sizeof(ClassUUID_t) * 1),
+ .UUIDList =
+ {
+ {.Header = (SDP_DATATYPE_UUID | SDP_DATASIZE_128Bit), .UUID = {BASE_96BIT_UUID, 0x01, 0x00, 0x00, 0x00}}
+ }
};
/** Service Discovery Protocol attribute table, listing all supported attributes of the service. */
{
{.AttributeID = SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE, .Data = &SDP_Attribute_ServiceHandle },
{.AttributeID = SDP_ATTRIBUTE_ID_SERVICECLASSIDS, .Data = &SDP_Attribute_ServiceClassIDs },
- {.AttributeID = SDP_ATTRIBUTE_ID_LANGIDOFFSET, .Data = &SDP_Attribute_LanguageOffset },
- {.AttributeID = SDP_ATTRIBUTE_ID_NAME, .Data = &SDP_Attribute_Name },
- {.AttributeID = SDP_ATTRIBUTE_ID_DESCRIPTION, .Data = &SDP_Attribute_Description },
+ {.AttributeID = SDP_ATTRIBUTE_ID_VERSION, .Data = &SDP_Attribute_Version },
SERVICE_ATTRIBUTE_TABLE_TERMINATOR
};
*/
const ServiceTable_t SDP_Services_Table[] PROGMEM =
{
- { // 128-bit UUID for the Service Discovery Server Service
- .UUID = {BASE_96BIT_UUID, 0x01, 0x00, 0x00, 0x00},
- .AttributeTable = ServiceDiscoveryServer_Attribute_Table,
- },
{ // 128-bit UUID for the SDP service
.UUID = {BASE_96BIT_UUID, 0x00, 0x00, 0x00, 0x01},
.AttributeTable = SDP_Attribute_Table,
},
-#if 0
- { // 128-bit UUID for the RFCOMM service
- .UUID = {BASE_96BIT_UUID, 0x03, 0x00, 0x00, 0x00},
- .AttributeTable = RFCOMM_Attribute_Table,
- },
-#endif
};
/** Base UUID value common to all standardized Bluetooth services */
*/
static void SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel)
{
+ const void* CurrentParameter = ((void*)SDPHeader + sizeof(SDP_PDUHeader_t));
+
BT_SDP_DEBUG(1, "<< Service Search");
+
+ /* Retrieve the list of search UUIDs from the request */
+ uint8_t UUIDList[12][UUID_SIZE_BYTES];
+ uint8_t TotalUUIDs = SDP_GetUUIDList(UUIDList, &CurrentParameter);
+ BT_SDP_DEBUG(2, "-- Total UUIDs: %d", TotalUUIDs);
+
+ /* Retrieve the maximum service record reponse count from the request */
+ uint16_t MaxServiceRecordCount = SwapEndian_16(*((uint16_t*)CurrentParameter));
+ CurrentParameter += sizeof(uint16_t);
+ BT_SDP_DEBUG(2, "-- Max Return Service Count: 0x%04X", MaxServiceRecordCount);
+
+ struct
+ {
+ SDP_PDUHeader_t SDPHeader;
+ uint16_t TotalServiceRecordCount;
+ uint16_t CurrentServiceRecordCount;
+ uint8_t ResponseData[100];
+ } ResponsePacket;
+
+ /* Create a pointer to the buffer to indicate the current location for response data to be added */
+ void* CurrResponsePos = ResponsePacket.ResponseData;
+
+ uint8_t AddedServiceHandles = 0;
+
+ /* Search through the list of UUIDs one at a time looking for matching search Attributes */
+ for (uint8_t CurrUUIDItem = 0; CurrUUIDItem < TotalUUIDs; CurrUUIDItem++)
+ {
+ /* Retrieve the attribute table of the current search UUID from the global UUID table if it exists */
+ ServiceAttributeTable_t* AttributeTable = SDP_GetAttributeTable(UUIDList[CurrUUIDItem]);
+
+ /* If the UUID does not exist in the global UUID table, continue on to the next search UUID */
+ if (AttributeTable == NULL)
+ continue;
+
+ BT_SDP_DEBUG(2, " -- Found UUID %d in table", CurrUUIDItem);
+
+ /* Retrieve a PROGMEM pointer to the value of the service's record handle */
+ const void* AttributeValue = SDP_GetAttributeValue(AttributeTable, SDP_ATTRIBUTE_ID_SERVICERECORDHANDLE);
+
+ /* Copy over the service record handle to the response list */
+ uint8_t AttrHeaderSize;
+ SDP_GetLocalAttributeContainerSize(AttributeValue, &AttrHeaderSize);
+ memcpy_P(CurrResponsePos, AttributeValue + AttrHeaderSize, sizeof(uint32_t));
+ CurrResponsePos += AttrHeaderSize + sizeof(uint32_t);
+
+ /* Increment the total number of service records added to the list */
+ AddedServiceHandles++;
+ }
+
+ /* Continuation state - always zero */
+ *((uint8_t*)CurrResponsePos) = 0;
+
+ /* Fill out the service record count values in the returned packet */
+ ResponsePacket.TotalServiceRecordCount = SwapEndian_16(AddedServiceHandles);
+ ResponsePacket.CurrentServiceRecordCount = ResponsePacket.TotalServiceRecordCount;
+
+ /* Fill in the response packet's header */
+ ResponsePacket.SDPHeader.PDU = SDP_PDU_SERVICESEARCHRESPONSE;
+ ResponsePacket.SDPHeader.TransactionID = SDPHeader->TransactionID;
+ ResponsePacket.SDPHeader.ParameterLength = SwapEndian_16((ResponsePacket.CurrentServiceRecordCount << 2) +
+ sizeof(ResponsePacket.CurrentServiceRecordCount) +
+ sizeof(ResponsePacket.TotalServiceRecordCount) +
+ sizeof(uint8_t));
+
+ BT_SDP_DEBUG(1, ">> Service Search Response");
+
+ /* Send the completed response packet to the sender */
+ Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket.SDPHeader) + ResponsePacket.SDPHeader.ParameterLength),
+ Channel);
}
/** Internal processing routine for SDP Service Attribute Requests.
BT_SDP_DEBUG(2, "-- Total UUIDs: %d", TotalUUIDs);
/* Retrieve the maximum Attribute reponse size from the request */
- uint16_t MaxAttributeSize = *((uint16_t*)CurrentParameter);
+ uint16_t MaxAttributeSize = SwapEndian_16(*((uint16_t*)CurrentParameter));
CurrentParameter += sizeof(uint16_t);
BT_SDP_DEBUG(2, "-- Max Return Attribute Bytes: 0x%04X", MaxAttributeSize);
if (MaxAttributeSize > sizeof(ResponsePacket.ResponseData))
MaxAttributeSize = sizeof(ResponsePacket.ResponseData);
- /* Add the outer Data Element Sequence header for the retrieved Attributes */
+ /* Add the outer Data Element Sequence header for all of the retrieved Attributes */
uint16_t* TotalResponseSize = SDP_AddDataElementHeader16(&CurrResponsePos, SDP_DATATYPE_Sequence);
/* Search through the list of UUIDs one at a time looking for matching search Attributes */
/* Increment the outer container size by the number of added bytes */
*TotalResponseSize += 3 + *CurrentUUIDResponseSize;
}
+
+ /* Flip the endianness of the container's size */
+ *CurrentUUIDResponseSize = SwapEndian_16(*CurrentUUIDResponseSize);
}
+
+ /* Continuation state - always zero */
+ *((uint8_t*)CurrResponsePos) = 0;
- /* Set the total response list size to the size of the outer container plus its header size */
- ResponsePacket.AttributeListByteCount = 3 + *TotalResponseSize;
+ /* Set the total response list size to the size of the outer container plus its header size and continuation state */
+ ResponsePacket.AttributeListByteCount = SwapEndian_16(3 + *TotalResponseSize);
/* Fill in the response packet's header */
ResponsePacket.SDPHeader.PDU = SDP_PDU_SERVICESEARCHATTRIBUTERESPONSE;
ResponsePacket.SDPHeader.TransactionID = SDPHeader->TransactionID;
- ResponsePacket.SDPHeader.ParameterLength = (ResponsePacket.AttributeListByteCount + sizeof(ResponsePacket.AttributeListByteCount));
+ ResponsePacket.SDPHeader.ParameterLength = SwapEndian_16(sizeof(ResponsePacket.AttributeListByteCount) +
+ (3 + *TotalResponseSize) +
+ sizeof(uint8_t));
+
+ /* Flip the endianness of the container's size */
+ *TotalResponseSize = SwapEndian_16(*TotalResponseSize);
BT_SDP_DEBUG(1, ">> Service Search Attribute Response");
- BT_SDP_DEBUG(2, "-- Total Parameter Length: 0x%04X", ResponsePacket.SDPHeader.ParameterLength);
/* Send the completed response packet to the sender */
Bluetooth_SendPacket(&ResponsePacket, (sizeof(ResponsePacket.SDPHeader) + ResponsePacket.SDPHeader.ParameterLength),
static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, const void* AttributeValue, void** ResponseBuffer)
{
/* Retrieve the size of the attribute value from its container header */
- uint32_t AttributeValueLength = SDP_GetLocalAttributeContainerSize(AttributeValue);
+ uint8_t AttributeHeaderLength;
+ uint32_t AttributeValueLength = SDP_GetLocalAttributeContainerSize(AttributeValue, &AttributeHeaderLength);
/* Add a Data Element header to the response for the Attribute ID */
*((uint8_t*)*ResponseBuffer) = (SDP_DATATYPE_UnsignedInt | SDP_DATASIZE_16Bit);
*ResponseBuffer += sizeof(uint8_t);
/* Add the Attribute ID to the created Data Element */
- *((uint16_t*)*ResponseBuffer) = AttributeID;
+ *((uint16_t*)*ResponseBuffer) = SwapEndian_16(AttributeID);
*ResponseBuffer += sizeof(uint16_t);
/* Copy over the Attribute value Data Element container to the response */
- memcpy_P(*ResponseBuffer, AttributeValue, AttributeValueLength);
- *ResponseBuffer += AttributeValueLength;
+ memcpy_P(*ResponseBuffer, AttributeValue, AttributeHeaderLength + AttributeValueLength);
+ SwapEndian_n(*ResponseBuffer, AttributeHeaderLength);
+ *ResponseBuffer += AttributeHeaderLength + AttributeValueLength;
- return (sizeof(uint8_t) + sizeof(uint16_t) + AttributeValueLength);
+ return (sizeof(uint8_t) + sizeof(uint16_t) + AttributeHeaderLength + AttributeValueLength);
}
/** Retrieves a pointer to the value of the given Attribute ID from the given Attribute table.
/* Search through the global UUID list an item at a time */
for (uint8_t CurrTableItem = 0; CurrTableItem < (sizeof(SDP_Services_Table) / sizeof(ServiceTable_t)); CurrTableItem++)
{
+ /* Read in a pointer to the current UUID table entry's Attribute table */
+ ServiceAttributeTable_t* CurrAttributeTable = (ServiceAttributeTable_t*)pgm_read_word(&SDP_Services_Table[CurrTableItem].AttributeTable);
+
/* If the current table item's UUID matches the search UUID, return a pointer the table item's Attribute table */
if (!(memcmp_P(UUID, SDP_Services_Table[CurrTableItem].UUID, UUID_SIZE_BYTES)))
- return (ServiceAttributeTable_t*)pgm_read_word(&SDP_Services_Table[CurrTableItem].AttributeTable);
+ return CurrAttributeTable;
+
+ /* Retrieve the list of the service's Class UUIDs from its Attribute table */
+ void* ClassUUIDs = SDP_GetAttributeValue(CurrAttributeTable, SDP_ATTRIBUTE_ID_SERVICECLASSIDS);
+
+ /* Go to the next UUID in the table if the current item does not have a list of Class UUIDs */
+ if (ClassUUIDs == NULL)
+ continue;
+
+ /* Retrieve the size of the Class UUID list and skip past the header to the first Class UUID in the list */
+ uint8_t ClassUUIDListHeaderSize;
+ uint32_t ClassUUIDListSize = SDP_GetLocalAttributeContainerSize(ClassUUIDs, &ClassUUIDListHeaderSize);
+ ClassUUIDs += ClassUUIDListHeaderSize;
+
+ /* Check each class UUID in turn for a match */
+ while (ClassUUIDListSize)
+ {
+ /* Current Service UUID's Class UUID list has a matching entry, return the Attribute table */
+ if (!(memcmp_P(UUID, &((ClassUUID_t*)ClassUUIDs)->UUID, UUID_SIZE_BYTES)))
+ return CurrAttributeTable;
+
+ ClassUUIDListSize -= sizeof(ClassUUID_t);
+ ClassUUIDs += sizeof(ClassUUID_t);
+ }
}
return NULL;
/* If the element is not an Attribute Range, copy over the starting ID to the ending ID to make a range of 1 */
if (AttributeLength == 2)
- memcpy(&CurrentAttributeRange[1], *CurrentParameter, 2);
+ CurrentAttributeRange[1] = CurrentAttributeRange[0];
+
+ /* Swap the endianness of the attribute range values */
+ CurrentAttributeRange[0] = SwapEndian_16(CurrentAttributeRange[0]);
+ CurrentAttributeRange[1] = SwapEndian_16(CurrentAttributeRange[1]);
BT_SDP_DEBUG(2, "-- Attribute: 0x%04X-0x%04X", CurrentAttributeRange[0], CurrentAttributeRange[1]);
*
* \return Size in bytes of the entire attribute container, including the header
*/
-static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData)
+static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData, uint8_t* const HeaderSize)
{
/* Fetch the size of the Data Element structure from the header */
uint8_t SizeIndex = (pgm_read_byte(AttributeData) & 0x07);
switch (SizeIndex)
{
case SDP_DATASIZE_Variable8Bit:
- return (1 + sizeof(uint8_t)) + pgm_read_byte(AttributeData + 1);
+ *HeaderSize = (1 + sizeof(uint8_t));
+ return pgm_read_byte(AttributeData + 1);
case SDP_DATASIZE_Variable16Bit:
- return (1 + sizeof(uint16_t)) + pgm_read_word(AttributeData + 1);
+ *HeaderSize = (1 + sizeof(uint16_t));
+ return pgm_read_word(AttributeData + 1);
case SDP_DATASIZE_Variable32Bit:
- return (1 + sizeof(uint32_t)) + pgm_read_dword(AttributeData + 1);
+ *HeaderSize = (1 + sizeof(uint32_t));
+ return pgm_read_dword(AttributeData + 1);
default:
- return (1 + (1 << SizeIndex));
+ *HeaderSize = 1;
+ return (1 << SizeIndex);
}
return 0;
uint8_t SizeIndex = (*((uint8_t*)*DataElementHeader) & 0x07);
*DataElementHeader += sizeof(uint8_t);
- uint32_t ElementValue;
+ uint32_t ElementValueSize;
/* Convert the Data Element size index into a size in bytes */
switch (SizeIndex)
{
case SDP_DATASIZE_Variable8Bit:
- ElementValue = *((uint8_t*)*DataElementHeader);
+ ElementValueSize = *((uint8_t*)*DataElementHeader);
*DataElementHeader += sizeof(uint8_t);
*ElementHeaderSize = (1 + sizeof(uint8_t));
break;
case SDP_DATASIZE_Variable16Bit:
- ElementValue = *((uint16_t*)*DataElementHeader);
+ ElementValueSize = SwapEndian_16(*((uint16_t*)*DataElementHeader));
*DataElementHeader += sizeof(uint16_t);
*ElementHeaderSize = (1 + sizeof(uint16_t));
break;
case SDP_DATASIZE_Variable32Bit:
- ElementValue = *((uint32_t*)*DataElementHeader);
+ ElementValueSize = SwapEndian_32(*((uint32_t*)*DataElementHeader));
*DataElementHeader += sizeof(uint32_t);
*ElementHeaderSize = (1 + sizeof(uint32_t));
break;
default:
- ElementValue = (1 << SizeIndex);
- *ElementHeaderSize = 1;
+ ElementValueSize = (1 << SizeIndex);
+ *ElementHeaderSize = 1;
break;
}
- return ElementValue;
+ return ElementValueSize;
}
projects / pub / USBasp.git / blobdiff