Enhanced support for extended inquiry response
v6 cover Enhanced support for extended inquiry response
EIR needs to be updated whenever local SDP record database changes. Previously, when an SDP record was added/removed/updated, EIR would be written in callback fired off HCI "Command Complete" event set off by "Write Class Of Device" command. However, if the class of device did not need to be updated, the EIR write was not happening either. This implementation has been augmented to write new EIR when modification in SDP database does not lead to updating of class of device.
Added support for UUID128 service descriptors in local EIR.
Service UUIDs are written to "device properties" dictionary when emitting "Device Found" signal. This allows peek at available services offered by a remote device without establishing SDP connection.
Signature · 3 lines
Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v6 1/7 Spec constants for Extended Inquiry Response field types
--- src/sdpd.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
src/sdpd.h +13 -0
@@ -34,6 +34,19 @@ #define SDPDBG(fmt...)#endif +#define EIR_DATA_LENGTH 240 + +#define EIR_UUID16_SOME 0x02/* 16-bit UUID, more available */ +#define EIR_UUID16_ALL 0x03/* 16-bit UUID, all listed */ +#define EIR_UUID32_SOME 0x04/* 32-bit UUID, more available */ +#define EIR_UUID32_ALL 0x05/* 32-bit UUID, all listed */ +#define EIR_UUID128_SOME 0x06/* 128-bit UUID, more available */ +#define EIR_UUID128_ALL 0x07/* 128-bit UUID, all listed */ +#define EIR_NAME_SHORT 0x08/* shortened local name */ +#define EIR_NAME_COMPLETE 0x09/* complete local name */ +#define EIR_TX_POWER 0x0A/* transmit power level */ +#define EIR_DEVICE_ID 0x10/* device ID */ + typedef struct request { bdaddr_t device; bdaddr_t bdaddr;
Signature · 6 lines
1.7.2 -- Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v6 2/7 Minor fix when skipping duplicate UUID16 from EIR.
In reply to Inga Stotland--- src/sdpd-service.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
src/sdpd-service.c +1 -1
@@ -242,7 +242,7 @@ void create_ext_inquiry_response(const char *name,if (uuid[i] == rec->svclass.value.uuid16)break ; -if (i == index -1 ) +if (i < index)continue ; uuid[index++] = rec->svclass.value.uuid16;
Signature · 6 lines
1.7.2 -- Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v6 3/7 Clean up code that generates extended inquiry response.
In reply to Inga Stotland--- src/sdpd-service.c | 44 +++++++++++++++++++++++++++++--------------- 1 files changed, 29 insertions(+), 15 deletions(-)
src/sdpd-service.c +29 -15
@@ -180,35 +180,41 @@ void create_ext_inquiry_response(const char *name, {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 +223,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,28 +239,36 @@ 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)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 ; } } }
Signature · 6 lines
1.7.2 -- Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v6 4/7 Support for adding UUID128 to extended inquiry response
In reply to Inga Stotland--- src/sdpd-service.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 1 deletions(-)
src/sdpd-service.c +64 -1
@@ -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,6 +176,63 @@ 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; +uint8_t *uuid128_data = rec->svclass.value.uuid128.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] != + 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] = + 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; + } +} +void create_ext_inquiry_response (const char *name,int8_t tx_power,sdp_list_t *services,uint8_t *data)
@@ -261,7 +320,7 @@ void create_ext_inquiry_response(const char *name,/* EIR Data length */ ptr[0 ] = (index *sizeof (uint16_t )) +1 ;/* EIR Data type */ - ptr[1 ] = (truncated) ?EIR_UUID16_SOME :EIR_UUID16_ALL ; + ptr[1 ] = truncated ?EIR_UUID16_SOME :EIR_UUID16_ALL ; ptr +=2 ; eir_len +=2 ;
@@ -271,6 +330,10 @@ void create_ext_inquiry_response(const char *name, *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 )
Signature · 6 lines
1.7.2 -- Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v6 5/7 Fix in logic to write EIR when SDP records are changed.
In reply to Inga StotlandWhenever SDP service record is added/deleted/modified check for whether class of device needs to be updated as well. If the update is needed, proceed as before: new EIR will be written subsequently. If the class of device is already present, just update EIR and return.
--- src/adapter.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-)
src/adapter.c +11 -4
@@ -137,6 +137,8 @@ struct btd_adapter {gint ref; }; +static void update_ext_inquiry_response (struct btd_adapter *adapter); +static void adapter_set_pairable_timeout (struct btd_adapter *adapter,guint interval);
@@ -216,12 +218,17 @@ static int adapter_set_service_classes(struct btd_adapter *adapter, adapter->wanted_cod &=0x00ffff ; adapter->wanted_cod |= (value <<16 ); -/* If we already have the CoD we want or the cache is enabled or an -* existing CoD write is in progress just bail out */ -if (adapter->current_cod == adapter->wanted_cod || - adapter->cache_enable || adapter->pending_cod) +/* If the cache is enabled or an existing CoD write is in progress +* just bail out */ +if (adapter->cache_enable || adapter->pending_cod)return 0 ; +/* If we already have the CoD we want, update EIR and return */ +if (adapter->current_cod == adapter->wanted_cod) { +update_ext_inquiry_response (adapter); +return 0 ; + } +DBG ("Changing service classes to 0x%06x" , adapter->wanted_cod); err = adapter_ops->set_class (adapter->dev_id, adapter->wanted_cod);
Signature · 6 lines
1.7.2 -- Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v6 6/7 Handle arrays in device properties dictionary.
In reply to Inga Stotland--- src/adapter.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
src/adapter.c +7 -1
@@ -2702,6 +2702,7 @@ static void append_dict_valist(DBusMessageIter *iter,DBusMessageIter dict;const char *key;int type; +int n_elements;void *val; dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
@@ -2713,7 +2714,12 @@ static void append_dict_valist(DBusMessageIter *iter,while (key) { type =va_arg (var_args, int); val = va_arg(var_args, void *); -dict_append_entry (&dict, key, type, val); +if (type ==DBUS_TYPE_ARRAY ) { + n_elements =va_arg (var_args, int); +if (n_elements >0 ) +dict_append_array (&dict, key,DBUS_TYPE_STRING , val, n_elements); + }else +dict_append_entry (&dict, key, type, val); key = va_arg(var_args, char *); }
Signature · 6 lines
1.7.2 -- Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
PATCH v6 7/7 Add service UUIDs from EIR to device properties in "Device Found" signal.
In reply to Inga Stotland--- src/adapter.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 103 insertions(+), 3 deletions(-)
src/adapter.c +103 -3
@@ -2750,8 +2750,100 @@ static void emit_device_found(const char *path, const char *address,g_dbus_send_message (connection, signal); } +static char **get_eir_uuids (uint8_t *eir_data,size_t *uuid_count) +{ +uint8_t len =0 ; +char **uuid_buf =NULL ; +char **uuids; +size_t total =0 ; +size_t uuid16_count =0 ; +size_t uuid32_count =0 ; +size_t uuid128_count =0 ; +uint8_t *uuid16; +uint8_t *uuid32; +uint8_t *uuid128; +uuid_t service; +int i; + +while (len <EIR_DATA_LENGTH ) { +uint8_t type = eir_data[1 ]; +uint8_t field_len = eir_data[0 ]; + +switch (type) { +case EIR_UUID16_SOME : +case EIR_UUID16_ALL : + uuid16_count = field_len /2 ; + uuid16 = &eir_data[2 ]; +break ; +case EIR_UUID32_SOME : +case EIR_UUID32_ALL : + uuid32_count = field_len /4 ; + uuid32 = &eir_data[2 ]; +break ; +case EIR_UUID128_SOME : +case EIR_UUID128_ALL : + uuid128_count = field_len /16 ; + uuid128 = &eir_data[2 ]; +break ; + } + + len += field_len +1 ; + eir_data += field_len +1 ; + } + + total = uuid16_count + uuid32_count + uuid128_count; + *uuid_count = total; + +if (!total) +return NULL ; + + uuid_buf = g_new0(char *, total + 1); + +if (!uuid_buf) +return NULL ; + + uuids = uuid_buf; + +/* Generate uuids in SDP format (EIR data is Little Endian) */ + service.type =SDP_UUID16 ; +for (i =0 ; i < uuid16_count; i++) { +uint16_t val16 = uuid16[1 ]; + + val16 = (val16<<8 ) + uuid16[0 ]; + service.value.uuid16 = val16; + *uuids++ =bt_uuid2string (&service); + uuid16 +=2 ; + } + + service.type =SDP_UUID32 ; +for (i =0 ; i < uuid32_count; i++) { +uint32_t val32 = uuid32[3 ]; +int k; + +for (k =2 ; k >=0 ; k--) + val32 = (val32 <<8 ) + uuid32[k]; + + service.value.uuid32 = val32; + *uuids++ =bt_uuid2string (&service); + uuid32 +=4 ; + } + + service.type =SDP_UUID128 ; +for (i =0 ; i < uuid128_count; i++) { +int k; + +for (k =0 ; k <16 ; k++) + service.value.uuid128.data[k] = uuid128[16 - k -1 ]; + + *uuids++ =bt_uuid2string (&service); + uuid128 +=16 ; + } + +return uuid_buf; +} +void adapter_emit_device_found (struct btd_adapter *adapter, -struct remote_dev_info *dev) +struct remote_dev_info *dev,uint8_t *eir_data) {struct btd_device *device;char peer_addr[18 ], local_addr[18 ];
@@ -2759,6 +2851,8 @@ void adapter_emit_device_found(struct btd_adapter *adapter,dbus_bool_t paired = FALSE;dbus_int16_t rssi = dev->rssi;char *alias; +char **uuids =NULL ; +size_t uuid_count =0 ;ba2str (&dev->bdaddr, peer_addr);ba2str (&adapter->bdaddr, local_addr);
@@ -2778,6 +2872,10 @@ void adapter_emit_device_found(struct btd_adapter *adapter, }else alias =g_strdup (dev->alias); +/* Extract UUIDs from extended inquiry response if any*/ +if (eir_data !=NULL ) + uuids =get_eir_uuids (eir_data, &uuid_count); + emit_device_found(adapter->path, paddr, "Address", DBUS_TYPE_STRING, &paddr, "Class", DBUS_TYPE_UINT32, &dev->class,
@@ -2787,15 +2885,17 @@ void adapter_emit_device_found(struct btd_adapter *adapter,"Alias" ,DBUS_TYPE_STRING , &alias,"LegacyPairing" ,DBUS_TYPE_BOOLEAN , &dev->legacy,"Paired" ,DBUS_TYPE_BOOLEAN , &paired, +"UUIDs" ,DBUS_TYPE_ARRAY , &uuids, uuid_count, NULL);g_free (alias); +g_strfreev (uuids); }void adapter_update_found_devices (struct btd_adapter *adapter,bdaddr_t *bdaddr,int8_t rssi,uint32_t class,const char *name,const char *alias,gboolean legacy, -name_status_t name_status) +name_status_t name_status,uint8_t *eir_data) {struct remote_dev_info *dev, match;
@@ -2834,7 +2934,7 @@ done: adapter->found_devices =g_slist_sort (adapter->found_devices, (GCompareFunc ) dev_rssi_cmp); -adapter_emit_device_found (adapter, dev); +adapter_emit_device_found (adapter, dev, eir_data); }int adapter_remove_found_device (struct btd_adapter *adapter,bdaddr_t *bdaddr)
Signature · 6 lines
1.7.2 -- Inga Stotland Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
Re: [PATCH 3/7] Clean up code that generates extended inquiry response.
In reply to Inga StotlandHi Inga,
The patches are starting to look pretty good. A couple more coding style issues though (in this and a few consequtive emails):
src/sdpd-service.c void create_ext_inquiry_response(const char *name, · line 264
Quoted 1 line · Inga Stotland
src/sdpd-service.c +1
-0+ ptr[1 ] = (truncated) ?EIR_UUID16_SOME :EIR_UUID16_ALL ;
Another patch in your patch set "fixes" this and removes the parenthesis around truncated. Could you just fix it in this patch itself. In general patches with fixes to other patches that aren't yet upstream should be avoided by redoing the the first patch that caused the need for a fix to begin with.
Johan
Re: [PATCH 4/7] Support for adding UUID128 to extended inquiry response
In reply to Inga StotlandHi Inga,
src/sdpd-service.c void create_ext_inquiry_response(const char *name, · line 323
Quoted 2 lines · Inga Stotland
src/sdpd-service.c +1
-1- ptr[1 ] = (truncated) ?EIR_UUID16_SOME :EIR_UUID16_ALL ; + ptr[1 ] = truncated ?EIR_UUID16_SOME :EIR_UUID16_ALL ;
And here's the fix I mentioned in the previous email that shouldn't be needed to begin with.
Johan
Re: [PATCH 5/7] Fix in logic to write EIR when SDP records are changed.
In reply to Inga StotlandHi Inga,
Quoted 1 line · Inga Stotland
+static void
update_ext_inquiry_response(struct btd_adapter *adapter);
Is this forward declaration really necessary? Would it be possible to get rid of it by rearranging the static functions in this file (i.e. move update_ext_inquiry_response higher up in the file)?
Johan