Hi,
On Thu, Jul 22, 2010 at 7:06 PM, Inga Stotland <ingas@xxxxxxxxxxxxxx> wrote:
> ---
> src/sdpd-service.c | 108 ++++++++++++++++++++++++++++++++++++++++++++--------
> 1 files changed, 92 insertions(+), 16 deletions(-)
>
> diff --git a/src/sdpd-service.c b/src/sdpd-service.c
> index cdbb4f4..1314ada 100644
> --- a/src/sdpd-service.c
> +++ b/src/sdpd-service.c
> @@ -49,6 +49,8 @@
> #include "manager.h"
> #include "adapter.h"
>
> +#define SIZEOF_UUID128 16
> +
> static sdp_record_t *server = NULL;
>
> static uint16_t did_vendor = 0x0000;
> @@ -174,41 +176,103 @@ static void update_svclass_list(const bdaddr_t *src)
>
> }
>
> +static void eir_generate_uuid128(sdp_list_t *list,
> + uint8_t *ptr, uint16_t *eir_len)
> +{
> + int i, k, index = 0;
> + uint16_t len = *eir_len;
> + uint8_t *uuid128;
> + gboolean truncated = FALSE;
> +
> + /* Store UUID128 in place, skip 2 bytes to insert type and length later */
> + uuid128 = ptr + 2;
> +
> + for (; list; list = list->next) {
> + sdp_record_t *rec = (sdp_record_t *) list->data;
> +
> + if (rec->svclass.type != SDP_UUID128)
> + continue;
> +
> + /* Stop if not enough space to put next UUID128 */
> + if ((len + 2 + SIZEOF_UUID128) > EIR_DATA_LENGTH) {
> + truncated = TRUE;
> + break;
> + }
> +
> + /* Check for duplicates, EIR data is Little Endian */
> + for (i = 0; i < index; i++) {
> + for (k = 0; k < SIZEOF_UUID128; k++) {
> + if (uuid128[i*SIZEOF_UUID128 + k] !=
> + rec->svclass.value.uuid128.data[SIZEOF_UUID128 - k])
> + break;
> + }
> + if (k == SIZEOF_UUID128)
> + break;
> + }
> +
> + if (i < index)
> + continue;
> +
> + /* EIR data is Little Endian */
> + for (k = 0; k < SIZEOF_UUID128; k++)
> + uuid128[index*SIZEOF_UUID128 + k] =
> + rec->svclass.value.uuid128.data[SIZEOF_UUID128 - 1 - k];
> +
> + len += SIZEOF_UUID128;
> + index++;
> + }
> +
> + if (index > 0 || truncated) {
> + /* EIR Data length */
> + ptr[0] = (index * SIZEOF_UUID128) + 1;
> + /* EIR Data type */
> + ptr[1] = (truncated) ? EIR_UUID128_SOME : EIR_UUID128_ALL;
> + len += 2;
> + *eir_len = len;
> + }
> +}
> +
I think you should probably split this in two parts, first update with
the cleanups and then add the code to handle uuid 128.
> void create_ext_inquiry_response(const char *name,
> int8_t tx_power, sdp_list_t *services,
> uint8_t *data)
> {
> sdp_list_t *list = services;
> uint8_t *ptr = data;
> - uint16_t uuid[24];
> + uint16_t eir_len = 0;
> + uint16_t uuid16[EIR_DATA_LENGTH/2];
> int i, index = 0;
> + gboolean truncated = FALSE;
>
> if (name) {
> int len = strlen(name);
>
> + /* EIR Data type */
> if (len > 48) {
> len = 48;
> - ptr[1] = 0x08;
> + ptr[1] = EIR_NAME_SHORT;
> } else
> - ptr[1] = 0x09;
> + ptr[1] = EIR_NAME_COMPLETE;
>
> + /* EIR Data length */
> ptr[0] = len + 1;
>
> memcpy(ptr + 2, name, len);
>
> - ptr += len + 2;
> + eir_len += (len + 2);
> + ptr += (len + 2);
> }
>
> if (tx_power != 0) {
> *ptr++ = 2;
> - *ptr++ = 0x0a;
> + *ptr++ = EIR_TX_POWER;
> *ptr++ = (uint8_t) tx_power;
> + eir_len += 3;
> }
>
> if (did_vendor != 0x0000) {
> uint16_t source = 0x0002;
> *ptr++ = 9;
> - *ptr++ = 0x10;
> + *ptr++ = EIR_DEVICE_ID;
> *ptr++ = (source & 0x00ff);
> *ptr++ = (source & 0xff00) >> 8;
> *ptr++ = (did_vendor & 0x00ff);
> @@ -217,10 +281,10 @@ void create_ext_inquiry_response(const char *name,
> *ptr++ = (did_product & 0xff00) >> 8;
> *ptr++ = (did_version & 0x00ff);
> *ptr++ = (did_version & 0xff00) >> 8;
> + eir_len += 10;
> }
>
> - ptr[1] = 0x03;
> -
> + /* Group all UUID16 types */
> for (; list; list = list->next) {
> sdp_record_t *rec = (sdp_record_t *) list->data;
>
> @@ -233,30 +297,42 @@ void create_ext_inquiry_response(const char *name,
> if (rec->svclass.value.uuid16 == PNP_INFO_SVCLASS_ID)
> continue;
>
> - if (index > 23) {
> - ptr[1] = 0x02;
> + /* Stop if not enough space to put next UUID16 */
> + if ((eir_len + 2 + sizeof(uint16_t)) > EIR_DATA_LENGTH) {
> + truncated = TRUE;
> break;
> }
>
> + /* Check for duplicates */
> for (i = 0; i < index; i++)
> - if (uuid[i] == rec->svclass.value.uuid16)
> + if (uuid16[i] == rec->svclass.value.uuid16)
> break;
>
> - if (i == index - 1)
> + if (i < index)
> continue;
>
> - uuid[index++] = rec->svclass.value.uuid16;
> + uuid16[index++] = rec->svclass.value.uuid16;
> + eir_len += sizeof(uint16_t);
> }
>
> if (index > 0) {
> - ptr[0] = (index * 2) + 1;
> + /* EIR Data length */
> + ptr[0] = (index * sizeof(uint16_t)) + 1;
> + /* EIR Data type */
> + ptr[1] = (truncated) ? EIR_UUID16_SOME : EIR_UUID16_ALL;
> +
> ptr += 2;
> + eir_len += 2;
>
> for (i = 0; i < index; i++) {
> - *ptr++ = (uuid[i] & 0x00ff);
> - *ptr++ = (uuid[i] & 0xff00) >> 8;
> + *ptr++ = (uuid16[i] & 0x00ff);
> + *ptr++ = (uuid16[i] & 0xff00) >> 8;
> }
> }
> +
> + /* Group all UUID128 types */
> + if (eir_len <= EIR_DATA_LENGTH - 2)
> + eir_generate_uuid128(services, ptr, &eir_len);
> }
>
> void register_public_browse_group(void)
> --
> 1.7.1
Also this checks for duplicates looks suspicious, does it really need
to check that in place and every time, I think it might be more
efficient if we do that before generating the EIR data avoiding
comparing data with different endianess or maybe it just make more
sense to not allow duplicates in the database then we don't have to do
this at all.
--
Luiz Augusto von Dentz
Computer Engineer
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
