core: Fixes order InterfaceAdded
Luiz Augusto von Dentz
maintainerPATCH 1/2 core: Fixes order InterfaceAdded
From: Luiz Augusto von Dentz <[email protected]>
Registering on the callback of MGMT_OP_READ_ADV_FEATURES causes InterfacesAdded to be reschedule after the device objects which causes tools such as PulseAudio to consider it invalid.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1534857
--- src/advertising.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
src/advertising.c +15 -13
@@ -1032,14 +1032,6 @@ static void read_adv_features_callback(uint8_t status, uint16_t length,if (manager->max_ads ==0 )return ; -if (!g_dbus_register_interface (btd_get_dbus_connection (), -adapter_get_path (manager->adapter), -LE_ADVERTISING_MGR_IFACE , methods, -NULL , properties, manager,NULL )) { -error ("Failed to register " LE_ADVERTISING_MGR_IFACE ); -return ; - } -/* Reset existing instances */ if (feat->num_instances)remove_advertising (manager,0 );
@@ -1061,19 +1053,29 @@ static struct btd_adv_manager *manager_create(struct btd_adapter *adapter) } manager->mgmt_index =btd_adapter_get_index (adapter); + manager->clients =queue_new (); + manager->supported_flags =MGMT_ADV_FLAG_LOCAL_NAME ; + +if (!g_dbus_register_interface (btd_get_dbus_connection (), +adapter_get_path (manager->adapter), +LE_ADVERTISING_MGR_IFACE , methods, +NULL , properties, manager,NULL )) { +error ("Failed to register " LE_ADVERTISING_MGR_IFACE ); + goto fail; + }if (!mgmt_send (manager->mgmt,MGMT_OP_READ_ADV_FEATURES , manager->mgmt_index,0 ,NULL , read_adv_features_callback, manager,NULL )) {error ("Failed to read advertising features" ); -manager_destroy (manager); -return NULL ; + goto fail; } - manager->clients =queue_new (); - manager->supported_flags =MGMT_ADV_FLAG_LOCAL_NAME ; -return manager; + +fail: +manager_destroy (manager); +return NULL ; }struct btd_adv_manager *btd_adv_manager_new (struct btd_adapter *adapter)
Signature · 1 line
2.14.3
Luiz Augusto von Dentz
maintainerPATCH 1/1 shared/gatt-client: Reset callbacks when unregistering
From: Luiz Augusto von Dentz <[email protected]>
If user application is unregistering a notification handler its callbacks shall not be called even CCC write is still holding a reference to notify_data.
--- src/shared/gatt-client.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
src/shared/gatt-client.c +7 -1
@@ -1212,7 +1212,9 @@ static void complete_notify_request(void *data)struct notify_data *notify_data = data; notify_data->att_id =0 ; - notify_data->callback (0 , notify_data->user_data); + +if (notify_data->callback) + notify_data->callback (0 , notify_data->user_data); } static bool notify_data_write_ccc(struct notify_data *notify_data, bool enable,
@@ -3157,6 +3159,10 @@ bool bt_gatt_client_unregister_notify(struct bt_gatt_client *client,/* Remove data if it has been queued */ queue_remove (notify_data->chrc->reg_notify_queue, notify_data); +/* Reset callbacks */ + notify_data->callback =NULL ; + notify_data->notify =NULL ; +complete_unregister_notify (notify_data);return true; }
Signature · 1 line
2.14.3
Luiz Augusto von Dentz
maintainerPATCH 2/2 shared/gatt-client: Reset callbacks when unregistering
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
If user application is unregistering a notification handler its callbacks shall not be called even CCC write is still holding a reference to notify_data.
--- src/shared/gatt-client.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
src/shared/gatt-client.c +7 -1
@@ -1212,7 +1212,9 @@ static void complete_notify_request(void *data)struct notify_data *notify_data = data; notify_data->att_id =0 ; - notify_data->callback (0 , notify_data->user_data); + +if (notify_data->callback) + notify_data->callback (0 , notify_data->user_data); } static bool notify_data_write_ccc(struct notify_data *notify_data, bool enable,
@@ -3157,6 +3159,10 @@ bool bt_gatt_client_unregister_notify(struct bt_gatt_client *client,/* Remove data if it has been queued */ queue_remove (notify_data->chrc->reg_notify_queue, notify_data); +/* Reset callbacks */ + notify_data->callback =NULL ; + notify_data->notify =NULL ; +complete_unregister_notify (notify_data);return true; }
Signature · 1 line
2.14.3
Re: [PATCH BlueZ 2/2] shared/gatt-client: Reset callbacks when unregistering
Hi,
Quoted 36 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
If user application is unregistering a notification handler its callbacks shall not be called even CCC write is still holding a reference to
notify_data.--- src/shared/gatt-client.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)src/shared/gatt-client.c +7
-2@@ -1212,7 +1212,9 @@ static void complete_notify_request(void *data)struct notify_data *notify_data = data; notify_data->att_id =0 ; - notify_data->callback (0 , notify_data->user_data); + +if (notify_data->callback) + notify_data->callback (0 , notify_data->user_data); } static bool notify_data_write_ccc(struct notify_data *notify_data, bool enable,@@ -3157,6 +3159,10 @@ bool bt_gatt_client_unregister_notify(struct bt_gatt_client *client,/* Remove data if it has been queued */ queue_remove (notify_data->chrc->reg_notify_queue, notify_data); +/* Reset callbacks */ + notify_data->callback =NULL ; + notify_data->notify =NULL ; +complete_unregister_notify (notify_data);return true; } --
Quoted 1 line
2.14.3
Applied.
Signature · 1 line
Luiz Augusto von Dentz