Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update shadowsocks-rust #3119

Merged
merged 5 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ jobs:
build:
working_directory: ~/code
docker:
- image: cimg/android:2022.12.1-ndk
- image: cimg/android:2023.08-ndk
environment:
GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process"
RUST_VERSION: 1.67.0
RUST_VERSION: 1.71.1
steps:
- checkout
- run: git submodule update --init --recursive
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Helpers.kt
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ fun Project.setupCore() {
setupCommon()
android.apply {
defaultConfig {
versionCode = 5030350
versionName = "5.3.3-nightly"
versionCode = 5030450
versionName = "5.3.4-nightly"
}
compileOptions.isCoreLibraryDesugaringEnabled = true
lint.apply {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/rust/shadowsocks-rust
Submodule shadowsocks-rust updated 82 files
+8 −0 .dockerignore
+6 −7 .github/workflows/build-and-test.yml
+5 −5 .github/workflows/build-docker-image.yml
+26 −32 .github/workflows/build-nightly-release.yml
+20 −23 .github/workflows/build-release.yml
+7 −11 .github/workflows/clippy-check.yml
+685 −629 Cargo.lock
+7 −7 Cargo.toml
+8 −7 Dockerfile
+62 −12 README.md
+14 −15 crates/shadowsocks-service/Cargo.toml
+3 −3 crates/shadowsocks-service/src/acl/mod.rs
+96 −44 crates/shadowsocks-service/src/config.rs
+35 −12 crates/shadowsocks-service/src/dns/mod.rs
+1 −1 crates/shadowsocks-service/src/lib.rs
+3 −3 crates/shadowsocks-service/src/local/dns/dns_resolver.rs
+4 −1 crates/shadowsocks-service/src/local/dns/mod.rs
+180 −42 crates/shadowsocks-service/src/local/dns/server.rs
+2 −2 crates/shadowsocks-service/src/local/http/dispatcher.rs
+4 −4 crates/shadowsocks-service/src/local/http/http_stream.rs
+1 −1 crates/shadowsocks-service/src/local/http/mod.rs
+66 −45 crates/shadowsocks-service/src/local/http/server.rs
+1 −3 crates/shadowsocks-service/src/local/loadbalancing/ping_balancer.rs
+396 −290 crates/shadowsocks-service/src/local/mod.rs
+2 −2 crates/shadowsocks-service/src/local/net/udp/association.rs
+1 −1 crates/shadowsocks-service/src/local/redir/mod.rs
+72 −31 crates/shadowsocks-service/src/local/redir/server.rs
+1 −1 crates/shadowsocks-service/src/local/redir/sys/unix/bsd_pf.rs
+70 −42 crates/shadowsocks-service/src/local/redir/tcprelay/mod.rs
+65 −33 crates/shadowsocks-service/src/local/redir/tcprelay/sys/unix/linux.rs
+25 −19 crates/shadowsocks-service/src/local/redir/udprelay/mod.rs
+2 −2 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/bsd.rs
+2 −2 crates/shadowsocks-service/src/local/redir/udprelay/sys/unix/linux.rs
+1 −1 crates/shadowsocks-service/src/local/socks/mod.rs
+77 −135 crates/shadowsocks-service/src/local/socks/server/mod.rs
+154 −0 crates/shadowsocks-service/src/local/socks/server/server.rs
+15 −18 crates/shadowsocks-service/src/local/socks/server/socks5/tcprelay.rs
+31 −18 crates/shadowsocks-service/src/local/socks/server/socks5/udprelay.rs
+5 −5 crates/shadowsocks-service/src/local/socks/socks4.rs
+12 −14 crates/shadowsocks-service/src/local/tun/mod.rs
+115 −48 crates/shadowsocks-service/src/local/tun/tcp.rs
+26 −4 crates/shadowsocks-service/src/local/tun/virt_device.rs
+1 −1 crates/shadowsocks-service/src/local/tunnel/mod.rs
+76 −20 crates/shadowsocks-service/src/local/tunnel/server.rs
+63 −36 crates/shadowsocks-service/src/local/tunnel/tcprelay.rs
+39 −25 crates/shadowsocks-service/src/local/tunnel/udprelay.rs
+1 −1 crates/shadowsocks-service/src/local/utils.rs
+16 −10 crates/shadowsocks-service/src/manager/mod.rs
+126 −62 crates/shadowsocks-service/src/manager/server.rs
+21 −14 crates/shadowsocks-service/src/server/mod.rs
+137 −90 crates/shadowsocks-service/src/server/server.rs
+41 −18 crates/shadowsocks-service/src/server/tcprelay.rs
+39 −22 crates/shadowsocks-service/src/server/udprelay.rs
+31 −13 crates/shadowsocks/Cargo.toml
+76 −30 crates/shadowsocks/src/config.rs
+50 −27 crates/shadowsocks/src/dns_resolver/resolver.rs
+104 −6 crates/shadowsocks/src/dns_resolver/trust_dns_resolver.rs
+2 −0 crates/shadowsocks/src/manager/protocol.rs
+8 −0 crates/shadowsocks/src/net/option.rs
+24 −8 crates/shadowsocks/src/net/sys/unix/bsd/freebsd.rs
+136 −22 crates/shadowsocks/src/net/sys/unix/bsd/macos.rs
+55 −8 crates/shadowsocks/src/net/sys/unix/linux/mod.rs
+63 −24 crates/shadowsocks/src/net/sys/unix/mod.rs
+19 −2 crates/shadowsocks/src/net/sys/unix/others.rs
+233 −63 crates/shadowsocks/src/net/sys/windows/mod.rs
+12 −101 crates/shadowsocks/src/net/tcp.rs
+20 −6 crates/shadowsocks/src/net/udp.rs
+23 −10 crates/shadowsocks/src/plugin/mod.rs
+5 −8 crates/shadowsocks/src/relay/socks5.rs
+1 −1 crates/shadowsocks/src/relay/tcprelay/proxy_listener.rs
+3 −3 crates/shadowsocks/src/relay/tcprelay/proxy_stream/client.rs
+99 −14 crates/shadowsocks/src/relay/tcprelay/utils.rs
+1 −12 crates/shadowsocks/src/relay/udprelay/aead_2022.rs
+1 −1 crates/shadowsocks/src/relay/udprelay/mod.rs
+17 −3 crates/shadowsocks/src/relay/udprelay/proxy_socket.rs
+17 −0 debian/changelog
+2 −2 homebrew/shadowsocks-rust.rb
+2 −2 snap/snapcraft.yaml
+32 −31 src/config.rs
+19 −9 src/service/local.rs
+13 −2 src/service/manager.rs
+13 −2 src/service/server.rs