Skip to content

Commit 46c96ac

Browse files
AaronChen0zonyitoo
authored andcommitted
chore: fix typos
1 parent 80c1be0 commit 46c96ac

15 files changed

Lines changed: 30 additions & 30 deletions

File tree

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,17 +1026,17 @@ These Ciphers require `"password"` to be a Base64 string of key that have **exac
10261026

10271027
- For local servers (`sslocal`, `ssredir`, ...)
10281028
- Modes:
1029-
- `[bypass_all]` - ACL runs in `WhiteList` mode. Bypasses all addresses except those matched any rules.
1030-
- `[proxy_all]` - ACL runs in `BlackList` mode. Proxies all addresses except those matched any rules. (default)
1029+
- `[bypass_all]` - ACL runs in `WhiteList` mode. Bypasses all addresses except those matching any rules.
1030+
- `[proxy_all]` - ACL runs in `BlackList` mode. Proxies all addresses except those matching any rules. (default)
10311031
- Rules:
10321032
- `[bypass_list]` - Rules for connecting directly
10331033
- `[proxy_list]` - Rules for connecting through proxies
10341034
- For remote servers (`ssserver`)
10351035
- Modes:
1036-
- `[reject_all]` - ACL runs in `WhiteList` mode. Rejects all clients except those matched any rules.
1037-
- `[accept_all]` - ACL runs in `BlackList` mode. Accepts all clients except those matched any rules. (default)
1038-
- `[outbound_block_all]` - Outbound ACL runs in `WhiteList` mode. Blockes all outbound addresses except those matched any rules.
1039-
- `[outbound_allow_all]` - Outbound ACL runs in `BlackList` mode. Allows all outbound addresses except those matched any rules. (default)
1036+
- `[reject_all]` - ACL runs in `WhiteList` mode. Rejects all clients except those matching any rules.
1037+
- `[accept_all]` - ACL runs in `BlackList` mode. Accepts all clients except those matching any rules. (default)
1038+
- `[outbound_block_all]` - Outbound ACL runs in `WhiteList` mode. Blocks all outbound addresses except those matching any rules.
1039+
- `[outbound_allow_all]` - Outbound ACL runs in `BlackList` mode. Allows all outbound addresses except those matching any rules. (default)
10401040
- Rules:
10411041
- `[white_list]` - Rules for accepted clients
10421042
- `[black_list]` - Rules for rejected clients

bin/sswinservice.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use windows_service::{
2121

2222
const SERVICE_NAME: &str = "ssservice";
2323
const SERVICE_EXIT_CODE_ARGUMENT_ERROR: u32 = 100;
24-
const SERVICE_EXIT_CODE_EXITED_UNEXPECTLY: u32 = 101;
24+
const SERVICE_EXIT_CODE_EXITED_UNEXPECTEDLY: u32 = 101;
2525
const SERVICE_EXIT_CODE_CREATE_FAILED: u32 = 102;
2626

2727
#[inline]
@@ -84,7 +84,7 @@ where
8484
break true;
8585
}
8686
exit_code = main_fut => {
87-
info!("service exited unexpectly with code: {:?}", exit_code);
87+
info!("service exited unexpectedly with code: {:?}", exit_code);
8888
break false;
8989
}
9090
}
@@ -98,7 +98,7 @@ where
9898
if exited_by_ctrl {
9999
ServiceExitCode::Win32(0)
100100
} else {
101-
ServiceExitCode::ServiceSpecific(SERVICE_EXIT_CODE_EXITED_UNEXPECTLY)
101+
ServiceExitCode::ServiceSpecific(SERVICE_EXIT_CODE_EXITED_UNEXPECTEDLY)
102102
},
103103
Duration::default(),
104104
)?;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,8 @@ impl AccessControl {
619619
// If no domain name rules matched,
620620
// we need to resolve the hostname to IP addresses
621621

622-
// If mode is BlackList, host is allowed by default. If any of its' resolved IPs in outboud_block, then it is blocked.
623-
// If mode is WhiteList, host is blocked by default. If any of its' resolved IPs in outbound_allow, then it is allowed.
622+
// If mode is BlackList, host is allowed by default. If any of its resolved IPs is in outbound_block, then it is blocked.
623+
// If mode is WhiteList, host is blocked by default. If any of its resolved IPs is in outbound_allow, then it is allowed.
624624
let (check_rule, block_if_matched) = match self.outbound_mode {
625625
Mode::BlackList => (&self.outbound_block, true),
626626
Mode::WhiteList => (&self.outbound_allow, false),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ impl DnsClient {
883883
.map_err(From::from)
884884
}
885885
Mode::TcpAndUdp => {
886-
// Query TCP & UDP simutaneously
886+
// Query TCP & UDP simultaneously
887887

888888
let message2 = message.clone();
889889
let tcp_fut = async {
@@ -952,7 +952,7 @@ impl DnsClient {
952952
self.client_cache
953953
.lookup_local(ns, message.clone(), self.context.connect_opts_ref(), true);
954954
let tcp_query = async move {
955-
// Send TCP query after 500ms, because UDP will always return faster than TCP, there is no need to send queries simutaneously
955+
// Send TCP query after 500ms, because UDP will always return faster than TCP, there is no need to send queries simultaneously
956956
time::sleep(Duration::from_millis(500)).await;
957957

958958
self.client_cache

crates/shadowsocks-service/src/local/loadbalancing/server_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl Debug for ServerScore {
7777
}
7878
}
7979

80-
/// Identifer for a server
80+
/// Identifier for a server
8181
#[derive(Debug)]
8282
pub struct ServerIdent {
8383
tcp_score: ServerScore,

crates/shadowsocks-service/src/local/loadbalancing/server_stat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl ServerStat {
9090

9191
// Normalize stdev
9292
// let nstdev = self.data.latency_stdev / self.max_latency_stdev;
93-
// Mormalize mad
93+
// Normalize mad
9494
let nmad = self.data.latency_mad as f64 / self.max_server_rtt as f64;
9595

9696
const SCORE_RTT_WEIGHT: f64 = 1.0;

crates/shadowsocks-service/src/local/online_config/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl OnlineConfigService {
128128
}
129129
};
130130

131-
trace!("sever-loader task fetch response: {:?}", rsp);
131+
trace!("server-loader task fetch response: {:?}", rsp);
132132

133133
let fetch_time = Instant::now();
134134

crates/shadowsocks-service/src/local/redir/udprelay/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ impl RedirUdpServer {
260260
}
261261

262262
peer_addr_opt = keepalive_rx.recv() => {
263-
let peer_addr = peer_addr_opt.expect("keep-alive channel closed unexpectly");
263+
let peer_addr = peer_addr_opt.expect("keep-alive channel closed unexpectedly");
264264
manager.keep_alive(&peer_addr).await;
265265
}
266266

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ impl Socks5UdpServer {
167167
}
168168

169169
peer_addr_opt = keepalive_rx.recv() => {
170-
let peer_addr = peer_addr_opt.expect("keep-alive channel closed unexpectly");
170+
let peer_addr = peer_addr_opt.expect("keep-alive channel closed unexpectedly");
171171
manager.keep_alive(&peer_addr).await;
172172
}
173173

crates/shadowsocks-service/src/local/tunnel/tcprelay.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ async fn handle_tcp_client(
133133
let server = balancer.best_tcp_server();
134134
let svr_cfg = server.server_config();
135135
trace!(
136-
"establishing tcp tunnel {} <-> {} through sever {} (outbound: {})",
136+
"establishing tcp tunnel {} <-> {} through server {} (outbound: {})",
137137
peer_addr,
138138
forward_addr,
139139
svr_cfg.tcp_external_addr(),

0 commit comments

Comments
 (0)