[pulseaudio-discuss] [PATCH] bluetooth: Unregister endpoints when unloading

[Arun Raghavan]

This makes sure that we explicitly unregister any registered endpoints
when unloading module-bluetooth-*, since the corresponding state on the
bluetoothd side is only cleaned up when PulseAudio as a whole gets
killed.
---
 src/modules/bluetooth/bluetooth-util.c |   69 ++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 deletions(-)

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index cb7b69d..a9234cf 100644
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -62,6 +62,13 @@
     " </interface>"                                                     \
     "</node>"
 
+typedef struct pa_bluetooth_adapter pa_bluetooth_adapter;
+
+struct pa_bluetooth_adapter {
+    char *path;
+    PA_LLIST_FIELDS(pa_bluetooth_adapter);
+};
+
 struct pa_bluetooth_discovery {
     PA_REFCNT_DECLARE;
 
@@ -71,6 +78,7 @@ struct pa_bluetooth_discovery {
     pa_hashmap *devices;
     pa_hook hook;
     pa_bool_t filter_added;
+    PA_LLIST_HEAD(pa_bluetooth_adapter, adapters);
 };
 
 static void get_properties_reply(DBusPendingCall *pending, void *userdata);
@@ -705,8 +713,51 @@ static void register_endpoint(pa_bluetooth_discovery *y, const char *path, const
     send_and_add_to_pending(y, m, register_endpoint_reply, pa_xstrdup(endpoint));
 }
 
+static void unregister_endpoint_reply(DBusPendingCall *pending, void *userdata) {
+    DBusError e;
+    DBusMessage *r;
+    pa_dbus_pending *p;
+    pa_bluetooth_discovery *y;
+
+    pa_assert(pending);
+
+    dbus_error_init(&e);
+
+    pa_assert_se(p = userdata);
+    pa_assert_se(y = p->context_data);
+    pa_assert_se(r = dbus_pending_call_steal_reply(pending));
+
+    if (dbus_message_is_error(r, DBUS_ERROR_SERVICE_UNKNOWN)) {
+        pa_log_debug("Bluetooth daemon is apparently not available.");
+        goto finish;
+    }
+
+    if (dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR) {
+        pa_log("org.bluez.Media.UnregisterEndpoint() failed: %s: %s", dbus_message_get_error_name(r), pa_dbus_get_error_message(r));
+        goto finish;
+    }
+
+finish:
+    dbus_message_unref(r);
+
+    PA_LLIST_REMOVE(pa_dbus_pending, y->pending, p);
+    pa_dbus_pending_free(p);
+}
+
+static void unregister_endpoint(pa_bluetooth_discovery *y, const char *path, const char *endpoint) {
+    DBusMessage *m;
+
+    pa_log_debug("Unregistering %s on adapter %s.", endpoint, path);
+
+    pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Media", "UnregisterEndpoint"));
+    pa_assert_se(dbus_message_append_args(m, DBUS_TYPE_OBJECT_PATH, &endpoint, DBUS_TYPE_INVALID));
+
+    send_and_add_to_pending(y, m, unregister_endpoint_reply, NULL);
+}
+
 static void found_adapter(pa_bluetooth_discovery *y, const char *path) {
     DBusMessage *m;
+    pa_bluetooth_adapter *adapter;
 
     pa_assert_se(m = dbus_message_new_method_call("org.bluez", path, "org.bluez.Adapter", "GetProperties"));
     send_and_add_to_pending(y, m, get_properties_reply, NULL);
@@ -715,6 +766,10 @@ static void found_adapter(pa_bluetooth_discovery *y, const char *path) {
     register_endpoint(y, path, HFP_HS_ENDPOINT, HFP_HS_UUID);
     register_endpoint(y, path, A2DP_SOURCE_ENDPOINT, A2DP_SOURCE_UUID);
     register_endpoint(y, path, A2DP_SINK_ENDPOINT, A2DP_SINK_UUID);
+
+    adapter = pa_xnew(pa_bluetooth_adapter, 1);
+    adapter->path = pa_xstrdup(path);
+    PA_LLIST_PREPEND(pa_bluetooth_adapter, y->adapters, adapter);
 }
 
 static void list_adapters(pa_bluetooth_discovery *y) {
@@ -1513,6 +1568,8 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_ref(pa_bluetooth_discovery *y) {
 }
 
 void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
+    pa_bluetooth_adapter *ai, *an;
+
     pa_assert(y);
     pa_assert(PA_REFCNT_VALUE(y) > 0);
 
@@ -1521,6 +1578,18 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
 
     pa_dbus_free_pending_list(&y->pending);
 
+    PA_LLIST_FOREACH_SAFE(ai, an, y->adapters) {
+        PA_LLIST_REMOVE(pa_bluetooth_adapter, y->adapters, ai);
+
+        unregister_endpoint(y, ai->path, HFP_AG_ENDPOINT);
+        unregister_endpoint(y, ai->path, HFP_HS_ENDPOINT);
+        unregister_endpoint(y, ai->path, A2DP_SOURCE_ENDPOINT);
+        unregister_endpoint(y, ai->path, A2DP_SINK_ENDPOINT);
+
+        pa_xfree(ai->path);
+        pa_xfree(ai);
+    }
+
     if (y->devices) {
         remove_all_devices(y);
         pa_hashmap_free(y->devices, NULL, NULL);
-- 
1.7.8.6