fix stop_on_disconnect together with quick_reconnect

Author: manio

src/bluetooth.rs

@@ -1,4 +1,5 @@
 use crate::btle;
+use crate::config::Action;
 use crate::config::WifiConfig;
 use crate::config::IDENTITY_NAME;
 use crate::config_types::BluetoothAddressList;
@@ -567,7 +568,7 @@ impl Bluetooth {
         bt_timeout: Duration,
         stopped: bool,
         quick_reconnect: bool,
-        mut need_restart: BroadcastReceiver<()>,
+        mut need_restart: BroadcastReceiver<Option<Action>>,
         profile_connected: Arc<AtomicBool>,
     ) -> Result<()> {
         // Use the provided session and adapter instead of creating new ones
@@ -580,11 +581,22 @@ impl Bluetooth {
         if quick_reconnect {
             // keep the bluetooth profile connection alive
             // and use it in a loop to restart handshake when necessary
+            let adapter_cloned = self.adapter.clone();
             let _ = Some(tokio::spawn(async move {
                 profile_connected.store(true, Ordering::Relaxed);
                 loop {
                     // wait for restart notification from main loop (eg when HU disconnected)
-                    let _ = need_restart.recv().await;
+                    let action = need_restart.recv().await;
+                    if let Ok(Some(action)) = action {
+                        // check if we need to stop now
+                        if action == Action::Stop {
+                            // disconnect and break
+                            if let Ok(device) = adapter_cloned.device(bluer::Address(*address)) {
+                                let _ = device.disconnect().await;
+                            }
+                            break;
+                        }
+                    }
 
                     // now restart handshake with the same params
                     match Self::send_params(wifi_config.clone(), &mut stream).await {

src/io_uring.rs

@@ -285,7 +285,7 @@ async fn tcp_wait_for_connection(listener: &mut TcpListener) -> Result<TcpStream
 }
 
 pub async fn io_loop(
-    need_restart: BroadcastSender<()>,
+    need_restart: BroadcastSender<Option<Action>>,
     tcp_start: Arc<Notify>,
     config: SharedConfig,
     tx: Arc<Mutex<Option<Sender<Packet>>>>,
@@ -334,7 +334,7 @@ pub async fn io_loop(
                     error!("{} 🔴 Enabling Android Auto: {}", NAME, e);
                     // notify main loop to restart
                     if !profile_connected.load(Ordering::Relaxed) {
-                        let _ = need_restart.send(());
+                        let _ = need_restart.send(None);
                     }
                     continue;
                 }
@@ -355,7 +355,7 @@ pub async fn io_loop(
             } else {
                 // notify main loop to restart
                 if !profile_connected.load(Ordering::Relaxed) {
-                    let _ = need_restart.send(());
+                    let _ = need_restart.send(None);
                 }
                 continue;
             }
@@ -371,7 +371,7 @@ pub async fn io_loop(
             } else {
                 // notify main loop to restart
                 if !profile_connected.load(Ordering::Relaxed) {
-                    let _ = need_restart.send(());
+                    let _ = need_restart.send(None);
                 }
                 continue;
             }
@@ -392,7 +392,7 @@ pub async fn io_loop(
                     error!("{} 🔴 Error opening USB accessory: {}", NAME, e);
                     // notify main loop to restart
                     if !profile_connected.load(Ordering::Relaxed) {
-                        let _ = need_restart.send(());
+                        let _ = need_restart.send(None);
                     }
                     continue;
                 }
@@ -552,8 +552,10 @@ pub async fn io_loop(
             NAME,
             format_duration(started.elapsed()).to_string()
         );
+        // obtain action for passing it to broadcast sender
+        let action = shared_config.read().await.action_requested.clone();
         // stream(s) closed, notify main loop to restart
-        let _ = need_restart.send(());
+        let _ = need_restart.send(action);
     }
 
     #[allow(unreachable_code)]

src/main.rs

@@ -183,7 +183,7 @@ async fn action_handler(config: &mut SharedConfig) {
 async fn tokio_main(
     config: SharedConfig,
     config_json: SharedConfigJson,
-    restart_tx: BroadcastSender<()>,
+    restart_tx: BroadcastSender<Option<Action>>,
     tcp_start: Arc<Notify>,
     config_file: PathBuf,
     tx: Arc<Mutex<Option<Sender<Packet>>>>,
@@ -296,7 +296,9 @@ async fn tokio_main(
         }
 
         // run only if not handling this in handshake task
-        if !(cfg.quick_reconnect && profile_connected.load(Ordering::Relaxed)) {
+        if !(cfg.quick_reconnect && profile_connected.load(Ordering::Relaxed))
+            || cfg.action_requested == Some(Action::Stop)
+        {
             // bluetooth handshake
             if let Err(e) = bluetooth
                 .aa_handshake(