Skip to content

Commit f5b2c0f

Browse files
feat: introduce ContextTrait for general usage
1 parent 79ad390 commit f5b2c0f

File tree

43 files changed

+252
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+252
-77
lines changed

crates/shadowsocks-service/src/acl/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ use log::{trace, warn};
1919
use once_cell::sync::Lazy;
2020
use regex::bytes::{Regex, RegexBuilder, RegexSet, RegexSetBuilder};
2121

22-
use shadowsocks::{context::Context, relay::socks5::Address};
22+
use shadowsocks::{
23+
context::{Context, ContextTrait},
24+
relay::socks5::Address,
25+
};
2326

2427
use self::sub_domains_tree::SubDomainsTree;
2528

crates/shadowsocks-service/src/config.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,14 @@ use serde::{Deserialize, Serialize};
7070
use shadowsocks::relay::socks5::Address;
7171
use shadowsocks::{
7272
config::{
73-
ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerSource, ServerUser, ServerUserManager,
73+
ManagerAddr,
74+
Mode,
75+
ReplayAttackPolicy,
76+
ServerAddr,
77+
ServerConfig,
78+
ServerSource,
79+
ServerUser,
80+
ServerUserManager,
7481
ServerWeight,
7582
},
7683
crypto::CipherKind,

crates/shadowsocks-service/src/local/fake_dns/processor.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ use hickory_resolver::proto::{
66
op::{header::MessageType, response_code::ResponseCode, Header, Message, OpCode},
77
rr::{
88
rdata::{A, AAAA},
9-
DNSClass, RData, Record, RecordType,
9+
DNSClass,
10+
RData,
11+
Record,
12+
RecordType,
1013
},
1114
};
1215
use log::{debug, trace, warn};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ use hyper::{
1818
client::conn::{http1, http2},
1919
http::uri::Scheme,
2020
rt::{Sleep, Timer},
21-
Request, Response,
21+
Request,
22+
Response,
2223
};
2324
use log::{error, trace};
2425
use lru_time_cache::LruCache;

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ use hyper::{
88
body,
99
header::{self, HeaderValue},
1010
http::uri::{Authority, Scheme},
11-
HeaderMap, Method, Request, Response, StatusCode, Uri, Version,
11+
HeaderMap,
12+
Method,
13+
Request,
14+
Response,
15+
StatusCode,
16+
Uri,
17+
Version,
1218
};
1319
use log::{debug, error, trace};
1420
use shadowsocks::relay::Address;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ use tokio::{
1313
};
1414

1515
use crate::local::{
16-
context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
16+
context::ServiceContext,
17+
loadbalancing::PingBalancer,
18+
net::tcp::listener::create_standard_tcp_listener,
1719
};
1820

1921
use super::{http_client::HttpClient, http_service::HttpService, tokio_rt::TokioIo};

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ use std::{
99
use hyper::{
1010
header::{self, HeaderValue},
1111
http::uri::Authority,
12-
HeaderMap, Uri, Version,
12+
HeaderMap,
13+
Uri,
14+
Version,
1315
};
1416
use log::error;
1517
use shadowsocks::relay::socks5::Address;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ use shadowsocks::{
2828
use crate::{
2929
local::{context::ServiceContext, loadbalancing::PingBalancer},
3030
net::{
31-
packet_window::PacketWindowFilter, MonProxySocket, UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
31+
packet_window::PacketWindowFilter,
32+
MonProxySocket,
33+
UDP_ASSOCIATION_KEEP_ALIVE_CHANNEL_SIZE,
3234
UDP_ASSOCIATION_SEND_CHANNEL_SIZE,
3335
},
3436
};

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ use std::{
99
use log::trace;
1010
use pin_project::pin_project;
1111
use shadowsocks::relay::socks5::{
12-
self, Address, Command, Error, HandshakeRequest, HandshakeResponse, Reply, TcpRequestHeader, TcpResponseHeader,
12+
self,
13+
Address,
14+
Command,
15+
Error,
16+
HandshakeRequest,
17+
HandshakeResponse,
18+
Reply,
19+
TcpRequestHeader,
20+
TcpResponseHeader,
1321
};
1422
use tokio::{
1523
io::{AsyncRead, AsyncWrite, ReadBuf},

crates/shadowsocks-service/src/local/socks/server/server.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ use tokio::{net::TcpStream, time};
77
#[cfg(feature = "local-http")]
88
use crate::local::http::HttpConnectionHandler;
99
use crate::local::{
10-
context::ServiceContext, loadbalancing::PingBalancer, net::tcp::listener::create_standard_tcp_listener,
10+
context::ServiceContext,
11+
loadbalancing::PingBalancer,
12+
net::tcp::listener::create_standard_tcp_listener,
1113
socks::config::Socks5AuthConfig,
1214
};
1315

0 commit comments

Comments
 (0)