@@ -440,12 +440,24 @@ static int bluetooth_init(void)
static void bluetooth_exit(void)
{
+ GSList *l;
+
g_dbus_remove_watch(connection, listener_id);
- g_slist_free_full(profiles, profile_free);
+ for (l = profiles; l; l = l->next) {
+ struct bluetooth_profile *profile = l->data;
+
+ if (profile->path == NULL)
+ continue;
+
+ unregister_profile(profile);
+ }
- if (connection)
+ if (connection) {
+ dbus_connection_close(connection);
dbus_connection_unref(connection);
+ connection = NULL;
+ }
obex_transport_driver_unregister(&driver);
}
bluetooth_exit() didn't previously unregister itself thoroughly. That was fine if it was only called when the service was about to exit, because everything was implicitly unregistered when the process ended. But we need to be more scrupulous if this can be called throughout the program's lifecycle. Send UnregisterProfile messages directly from bluetooth_exit(), then call unregister_profile(profile). The UnregisterProfile message can't be sent directly from unregister_profile(), because that also needs to be called when register_profile() fails halfway through. Do not free profiles in bluetooth_exit() - profiles are needed by a future call to bluetooth_init(), or will be freed by bluetooth_stop() if necessary. Signed-off-by: Andrew Sayers <kernel.org@pileofstuff.org> --- obexd/plugins/bluetooth.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)