Skip to content

Commit

Permalink
Update shadowsocks-rust
Browse files Browse the repository at this point in the history
  • Loading branch information
@madeye
madeye committed Dec 30, 2020
1 parent 707c4e4 commit f6a8ea9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
environment:
GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process"
steps:
- run: rustup toolchain install nightly-2020-12-20
- run: rustup override set nightly-2020-12-20
- run: rustup toolchain install nightly-2020-12-17
- run: rustup override set nightly-2020-12-17
- run: rustup target install armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android
- checkout
- run: git submodule update --init --recursive
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/rust/shadowsocks-rust
Submodule shadowsocks-rust updated 57 files
+3 −4 .github/workflows/build-release.yml
+1 −0 .gitignore
+324 −136 Cargo.lock
+3 −4 Cargo.toml
+1 −0 README.md
+3 −14 bin/common/monitor/windows.rs
+0 −8 bin/common/validator/mod.rs
+21 −9 bin/sslocal.rs
+18 −0 bin/ssmanager.rs
+18 −0 bin/ssserver.rs
+25 −0 configs/log4rs.yaml
+11 −14 crates/shadowsocks-service/Cargo.toml
+94 −37 crates/shadowsocks-service/src/config.rs
+12 −0 crates/shadowsocks-service/src/lib.rs
+13 −1 crates/shadowsocks-service/src/local/context.rs
+2 −1 crates/shadowsocks-service/src/local/dns/client_cache.rs
+0 −67 crates/shadowsocks-service/src/local/dns/config.rs
+0 −220 crates/shadowsocks-service/src/local/dns/dns_resolver.rs
+0 −2 crates/shadowsocks-service/src/local/dns/mod.rs
+41 −74 crates/shadowsocks-service/src/local/dns/server.rs
+2 −1 crates/shadowsocks-service/src/local/dns/upstream.rs
+12 −5 crates/shadowsocks-service/src/local/http/http_stream.rs
+53 −29 crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
+2 −2 crates/shadowsocks-service/src/local/loadbalancing/server_stat.rs
+60 −28 crates/shadowsocks-service/src/local/mod.rs
+3 −1 crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs
+224 −117 crates/shadowsocks-service/src/local/redir/udprelay/mod.rs
+2 −1 crates/shadowsocks-service/src/local/socks/server/mod.rs
+223 −117 crates/shadowsocks-service/src/local/socks/server/socks5/udprelay.rs
+2 −1 crates/shadowsocks-service/src/local/tunnel/tcprelay.rs
+223 −66 crates/shadowsocks-service/src/local/tunnel/udprelay.rs
+17 −3 crates/shadowsocks-service/src/manager/mod.rs
+9 −5 crates/shadowsocks-service/src/manager/server.rs
+26 −7 crates/shadowsocks-service/src/server/mod.rs
+9 −9 crates/shadowsocks-service/src/server/server.rs
+16 −27 crates/shadowsocks-service/src/server/tcprelay.rs
+113 −87 crates/shadowsocks-service/src/server/udprelay.rs
+3 −3 crates/shadowsocks/Cargo.toml
+111 −46 crates/shadowsocks/src/dns_resolver/resolver.rs
+34 −38 crates/shadowsocks/src/dns_resolver/trust_dns_resolver.rs
+8 −9 crates/shadowsocks/src/manager/datagram.rs
+35 −2 crates/shadowsocks/src/net/mod.rs
+42 −0 crates/shadowsocks/src/net/option.rs
+106 −8 crates/shadowsocks/src/net/tcp.rs
+8 −8 crates/shadowsocks/src/net/udp.rs
+26 −10 crates/shadowsocks/src/relay/sys/unix/mod.rs
+38 −32 crates/shadowsocks/src/relay/sys/unix/uds.rs
+16 −10 crates/shadowsocks/src/relay/sys/windows/mod.rs
+3 −3 crates/shadowsocks/src/relay/tcprelay/aead.rs
+20 −3 crates/shadowsocks/src/relay/tcprelay/proxy_listener.rs
+1 −1 crates/shadowsocks/src/relay/tcprelay/stream.rs
+2 −0 rust-toolchain
+1 −1 tests/dns.rs
+5 −1 tests/http.rs
+1 −1 tests/socks4.rs
+1 −1 tests/socks5.rs
+1 −1 tests/tunnel.rs

0 comments on commit f6a8ea9

Please sign in to comment.