Skip to content

Commit

Permalink
Fix #2562
Browse files Browse the repository at this point in the history
  • Loading branch information
@madeye
madeye committed Jul 16, 2020
1 parent a850a8b commit d2f60c5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/main/rust/shadowsocks-rust
Submodule shadowsocks-rust updated 55 files
+160 −91 .circleci/config.yml
+6 −6 .travis.yml
+508 −350 Cargo.lock
+14 −6 Cargo.toml
+19 −6 README.md
+65 −0 acl/genacl_proxy_gfw_bypass_china_ip.py
+1 −1 build-host-release
+1 −1 build/Dockerfile.aarch64-unknown-linux-gnu
+3 −0 build/Dockerfile.x86_64-unknown-linux-gnu
+11 −3 build/build-release
+33 −23 src/acl/mod.rs
+5 −0 src/bin/allocator/mod.rs
+75 −3 src/bin/local.rs
+29 −7 src/bin/manager.rs
+26 −5 src/bin/server.rs
+2 −0 src/bin/ssurl.rs
+1 −0 src/bin/validator/mod.rs
+145 −21 src/config.rs
+65 −37 src/context.rs
+4 −0 src/crypto/cipher.rs
+1 −1 src/lib.rs
+12 −8 src/plugin/ss_plugin.rs
+0 −36 src/relay/dns_resolver/mod.rs
+11 −0 src/relay/dns_resolver/tokio_dns_resolver.rs
+19 −19 src/relay/dns_resolver/trust_dns_resolver.rs
+90 −40 src/relay/dnsrelay/mod.rs
+22 −19 src/relay/dnsrelay/upstream.rs
+1 −1 src/relay/loadbalancing/server.rs
+15 −1 src/relay/local.rs
+67 −28 src/relay/manager.rs
+2 −0 src/relay/mod.rs
+3 −2 src/relay/server.rs
+375 −0 src/relay/socks4.rs
+15 −0 src/relay/tcprelay/aead.rs
+21 −0 src/relay/tcprelay/crypto_io.rs
+70 −25 src/relay/tcprelay/http_local.rs
+15 −0 src/relay/tcprelay/http_tls/mod.rs
+173 −0 src/relay/tcprelay/http_tls/native_tls.rs
+202 −0 src/relay/tcprelay/http_tls/rustls.rs
+8 −1 src/relay/tcprelay/local.rs
+7 −0 src/relay/tcprelay/mod.rs
+16 −18 src/relay/tcprelay/proxy_stream.rs
+4 −3 src/relay/tcprelay/redir_local.rs
+8 −7 src/relay/tcprelay/server.rs
+182 −0 src/relay/tcprelay/socks4_local.rs
+8 −7 src/relay/tcprelay/socks5_local.rs
+4 −3 src/relay/tcprelay/tunnel_local.rs
+483 −37 src/relay/udprelay/association.rs
+51 −32 src/relay/udprelay/client.rs
+11 −0 src/relay/udprelay/crypto_io.rs
+8 −1 src/relay/udprelay/local.rs
+29 −66 src/relay/udprelay/redir_local.rs
+34 −300 src/relay/udprelay/server.rs
+32 −71 src/relay/udprelay/socks5_local.rs
+31 −69 src/relay/udprelay/tunnel_local.rs

0 comments on commit d2f60c5

Please sign in to comment.