[PATCH BlueZ 2/4] obexd/bluetooth: Support calling bluetooth_init() after bluetooth_exit()

[Andrew Sayers <kernel.org@pileofstuff.org>]

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 | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/obexd/plugins/bluetooth.c b/obexd/plugins/bluetooth.c
index afb2215bd..bcaf19bae 100644
--- a/obexd/plugins/bluetooth.c
+++ b/obexd/plugins/bluetooth.c
@@ -440,12 +440,38 @@ static int bluetooth_init(void)
 
 static void bluetooth_exit(void)
 {
+	DBusMessage *msg;
+	DBusMessageIter iter;
+	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;
 
-	if (connection)
+		msg = dbus_message_new_method_call(
+					"org.bluez", "/org/bluez",
+					"org.bluez.ProfileManager1",
+					"UnregisterProfile");
+
+		dbus_message_iter_init_append(msg, &iter);
+
+		dbus_message_iter_append_basic(&iter,
+						DBUS_TYPE_OBJECT_PATH,
+						&profile->path);
+
+		g_dbus_send_message(connection, msg);
+
+		unregister_profile(profile);
+	}
+
+	if (connection) {
 		dbus_connection_unref(connection);
+		connection = NULL;
+	}
 
 	obex_transport_driver_unregister(&driver);
 }
-- 
2.49.0