Skip to contentSkip to conversation

core/device: Store services when they change or after pairing.

PATCH Superseded Jakub Pawlowski 2 participants 2 messages Sep 14, 2015 – Sep 15, 2015 Bluetooth drivers

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 core/device: Store services when they change or after pairing.

Service caching works only for paired devices. Right now caching is triggered only right after discovery finishes. That means that if already paired device sends service changed notofication, cache won't be updated. Also if you connect to new device, and then pair during this connection, your services won't be cached until reconnect. This will require full service discovery which is slow.
This patch fixes that by trying to cache services every time services changed, and right after successful pairing.

---
 src/device.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
src/device.c +9 -3
index 8184508..e155d08 100644
@@ -2202,10 +2202,8 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t bdaddr_type,
 	if (!dev->temporary)
 		store_device_info(dev);
 
-	if (bdaddr_type != BDADDR_BREDR && err == 0) {
+	if (bdaddr_type != BDADDR_BREDR && err == 0)
 		store_services(dev);
-		store_gatt_db(dev);
-	}
 
 	if (!req)
 		return;
@@ -3313,6 +3311,9 @@ static gboolean gatt_services_changed(gpointer user_data)
 {
 	struct btd_device *device = user_data;
 
+	if (device->bdaddr_type != BDADDR_BREDR)
+		store_gatt_db(device);
+
 	g_dbus_emit_property_changed(dbus_conn, device->path, DEVICE_INTERFACE,
 								"GattServices");
 
@@ -5315,6 +5316,11 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
 	 * request
 	 */
 	if (state->svc_resolved && bonding) {
+		/* Attept to store services for this device failed because it
+		 * was not paired. Now that we're paired retry. */
+		if (device->bdaddr_type != BDADDR_BREDR)
+			store_gatt_db(device);
+
 		g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_TYPE_INVALID);
 		bonding_request_free(bonding);
 		return;
Signature · 1 line
2.5.0
#1 lore raw

Hi Jakub,

Quoted 29 lines · Jakub Pawlowski

Service caching works only for paired devices. Right now caching is triggered only right after discovery finishes. That means that if already paired device sends service changed notofication, cache won't be updated. Also if you connect to new device, and then pair during this connection, your services won't be cached until reconnect. This will require full service discovery which is slow.
This patch fixes that by trying to cache services every time services changed, and right after successful pairing.

---
 src/device.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
src/device.c +1 -3
index 8184508..e155d08 100644
@@ -2202,10 +2202,8 @@ static void device_svc_resolved(struct btd_device *dev, uint8_t bdaddr_type,
        if (!dev->temporary)
                store_device_info(dev);
 
-       if (bdaddr_type != BDADDR_BREDR && err == 0) {
+       if (bdaddr_type != BDADDR_BREDR && err == 0)
                store_services(dev);
-               store_gatt_db(dev);
-       }
 
        if (!req)
                return;

src/device.c static gboolean gatt_services_changed(gpointer user_data) · line 3315

Quoted 5 lines
src/device.c +2 -0
@@ -3313,6 +3311,9 @@ static gboolean gatt_services_changed(gpointer user_data)
 {
        struct btd_device *device = user_data;
 
+       if (device->bdaddr_type != BDADDR_BREDR)
+               store_gatt_db(device);

What is the point of checking bdaddr_type here? It should not matter what bearer is used we should store the attributes anyway.

src/device.c void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type, · line 5322

Quoted 11 lines
src/device.c +4 -0
        g_dbus_emit_property_changed(dbus_conn, device->path, DEVICE_INTERFACE,
                                                                "GattServices");
 
@@ -5315,6 +5316,11 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type,
         * request
         */
        if (state->svc_resolved && bonding) {
+               /* Attept to store services for this device failed because it
+                * was not paired. Now that we're paired retry. */
+               if (device->bdaddr_type != BDADDR_BREDR)
+                       store_gatt_db(device);

Ditto.

Quoted 11 lines
src/device.c +1 -1
+
                g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_TYPE_INVALID);
                bonding_request_free(bonding);
                return;
--

2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Signature · 1 line
Luiz Augusto von Dentz