f

Author: ibigbug

clash-lib/src/app/dispatcher/mod.rs

@@ -4,9 +4,7 @@ mod tracked;
 
 pub use dispatcher_impl::Dispatcher;
 pub use statistics_manager::Manager as StatisticsManager;
-#[allow(unused)]
 pub use tracked::{
     BoxedChainedDatagram, BoxedChainedStream, ChainedDatagram,
-    ChainedDatagramWrapper, ChainedStream, ChainedStreamWrapper, TrackCopy,
-    TrackedStream,
+    ChainedDatagramWrapper, ChainedStream, ChainedStreamWrapper, TrackedStream,
 };

clash-lib/src/app/dispatcher/tracked.rs

@@ -167,83 +167,6 @@ impl TrackedStream {
     pub fn inner_mut(&mut self) -> &mut BoxedChainedStream {
         &mut self.inner
     }
-
-    pub fn trackers(
-        &self,
-    ) -> (
-        Arc<dyn TrackCopy + Send + Sync>,
-        Arc<dyn TrackCopy + Send + Sync>,
-    ) {
-        let r =
-            Arc::new(ReadTracker::new(self.tracker.clone(), self.manager.clone()));
-        let w = Arc::new(WriteTracker::new(
-            self.tracker.clone(),
-            self.manager.clone(),
-        ));
-        (r, w)
-    }
-}
-
-#[allow(unused)]
-pub trait TrackCopy {
-    fn track(&self, total: usize);
-}
-
-impl TrackCopy for ReadTracker {
-    fn track(&self, total: usize) {
-        self.push_downloaded(total);
-    }
-}
-
-impl TrackCopy for WriteTracker {
-    fn track(&self, total: usize) {
-        self.push_uploaded(total);
-    }
-}
-
-#[allow(unused)]
-pub struct ReadTracker {
-    tracker: Arc<TrackerInfo>,
-    manager: Arc<Manager>,
-}
-
-impl ReadTracker {
-    fn new(tracker: Arc<TrackerInfo>, manager: Arc<Manager>) -> Self {
-        Self { tracker, manager }
-    }
-
-    fn push_downloaded(&self, download: usize) {
-        self.manager.push_downloaded(download);
-        self.tracker
-            .download_total
-            .fetch_add(download as u64, std::sync::atomic::Ordering::Release);
-    }
-}
-
-#[allow(unused)]
-pub struct WriteTracker {
-    tracker: Arc<TrackerInfo>,
-    manager: Arc<Manager>,
-}
-
-impl WriteTracker {
-    fn new(tracker: Arc<TrackerInfo>, manager: Arc<Manager>) -> Self {
-        Self { tracker, manager }
-    }
-
-    fn push_uploaded(&self, upload: usize) {
-        self.manager.push_uploaded(upload);
-        self.tracker
-            .upload_total
-            .fetch_add(upload as u64, std::sync::atomic::Ordering::Release);
-    }
-}
-
-impl Drop for TrackedStream {
-    fn drop(&mut self) {
-        debug!("untrack connection: {}", self.id());
-        self.manager.untrack(self.id());
-    }
 }
 
 impl AsyncRead for TrackedStream {

clash-lib/src/app/dns/runtime.rs

@@ -1,20 +1,18 @@
 use std::{
     io,
     net::SocketAddr,
-    sync::Arc,
     task::{Context, Poll, ready},
     time::Duration,
 };
 
 use crate::{
     app::{
         dispatcher::{BoxedChainedDatagram, BoxedChainedStream},
-        dns::{self, ThreadSafeDNSResolver},
+        dns::ThreadSafeDNSResolver,
         net::OutboundInterface,
     },
     common::errors::new_io_error,
-    config::proxy::PROXY_DIRECT,
-    proxy::{AnyOutboundHandler, datagram::UdpPacket, direct},
+    proxy::{AnyOutboundHandler, datagram::UdpPacket},
     session::{Network, Session, Type},
 };
 use futures::{SinkExt, StreamExt};
@@ -56,6 +54,9 @@ impl DnsRuntimeProvider {
         iface: Option<OutboundInterface>,
         so_mark: Option<u32>,
     ) -> Self {
+        use crate::{app::dns, config::proxy::PROXY_DIRECT, proxy::direct};
+        use std::sync::Arc;
+
         let proxy = Arc::new(direct::Handler::new(PROXY_DIRECT));
         // SystemResolver::new us trivial,it always return Ok
         let dns_resolver = Arc::new(dns::SystemResolver::new(false).unwrap());