嗷嗷

Author: arloor

crates/shadowsocks-service/src/local/http/http_client.rs

@@ -1,5 +1,7 @@
 //! HTTP Client
 
+#[cfg(not(feature = "https-tunnel"))]
+use http::{Method as HttpMethod, Uri, Version as HttpVersion};
 use std::{
     borrow::Cow,
     collections::VecDeque,
@@ -12,7 +14,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use http::{HeaderValue, Method as HttpMethod, Uri, Version as HttpVersion, header::InvalidHeaderValue};
+use http::{HeaderValue, header::InvalidHeaderValue};
 use hyper::{
     Request, Response,
     body::{self, Body},

crates/shadowsocks-service/src/local/net/tcp/auto_proxy_stream.rs

@@ -36,12 +36,11 @@ pub enum AutoProxyClientStream {
 #[cfg(feature = "https-tunnel")]
 use {
     bytes::{BufMut, BytesMut},
-    httparse::{Response, Status},
     log::warn,
     rustls_native_certs::CertificateResult,
     std::io::ErrorKind,
     std::sync::LazyLock,
-    tokio::io::{AsyncReadExt, AsyncWriteExt},
+    tokio::io::AsyncWriteExt,
     tokio_rustls::{
         TlsConnector,
         rustls::{ClientConfig, RootCertStore, pki_types::ServerName},

crates/shadowsocks-service/src/local/utils.rs

@@ -3,14 +3,8 @@
 use std::{io, net::SocketAddr};
 
 use log::{debug, trace};
-use shadowsocks::{
-    config::ServerConfig,
-    relay::{socks5::Address, tcprelay::utils::copy_encrypted_bidirectional},
-};
-use tokio::{
-    io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt, copy_bidirectional},
-    time,
-};
+use shadowsocks::{config::ServerConfig, relay::socks5::Address};
+use tokio::io::{AsyncRead, AsyncWrite, copy_bidirectional};
 
 use crate::local::net::AutoProxyIo;
 
@@ -73,8 +67,9 @@ where
     #[cfg(feature = "https-tunnel")]
     let result = copy_bidirectional(shadow, plain).await;
     #[cfg(not(feature = "https-tunnel"))]
-    let result =
-        shadowsocks::relay::tcprelay::utils::copy_encrypted_bidirectional(svr_cfg.method(), shadow, plain).await;
+    use shadowsocks::relay::tcprelay::utils::copy_encrypted_bidirectional;
+    #[cfg(not(feature = "https-tunnel"))]
+    let result = copy_encrypted_bidirectional(svr_cfg.method(), shadow, plain).await;
     match result {
         Ok((wn, rn)) => {
             trace!(

crates/shadowsocks/src/config.rs

@@ -15,7 +15,9 @@ use base64::Engine as _;
 use byte_string::ByteStr;
 use bytes::Bytes;
 use cfg_if::cfg_if;
-use log::{error, warn};
+use log::error;
+#[cfg(not(feature = "https-tunnel"))]
+use log::warn;
 use thiserror::Error;
 use url::{self, Url};