source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 01:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: imports_granularity set to default

Browse Source 
- imports_granularity is still unstable since 2021:
  https://rust-lang.github.io/rustfmt/?version=v1.6.0&search=#imports_granularity
This commit is contained in:
zonyitoo
2024-08-07 00:17:00 +08:00
parent dcc628d7a0
commit 29fc232e1f
40 changed files with 54 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/shadowsocks-service/src/config.rs
View File

@@ -70,14 +70,7 @@ use serde::{Deserialize, Serialize};
use shadowsocks::relay::socks5::Address;
use shadowsocks::{
config::{
ManagerAddr,
Mode,
ReplayAttackPolicy,
ServerAddr,
ServerConfig,
ServerSource,
ServerUser,
ServerUserManager,
ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerSource, ServerUser, ServerUserManager,
ServerWeight,
},
crypto::CipherKind,

5
crates/shadowsocks-service/src/local/fake_dns/processor.rs
View File

@@ -6,10 +6,7 @@ use hickory_resolver::proto::{
op::{header::MessageType, response_code::ResponseCode, Header, Message, OpCode},
rr::{
rdata::{A, AAAA},
DNSClass,
RData,
Record,
RecordType,
DNSClass, RData, Record, RecordType,
},
};
use log::{debug, trace};

3
crates/shadowsocks-service/src/local/http/http_client.rs
View File

@@ -16,8 +16,7 @@ use hyper::{
client::conn::{http1, http2},
http::uri::Scheme,
rt::{Sleep, Timer},
Request,
Response,
Request, Response,
};
use log::{error, trace};
use lru_time_cache::LruCache;

8
crates/shadowsocks-service/src/local/http/http_service.rs
View File

@@ -8,13 +8,7 @@ use hyper::{
body,
header::{self, HeaderValue},
http::uri::{Authority, Scheme},
HeaderMap,
Method,
Request,
Response,
StatusCode,
Uri,
Version,
HeaderMap, Method, Request, Response, StatusCode, Uri, Version,
};
use log::{debug, error, trace};
use shadowsocks::relay::Address;

4
crates/shadowsocks-service/src/local/http/server.rs
View File

@@ -13,9 +13,7 @@ use tokio::{
};
use crate::local::{
context::ServiceContext,
loadbalancing::PingBalancer,
net::tcp::listener::create_standard_tcp_listener,
context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
};
use super::{http_client::HttpClient, http_service::HttpService, tokio_rt::TokioIo};

4
crates/shadowsocks-service/src/local/http/utils.rs
View File

@@ -9,9 +9,7 @@ use std::{
use hyper::{
header::{self, HeaderValue},
http::uri::Authority,
HeaderMap,
Uri,
Version,
HeaderMap, Uri, Version,
};
use log::error;
use shadowsocks::relay::socks5::Address;

4
crates/shadowsocks-service/src/local/net/udp/association.rs
View File

@@ -29,9 +29,7 @@ use shadowsocks::{
use crate::{
local::{context::ServiceContext, loadbalancing::PingBalancer},
net::{
packet_window::PacketWindowFilter,
MonProxySocket,
UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
packet_window::PacketWindowFilter, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
},
};

10
crates/shadowsocks-service/src/local/socks/client/socks5/tcp_client.rs
View File

@@ -9,15 +9,7 @@ use std::{
use log::trace;
use pin_project::pin_project;
use shadowsocks::relay::socks5::{
self,
Address,
Command,
Error,
HandshakeRequest,
HandshakeResponse,
Reply,
TcpRequestHeader,
TcpResponseHeader,
self, Address, Command, Error, HandshakeRequest, HandshakeResponse, Reply, TcpRequestHeader, TcpResponseHeader,
};
use tokio::{
io::{AsyncRead, AsyncWrite, ReadBuf},

4
crates/shadowsocks-service/src/local/socks/server/server.rs
View File

@@ -7,9 +7,7 @@ use tokio::{net::TcpStream, time};
#[cfg(feature = "local-http")]
use crate::local::http::HttpConnectionHandler;
use crate::local::{
context::ServiceContext,
loadbalancing::PingBalancer,
net::tcp::listener::create_standard_tcp_listener,
context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
socks::config::Socks5AuthConfig,
};

7
crates/shadowsocks-service/src/local/socks/server/socks4/tcprelay.rs
View File

@@ -21,12 +21,7 @@ use crate::local::{
};
use crate::local::socks::socks4::{
Address,
Command,
Error as Socks4Error,
HandshakeRequest,
HandshakeResponse,
ResultCode,
Address, Command, Error as Socks4Error, HandshakeRequest, HandshakeResponse, ResultCode,
};
pub struct Socks4TcpHandler {

13
crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs
View File

@@ -11,17 +11,8 @@ use log::{debug, error, trace, warn};
use shadowsocks::{
config::Mode,
relay::socks5::{
self,
Address,
Command,
Error as Socks5Error,
HandshakeRequest,
HandshakeResponse,
PasswdAuthRequest,
PasswdAuthResponse,
Reply,
TcpRequestHeader,
TcpResponseHeader,
self, Address, Command, Error as Socks5Error, HandshakeRequest, HandshakeResponse, PasswdAuthRequest,
PasswdAuthResponse, Reply, TcpRequestHeader, TcpResponseHeader,
},
ServerAddr,
};

16
crates/shadowsocks-service/src/manager/server.rs
View File

@@ -13,23 +13,13 @@ use shadowsocks::{
manager::{
datagram::ManagerSocketAddr,
protocol::{
self,
AddRequest,
AddResponse,
ErrorResponse,
ListResponse,
ManagerRequest,
PingResponse,
RemoveRequest,
RemoveResponse,
ServerUserConfig,
StatRequest,
self, AddRequest, AddResponse, ErrorResponse, ListResponse, ManagerRequest, PingResponse, RemoveRequest,
RemoveResponse, ServerUserConfig, StatRequest,
},
},
net::{AcceptOpts, ConnectOpts},
plugin::PluginConfig,
ManagerListener,
ServerAddr,
ManagerListener, ServerAddr,
};
use tokio::{sync::Mutex, task::JoinHandle};

3
crates/shadowsocks-service/src/server/tcprelay.rs
View File

@@ -13,8 +13,7 @@ use shadowsocks::{
crypto::CipherKind,
net::{AcceptOpts, TcpStream as OutboundTcpStream},
relay::tcprelay::{utils::copy_encrypted_bidirectional, ProxyServerStream},
ProxyListener,
ServerConfig,
ProxyListener, ServerConfig,
};
use tokio::{
io::{AsyncReadExt, AsyncWriteExt},

5
crates/shadowsocks-service/src/server/udprelay.rs
View File

@@ -29,10 +29,7 @@ use tokio::{runtime::Handle, sync::mpsc, task::JoinHandle, time};
use windows_sys::Win32::Networking::WinSock::WSAEAFNOSUPPORT;
use crate::net::{
packet_window::PacketWindowFilter,
utils::to_ipv4_mapped,
MonProxySocket,
UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
packet_window::PacketWindowFilter, utils::to_ipv4_mapped, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
};

3
crates/shadowsocks/src/dns_resolver/hickory_dns_resolver.rs
View File

@@ -20,8 +20,7 @@ use hickory_resolver::{
udp::{DnsUdpSocket, QuicLocalAddr},
TokioTime,
},
AsyncResolver,
TokioHandle,
AsyncResolver, TokioHandle,
};
use log::trace;
use tokio::{io::ReadBuf, net::UdpSocket};

12
crates/shadowsocks/src/manager/client.rs
View File

@@ -8,16 +8,8 @@ use super::{
datagram::ManagerDatagram,
error::Error,
protocol::{
AddRequest,
AddResponse,
ListRequest,
ListResponse,
ManagerProtocol,
PingRequest,
PingResponse,
RemoveRequest,
RemoveResponse,
StatRequest,
AddRequest, AddResponse, ListRequest, ListResponse, ManagerProtocol, PingRequest, PingResponse, RemoveRequest,
RemoveResponse, StatRequest,
},
};

7
crates/shadowsocks/src/net/sys/unix/bsd/freebsd.rs
View File

@@ -1,6 +1,5 @@
use std::{
io,
mem,
io, mem,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
os::unix::io::{AsRawFd, RawFd},
pin::Pin,
@@ -21,9 +20,7 @@ use tokio_tfo::TfoStream;
use crate::net::{
sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
udp::{BatchRecvMessage, BatchSendMessage},
AcceptOpts,
AddrFamily,
ConnectOpts,
AcceptOpts, AddrFamily, ConnectOpts,
};
/// A `TcpStream` that supports TFO (TCP Fast Open)

4
crates/shadowsocks/src/net/sys/unix/bsd/macos.rs
View File

@@ -24,9 +24,7 @@ use tokio_tfo::TfoStream;
use crate::net::{
sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
udp::{BatchRecvMessage, BatchSendMessage},
AcceptOpts,
AddrFamily,
ConnectOpts,
AcceptOpts, AddrFamily, ConnectOpts,
};
/// A `TcpStream` that supports TFO (TCP Fast Open)

7
crates/shadowsocks/src/net/sys/unix/linux/mod.rs
View File

@@ -1,6 +1,5 @@
use std::{
io,
mem,
io, mem,
net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd},
pin::Pin,
@@ -22,9 +21,7 @@ use tokio_tfo::TfoStream;
use crate::net::{
sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, socket_bind_dual_stack},
udp::{BatchRecvMessage, BatchSendMessage},
AcceptOpts,
AddrFamily,
ConnectOpts,
AcceptOpts, AddrFamily, ConnectOpts,
};
/// A `TcpStream` that supports TFO (TCP Fast Open)

4
crates/shadowsocks/src/net/sys/unix/others.rs
View File

@@ -15,9 +15,7 @@ use tokio::{
use crate::net::{
sys::{set_common_sockopt_after_connect, set_common_sockopt_for_connect, ErrorKind},
AcceptOpts,
AddrFamily,
ConnectOpts,
AcceptOpts, AddrFamily, ConnectOpts,
};
/// A wrapper of `TcpStream`

36
crates/shadowsocks/src/net/sys/windows/mod.rs
View File

@@ -10,8 +10,7 @@ use std::{
io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket},
},
pin::Pin,
ptr,
slice,
ptr, slice,
task::{self, Poll},
time::{Duration, Instant},
};
@@ -30,32 +29,13 @@ use windows_sys::{
Win32::{
Foundation::{BOOL, ERROR_BUFFER_OVERFLOW, ERROR_NO_DATA, ERROR_SUCCESS},
NetworkManagement::IpHelper::{
if_nametoindex,
GetAdaptersAddresses,
GAA_FLAG_SKIP_ANYCAST,
GAA_FLAG_SKIP_DNS_SERVER,
GAA_FLAG_SKIP_MULTICAST,
GAA_FLAG_SKIP_UNICAST,
IP_ADAPTER_ADDRESSES_LH,
if_nametoindex, GetAdaptersAddresses, GAA_FLAG_SKIP_ANYCAST, GAA_FLAG_SKIP_DNS_SERVER,
GAA_FLAG_SKIP_MULTICAST, GAA_FLAG_SKIP_UNICAST, IP_ADAPTER_ADDRESSES_LH,
},
Networking::WinSock::{
htonl,
setsockopt,
WSAGetLastError,
WSAIoctl,
AF_UNSPEC,
IPPROTO_IP,
IPPROTO_IPV6,
IPPROTO_TCP,
IPV6_MTU_DISCOVER,
IPV6_UNICAST_IF,
IP_MTU_DISCOVER,
IP_PMTUDISC_DO,
IP_UNICAST_IF,
SIO_UDP_CONNRESET,
SOCKET,
SOCKET_ERROR,
TCP_FASTOPEN,
htonl, setsockopt, WSAGetLastError, WSAIoctl, AF_UNSPEC, IPPROTO_IP, IPPROTO_IPV6, IPPROTO_TCP,
IPV6_MTU_DISCOVER, IPV6_UNICAST_IF, IP_MTU_DISCOVER, IP_PMTUDISC_DO, IP_UNICAST_IF, SIO_UDP_CONNRESET,
SOCKET, SOCKET_ERROR, TCP_FASTOPEN,
},
},
};
@@ -66,9 +46,7 @@ const FALSE: BOOL = 0;
use crate::net::{
is_dual_stack_addr,
sys::{set_common_sockopt_for_connect, socket_bind_dual_stack},
AcceptOpts,
AddrFamily,
ConnectOpts,
AcceptOpts, AddrFamily, ConnectOpts,
};
/// A `TcpStream` that supports TFO (TCP Fast Open)

8
crates/shadowsocks/src/net/tcp.rs
View File

@@ -24,14 +24,10 @@ use crate::{context::Context, relay::socks5::Address, ServerAddr};
use super::{
is_dual_stack_addr,
sys::{
create_inbound_tcp_socket,
set_common_sockopt_after_accept,
set_tcp_fastopen,
socket_bind_dual_stack,
create_inbound_tcp_socket, set_common_sockopt_after_accept, set_tcp_fastopen, socket_bind_dual_stack,
TcpStream as SysTcpStream,
},
AcceptOpts,
ConnectOpts,
AcceptOpts, ConnectOpts,
};
/// TcpStream for outbound connections

4
crates/shadowsocks/src/net/udp.rs
View File

@@ -39,9 +39,7 @@ use crate::{context::Context, relay::socks5::Address, ServerAddr};
use super::{
sys::{bind_outbound_udp_socket, create_inbound_udp_socket, create_outbound_udp_socket},
AcceptOpts,
AddrFamily,
ConnectOpts,
AcceptOpts, AddrFamily, ConnectOpts,
};
/// Message struct for `batch_send`

5
crates/shadowsocks/src/relay/socks5.rs
View File

@@ -16,10 +16,7 @@ use bytes::{Buf, BufMut, BytesMut};
use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
pub use self::consts::{
SOCKS5_AUTH_METHOD_GSSAPI,
SOCKS5_AUTH_METHOD_NONE,
SOCKS5_AUTH_METHOD_NOT_ACCEPTABLE,
SOCKS5_AUTH_METHOD_PASSWORD,
SOCKS5_AUTH_METHOD_GSSAPI, SOCKS5_AUTH_METHOD_NONE, SOCKS5_AUTH_METHOD_NOT_ACCEPTABLE, SOCKS5_AUTH_METHOD_PASSWORD,
};
#[rustfmt::skip]

4
crates/shadowsocks/src/relay/tcprelay/aead_2022.rs
View File

@@ -55,9 +55,7 @@ use std::{
use aes::{
cipher::{BlockDecrypt, BlockEncrypt, KeyInit},
Aes128,
Aes256,
Block,
Aes128, Aes256, Block,
};
use byte_string::ByteStr;
use bytes::{Buf, BufMut, Bytes, BytesMut};

4
crates/shadowsocks/src/relay/udprelay/aead_2022.rs
View File

@@ -58,9 +58,7 @@ use std::{
use aes::{
cipher::{BlockDecrypt, BlockEncrypt, KeyInit},
Aes128,
Aes256,
Block,
Aes128, Aes256, Block,
};
use byte_string::ByteStr;
use bytes::{Buf, BufMut, Bytes, BytesMut};

4
crates/shadowsocks/src/relay/udprelay/crypto_io.rs
View File

@@ -32,9 +32,7 @@ use crate::{
#[cfg(feature = "aead-cipher-2022")]
use super::aead_2022::{
decrypt_client_payload_aead_2022,
decrypt_server_payload_aead_2022,
encrypt_client_payload_aead_2022,
decrypt_client_payload_aead_2022, decrypt_server_payload_aead_2022, encrypt_client_payload_aead_2022,
encrypt_server_payload_aead_2022,
};
#[cfg(feature = "stream-cipher")]

6
crates/shadowsocks/src/relay/udprelay/proxy_socket.rs
View File

@@ -23,11 +23,7 @@ use crate::{
};
use super::crypto_io::{
decrypt_client_payload,
decrypt_server_payload,
encrypt_client_payload,
encrypt_server_payload,
ProtocolError,
decrypt_client_payload, decrypt_server_payload, encrypt_client_payload, encrypt_server_payload, ProtocolError,
ProtocolResult,
};

3
crates/shadowsocks/tests/tcp.rs
View File

@@ -24,8 +24,7 @@ use shadowsocks::{
utils::{copy_from_encrypted, copy_to_encrypted},
},
},
ProxyClientStream,
ProxyListener,
ProxyClientStream, ProxyListener,
};
async fn handle_tcp_tunnel_server_client(

4
crates/shadowsocks/tests/tcp_tfo.rs
View File

@@ -21,9 +21,7 @@ use shadowsocks::{
socks5::Address,
tcprelay::utils::{copy_from_encrypted, copy_to_encrypted},
},
ProxyClientStream,
ProxyListener,
ServerConfig,
ProxyClientStream, ProxyListener, ServerConfig,
};
use tokio::{
io::{AsyncBufReadExt, AsyncWriteExt, BufReader},

2
rustfmt.toml
View File

@@ -15,4 +15,4 @@ use_try_shorthand = true
reorder_impl_items = true
#use_small_heuristics = "Max"
imports_layout = "HorizontalVertical"
imports_granularity = "Crate"
#imports_granularity = "Crate"

10
src/service/local.rs
View File

@@ -24,12 +24,7 @@ use shadowsocks_service::shadowsocks::relay::socks5::Address;
use shadowsocks_service::{
acl::AccessControl,
config::{
read_variable_field_value,
Config,
ConfigType,
LocalConfig,
LocalInstanceConfig,
ProtocolType,
read_variable_field_value, Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType,
ServerInstanceConfig,
},
local::{loadbalancing::PingBalancer, Server},
@@ -44,8 +39,7 @@ use shadowsocks_service::{
use crate::logging;
use crate::{
config::{Config as ServiceConfig, RuntimeMode},
monitor,
vparser,
monitor, vparser,
};
#[cfg(feature = "local-dns")]

3
src/service/manager.rs
View File

@@ -27,8 +27,7 @@ use shadowsocks_service::{
use crate::logging;
use crate::{
config::{Config as ServiceConfig, RuntimeMode},
monitor,
vparser,
monitor, vparser,
};
/// Defines command line options

3
src/service/server.rs
View File

@@ -25,8 +25,7 @@ use shadowsocks_service::{
use crate::logging;
use crate::{
config::{Config as ServiceConfig, RuntimeMode},
monitor,
vparser,
monitor, vparser,
};
/// Defines command line options

3
tests/dns.rs
View File

@@ -11,8 +11,7 @@ use tokio::{
use shadowsocks_service::{
config::{Config, ConfigType},
run_local,
run_server,
run_local, run_server,
};
#[tokio::test]

3
tests/http.rs
View File

@@ -10,8 +10,7 @@ use tokio::{
use shadowsocks_service::{
config::{Config, ConfigType},
run_local,
run_server,
run_local, run_server,
};
#[tokio::test]

3
tests/socks4.rs
View File

@@ -13,8 +13,7 @@ use tokio::{
use shadowsocks_service::{
config::{Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType, ServerInstanceConfig},
local::socks::client::Socks4TcpClient,
run_local,
run_server,
run_local, run_server,
shadowsocks::{
config::{ServerAddr, ServerConfig},
crypto::CipherKind,

3
tests/socks5.rs
View File

@@ -13,8 +13,7 @@ use tokio::{
use shadowsocks_service::{
config::{Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType, ServerInstanceConfig},
local::socks::client::socks5::Socks5TcpClient,
run_local,
run_server,
run_local, run_server,
shadowsocks::{
config::{Mode, ServerAddr, ServerConfig},
crypto::CipherKind,

3
tests/tunnel.rs
View File

@@ -11,8 +11,7 @@ use tokio::{
use shadowsocks_service::{
config::{Config, ConfigType},
run_local,
run_server,
run_local, run_server,
};
fn random_local_tcp_port() -> u16 {

3
tests/udp.rs
View File

@@ -9,8 +9,7 @@ use tokio::time::{self, Duration};
use shadowsocks_service::{
config::{Config, ConfigType, LocalConfig, LocalInstanceConfig, ProtocolType, ServerInstanceConfig},
local::socks::client::socks5::Socks5UdpClient,
run_local,
run_server,
run_local, run_server,
shadowsocks::{config::Mode, crypto::CipherKind, relay::socks5::Address, ServerConfig},
};