sfos: bluez5: Handle deferred acquire a bit better on ofono backend.

Signed-off-by: Juho Hämäläinen <juho.hamalainen@jolla.com>
sailfishos · Feb 24, 2021 · d8d296c · d8d296c
1 parent e53e784
commit d8d296c
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/src/modules/bluetooth/backend-ofono.c b/src/modules/bluetooth/backend-ofono.c
@@ -59,13 +59,19 @@
     "  </interface>"                                                \
     "</node>"
 
+enum hf_audio_card_state {
+    HF_AUDIO_CARD_DISCONNECTED,
+    HF_AUDIO_CARD_CONNECTING,
+    HF_AUDIO_CARD_CONNECTED,
+};
+
 struct hf_audio_card {
     pa_bluetooth_backend *backend;
     char *path;
     char *remote_address;
     char *local_address;
 
-    bool connecting;
+    enum hf_audio_card_state state;
     int fd;
     int (*acquire)(struct hf_audio_card *card);
 
@@ -116,24 +122,24 @@ static int card_connect(struct hf_audio_card *card) {
     DBusMessage *r;
     DBusError err;
 
-    if (card->connecting)
+    if (card->state == HF_AUDIO_CARD_CONNECTING)
         return -EAGAIN;
 
-    card->connecting = true;
+    card->state = HF_AUDIO_CARD_CONNECTING;
 
     dbus_error_init(&err);
     r = card_send(card, "Connect", &err);
 
     if (!r) {
         pa_log_error("Failed to connect %s: %s", err.name, err.message);
-        card->connecting = false;
+        card->state = HF_AUDIO_CARD_DISCONNECTED;
         dbus_error_free(&err);
         return -1;
     }
 
     dbus_message_unref(r);
 
-    if (card->connecting)
+    if (card->state == HF_AUDIO_CARD_CONNECTING)
         return -EAGAIN;
 
     return 0;
@@ -276,9 +282,12 @@ static int hf_audio_agent_transport_acquire(pa_bluetooth_transport *t, bool opti
     err = socket_accept(card->fd);
     if (err < 0) {
         pa_log_error("Deferred setup failed on fd %d: %s", card->fd, pa_cstrerror(-err));
+        card->state = HF_AUDIO_CARD_DISCONNECTED;
         return -1;
     }
 
+    card->state = HF_AUDIO_CARD_CONNECTED;
+
     return card->fd;
 }
 
@@ -613,6 +622,7 @@ static DBusMessage *hf_audio_agent_new_connection(DBusConnection *c, DBusMessage
     sender = dbus_message_get_sender(m);
     if (!pa_safe_streq(backend->ofono_bus_id, sender)) {
         pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.NotAllowed", "Operation is not allowed by this sender"));
+        card->state = HF_AUDIO_CARD_DISCONNECTED;
         return r;
     }
 
@@ -622,22 +632,28 @@ static DBusMessage *hf_audio_agent_new_connection(DBusConnection *c, DBusMessage
                               DBUS_TYPE_BYTE, &codec,
                               DBUS_TYPE_INVALID) == FALSE) {
         pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.InvalidArguments", "Invalid arguments in method call"));
+        card->state = HF_AUDIO_CARD_DISCONNECTED;
         return r;
     }
 
     card = pa_hashmap_get(backend->cards, path);
 
+    if (card && card->state == HF_AUDIO_CARD_DISCONNECTED)
+        pa_log_debug("oFono initiated connection");
+
     if (!card || codec != HFP_AUDIO_CODEC_CVSD || card->fd >= 0) {
         pa_log_warn("New audio connection invalid arguments (path=%s fd=%d, codec=%d)", path, fd, codec);
         pa_assert_se(r = dbus_message_new_error(m, "org.ofono.Error.InvalidArguments", "Invalid arguments in method call"));
         shutdown(fd, SHUT_RDWR);
         close(fd);
+        if (card)
+            card->state = HF_AUDIO_CARD_DISCONNECTED;
         return r;
     }
 
     pa_log_debug("New audio connection on card %s (fd=%d, codec=%d)", path, fd, codec);
 
-    card->connecting = false;
+    card->state = HF_AUDIO_CARD_CONNECTED;
     card->fd = fd;
     card->transport->codec = codec;