fix mode not updating for udp traffic (#149)

clash_lib/Cargo.toml

@@ -42,7 +42,6 @@ hyper-boring = { git = "https://github.com/Watfaq/boring.git", rev = "24c006f" }
 tokio-boring = { git = "https://github.com/Watfaq/boring.git", rev = "24c006f" }
 ip_network_table-deps-treebitmap = "0.5.0"
 once_cell = "1.18.0"
-arc-swap = "1.6.0"
 
 # opentelemetry
 opentelemetry = "0.20"

clash_lib/src/app/dispatcher/dispatcher.rs

@@ -9,13 +9,13 @@ use crate::config::internal::proxy::PROXY_GLOBAL;
 use crate::proxy::datagram::UdpPacket;
 use crate::proxy::AnyInboundDatagram;
 use crate::session::Session;
-use arc_swap::ArcSwap;
 use futures::SinkExt;
 use futures::StreamExt;
 use std::collections::HashMap;
 use std::fmt::{Debug, Formatter};
 use std::net::SocketAddr;
 use std::sync::Arc;
+use std::sync::Mutex;
 use std::time::Duration;
 use std::time::Instant;
 use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
@@ -35,7 +35,7 @@ pub struct Dispatcher {
     outbound_manager: ThreadSafeOutboundManager,
     router: ThreadSafeRouter,
     resolver: ThreadSafeDNSResolver,
-    mode: ArcSwap<RunMode>,
+    mode: Arc<Mutex<RunMode>>,
 
     manager: Arc<Manager>,
 }
@@ -59,19 +59,19 @@ impl Dispatcher {
             outbound_manager,
             router,
             resolver,
-            mode: Arc::new(mode).into(),
+            mode: Arc::new(Mutex::new(mode)),
             manager: statistics_manager,
         }
     }
 
     pub async fn set_mode(&self, mode: RunMode) {
         info!("run mode switched to {}", mode);
 
-        self.mode.store(Arc::new(mode));
+        *self.mode.lock().unwrap() = mode;
     }
 
     pub async fn get_mode(&self) -> RunMode {
-        **self.mode.load()
+        *self.mode.lock().unwrap()
     }
 
     #[instrument(skip(lhs))]
@@ -107,7 +107,7 @@ impl Dispatcher {
             sess
         };
 
-        let mode = **self.mode.load();
+        let mode = *self.mode.lock().unwrap();
         let (outbound_name, rule) = match mode {
             RunMode::Global => (PROXY_GLOBAL, None),
             RunMode::Rule => self.router.match_route(&sess).await,
@@ -192,7 +192,7 @@ impl Dispatcher {
         let router = self.router.clone();
         let outbound_manager = self.outbound_manager.clone();
         let resolver = self.resolver.clone();
-        let mode = **self.mode.load();
+        let mode = self.mode.clone();
         let manager = self.manager.clone();
 
         let (mut local_w, mut local_r) = udp_inbound.split();
@@ -242,7 +242,7 @@ impl Dispatcher {
                 let mut packet = packet;
                 packet.dst_addr = sess.destination.clone();
 
-                let mode = mode.clone();
+                let mode = *mode.lock().unwrap();
 
                 let (outbound_name, rule) = match mode {
                     RunMode::Global => (PROXY_GLOBAL, None),

clash_lib/src/lib.rs

@@ -22,6 +22,7 @@ use std::io;
 use std::path::PathBuf;
 use tokio::task::JoinHandle;
 use tracing::error;
+use tracing::info;
 
 use std::sync::Arc;
 use thiserror::Error;
@@ -265,6 +266,7 @@ async fn start_async(opts: Options) -> Result<(), Error> {
     }
 
     runners.push(Box::pin(async move {
+        info!("receive shutdown signal");
         shutdown_rx.recv().await;
     }));