From 6880c5892c934216aa527153b248f4c0dc1ff787 Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Tue, 1 Dec 2020 09:07:43 +0800 Subject: [PATCH] Renamed library back to shadowsocks - ref #326 - Binary crate will keep shadowsocks-rust's name --- Cargo.lock | 82 +++++++++---------- Cargo.toml | 28 +++---- bin/local.rs | 8 +- bin/logging/mod.rs | 8 +- bin/manager.rs | 2 +- bin/server.rs | 2 +- bin/ssurl.rs | 2 +- bin/validator/mod.rs | 4 +- {shadowsocks-core => shadowsocks}/Cargo.toml | 2 +- {shadowsocks-core => shadowsocks}/LICENSE | 0 {shadowsocks-core => shadowsocks}/README.md | 0 .../src/acl/mod.rs | 0 .../src/config.rs | 0 .../src/context.rs | 0 {shadowsocks-core => shadowsocks}/src/lib.rs | 0 .../src/plugin/mod.rs | 0 .../src/plugin/obfs_proxy.rs | 0 .../src/plugin/ss_plugin.rs | 0 .../src/relay/dns_resolver/mod.rs | 0 .../relay/dns_resolver/tokio_dns_resolver.rs | 0 .../relay/dns_resolver/trust_dns_resolver.rs | 0 .../src/relay/dnsrelay/mod.rs | 0 .../src/relay/dnsrelay/upstream.rs | 0 .../src/relay/flow.rs | 0 .../src/relay/loadbalancing/mod.rs | 0 .../src/relay/loadbalancing/server.rs | 0 .../src/relay/local.rs | 0 .../src/relay/manager.rs | 0 .../src/relay/mod.rs | 0 .../src/relay/redir/mod.rs | 0 .../src/relay/redir/sys/mod.rs | 0 .../src/relay/redir/sys/unix/bsd_pf.rs | 0 .../src/relay/redir/sys/unix/mod.rs | 0 .../src/relay/server.rs | 0 .../src/relay/socks4.rs | 0 .../src/relay/socks5.rs | 0 .../src/relay/sys/mod.rs | 0 .../src/relay/sys/unix/mod.rs | 0 .../src/relay/sys/unix/uds.rs | 0 .../src/relay/sys/windows/mod.rs | 0 .../src/relay/tcprelay/aead.rs | 0 .../src/relay/tcprelay/client.rs | 0 .../src/relay/tcprelay/connection.rs | 0 .../src/relay/tcprelay/crypto_io.rs | 0 .../src/relay/tcprelay/http_local.rs | 0 .../src/relay/tcprelay/http_tls/mod.rs | 0 .../src/relay/tcprelay/http_tls/native_tls.rs | 0 .../src/relay/tcprelay/http_tls/rustls.rs | 0 .../src/relay/tcprelay/local.rs | 0 .../src/relay/tcprelay/mod.rs | 0 .../src/relay/tcprelay/monitor.rs | 0 .../src/relay/tcprelay/proxy_stream.rs | 0 .../src/relay/tcprelay/redir/mod.rs | 0 .../src/relay/tcprelay/redir/sys/mod.rs | 0 .../src/relay/tcprelay/redir/sys/unix/bsd.rs | 0 .../relay/tcprelay/redir/sys/unix/linux.rs | 0 .../src/relay/tcprelay/redir/sys/unix/mod.rs | 0 .../relay/tcprelay/redir/sys/windows/mod.rs | 0 .../src/relay/tcprelay/redir_local.rs | 0 .../src/relay/tcprelay/server.rs | 0 .../src/relay/tcprelay/socks4_local.rs | 0 .../src/relay/tcprelay/socks5_local.rs | 0 .../src/relay/tcprelay/stream.rs | 0 .../src/relay/tcprelay/tunnel_local.rs | 0 .../src/relay/tcprelay/utils.rs | 0 .../src/relay/udprelay/association.rs | 0 .../src/relay/udprelay/client.rs | 0 .../src/relay/udprelay/crypto_io.rs | 0 .../src/relay/udprelay/local.rs | 0 .../src/relay/udprelay/mod.rs | 0 .../src/relay/udprelay/redir/mod.rs | 0 .../src/relay/udprelay/redir/sys/mod.rs | 0 .../src/relay/udprelay/redir/sys/unix/bsd.rs | 0 .../relay/udprelay/redir/sys/unix/linux.rs | 0 .../relay/udprelay/redir/sys/unix/macos.rs | 0 .../src/relay/udprelay/redir/sys/unix/mod.rs | 0 .../udprelay/redir/sys/unix/not_supported.rs | 0 .../relay/udprelay/redir/sys/windows/mod.rs | 0 .../src/relay/udprelay/redir_local.rs | 0 .../src/relay/udprelay/server.rs | 0 .../src/relay/udprelay/socks5_local.rs | 0 .../src/relay/udprelay/tunnel_local.rs | 0 .../src/relay/udprelay/utils.rs | 0 .../src/relay/utils.rs | 0 tests/dns.rs | 2 +- tests/http.rs | 2 +- tests/socks4.rs | 2 +- tests/socks5.rs | 2 +- tests/tunnel.rs | 2 +- tests/udp.rs | 2 +- 90 files changed, 75 insertions(+), 75 deletions(-) rename {shadowsocks-core => shadowsocks}/Cargo.toml (99%) rename {shadowsocks-core => shadowsocks}/LICENSE (100%) rename {shadowsocks-core => shadowsocks}/README.md (100%) rename {shadowsocks-core => shadowsocks}/src/acl/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/config.rs (100%) rename {shadowsocks-core => shadowsocks}/src/context.rs (100%) rename {shadowsocks-core => shadowsocks}/src/lib.rs (100%) rename {shadowsocks-core => shadowsocks}/src/plugin/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/plugin/obfs_proxy.rs (100%) rename {shadowsocks-core => shadowsocks}/src/plugin/ss_plugin.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/dns_resolver/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/dns_resolver/tokio_dns_resolver.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/dns_resolver/trust_dns_resolver.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/dnsrelay/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/dnsrelay/upstream.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/flow.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/loadbalancing/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/loadbalancing/server.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/manager.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/redir/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/redir/sys/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/redir/sys/unix/bsd_pf.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/redir/sys/unix/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/server.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/socks4.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/socks5.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/sys/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/sys/unix/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/sys/unix/uds.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/sys/windows/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/aead.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/client.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/connection.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/crypto_io.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/http_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/http_tls/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/http_tls/native_tls.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/http_tls/rustls.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/monitor.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/proxy_stream.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/redir/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/redir/sys/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/redir/sys/unix/bsd.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/redir/sys/unix/linux.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/redir/sys/unix/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/redir/sys/windows/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/redir_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/server.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/socks4_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/socks5_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/stream.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/tunnel_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/tcprelay/utils.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/association.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/client.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/crypto_io.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/sys/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/sys/unix/bsd.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/sys/unix/linux.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/sys/unix/macos.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/sys/unix/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/sys/unix/not_supported.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir/sys/windows/mod.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/redir_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/server.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/socks5_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/tunnel_local.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/udprelay/utils.rs (100%) rename {shadowsocks-core => shadowsocks}/src/relay/utils.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 87f0ed32..896ead00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -582,7 +582,7 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "hyper" version = "0.14.0-dev" -source = "git+https://github.com/hyperium/hyper.git#1ba2a141a6f8736446ff4a0111df347c0dc66f6c" +source = "git+https://github.com/hyperium/hyper.git#21dea2114574bbeda41bad5dff5e8e3613352124" dependencies = [ "bytes 0.6.0", "futures-channel", @@ -688,9 +688,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8" +checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" dependencies = [ "wasm-bindgen", ] @@ -1435,27 +1435,6 @@ dependencies = [ [[package]] name = "shadowsocks" version = "1.9.0" -dependencies = [ - "byte_string", - "byteorder", - "cfg-if 1.0.0", - "clap", - "daemonize", - "env_logger", - "futures", - "jemallocator", - "log", - "log4rs", - "mimalloc", - "qrcode", - "shadowsocks-core", - "tcmalloc", - "tokio", -] - -[[package]] -name = "shadowsocks-core" -version = "1.9.0" dependencies = [ "async-trait", "base64", @@ -1511,6 +1490,27 @@ dependencies = [ "ring", ] +[[package]] +name = "shadowsocks-rust" +version = "1.9.0" +dependencies = [ + "byte_string", + "byteorder", + "cfg-if 1.0.0", + "clap", + "daemonize", + "env_logger", + "futures", + "jemallocator", + "log", + "log4rs", + "mimalloc", + "qrcode", + "shadowsocks", + "tcmalloc", + "tokio", +] + [[package]] name = "signal-hook-registry" version = "1.2.2" @@ -1588,9 +1588,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.52" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c1e438504729046a5cfae47f97c30d6d083c7d91d94603efdae3477fc070d4c" +checksum = "8833e20724c24de12bbaba5ad230ea61c3eafb05b881c7c9d3cfe8638b187e68" dependencies = [ "proc-macro2", "quote", @@ -1723,9 +1723,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfe2523e6fa84ddf5e688151d4e5fddc51678de9752c6512a24714c23818d61" +checksum = "a12a3eb39ee2c231be64487f1fcbe726c8f2514876a55480a5ab8559fc374252" dependencies = [ "autocfg", "bytes 0.6.0", @@ -2074,19 +2074,19 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" +checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68" +checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" dependencies = [ "bumpalo", "lazy_static", @@ -2099,9 +2099,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038" +checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2109,9 +2109,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" +checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" dependencies = [ "proc-macro2", "quote", @@ -2122,15 +2122,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.68" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" +checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" [[package]] name = "web-sys" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d" +checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index ad8717d6..5d51524e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "shadowsocks" +name = "shadowsocks-rust" version = "1.9.0" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." @@ -31,7 +31,7 @@ path = "bin/manager.rs" [workspace] members = [ - "shadowsocks-core" + "shadowsocks" ] [profile.release] @@ -51,27 +51,27 @@ default = [ # Uses single-threaded scheduler instead of default multi-threaded single-threaded = [] # Enables trust-dns for replacing tokio's builtin DNS resolver -trust-dns = ["shadowsocks-core/trust-dns"] -dns-over-tls = ["shadowsocks-core/dns-over-tls"] -dns-over-https = ["shadowsocks-core/dns-over-https"] +trust-dns = ["shadowsocks/trust-dns"] +dns-over-tls = ["shadowsocks/dns-over-tls"] +dns-over-https = ["shadowsocks/dns-over-https"] # Enable DNS-relay -local-dns = ["shadowsocks-core/local-dns"] +local-dns = ["shadowsocks/local-dns"] # Backward compatibility, DO NOT USE local-dns-relay = ["local-dns"] # Enable client flow statistic report # Currently is only used in Android -local-flow-stat = ["shadowsocks-core/local-flow-stat"] +local-flow-stat = ["shadowsocks/local-flow-stat"] # Enable HTTP protocol for sslocal -local-http = ["shadowsocks-core/local-http"] -local-http-native-tls = ["shadowsocks-core/local-http-native-tls"] -local-http-rustls = ["shadowsocks-core/local-http-rustls"] +local-http = ["shadowsocks/local-http"] +local-http-native-tls = ["shadowsocks/local-http-native-tls"] +local-http-rustls = ["shadowsocks/local-http-rustls"] # Enable REDIR protocol for sslocal # (transparent proxy) -local-redir = ["shadowsocks-core/local-redir"] +local-redir = ["shadowsocks/local-redir"] # Enable tunnel protocol for sslocal -local-tunnel = ["shadowsocks-core/local-tunnel"] +local-tunnel = ["shadowsocks/local-tunnel"] # Enable SOCKS4/4a protocol for sslocal -local-socks4 = ["shadowsocks-core/local-socks4"] +local-socks4 = ["shadowsocks/local-socks4"] # Enable jemalloc for binaries jemalloc = ["jemallocator"] # Enable bundled tcmalloc @@ -92,7 +92,7 @@ mimalloc = { version = "0.1", optional = true } tcmalloc = { version = "0.3", optional = true } jemallocator = { version = "0.3", optional = true } -shadowsocks-core = { path = "shadowsocks-core" } +shadowsocks = { path = "shadowsocks" } [target.'cfg(unix)'.dependencies] daemonize = "0.4" diff --git a/bin/local.rs b/bin/local.rs index d16362df..decc3708 100644 --- a/bin/local.rs +++ b/bin/local.rs @@ -12,10 +12,10 @@ use log::info; use tokio::{self, runtime::Builder}; #[cfg(feature = "local-redir")] -use shadowsocks_core::config::RedirType; +use shadowsocks::config::RedirType; #[cfg(any(feature = "local-dns", feature = "local-tunnel"))] -use shadowsocks_core::relay::socks5::Address; -use shadowsocks_core::{ +use shadowsocks::relay::socks5::Address; +use shadowsocks::{ acl::AccessControl, crypto::v1::{available_ciphers, CipherKind}, plugin::PluginConfig, @@ -265,7 +265,7 @@ fn main() { #[cfg(feature = "local-dns")] { - use shadowsocks_core::config::LocalDnsAddr; + use shadowsocks::config::LocalDnsAddr; if let Some(local_dns_addr) = matches.value_of("LOCAL_DNS_ADDR") { let addr = local_dns_addr.parse::().expect("local dns address"); diff --git a/bin/logging/mod.rs b/bin/logging/mod.rs index 79d59e2e..f6425d00 100644 --- a/bin/logging/mod.rs +++ b/bin/logging/mod.rs @@ -45,22 +45,22 @@ pub fn init_with_config(bin_name: &str, matches: &ArgMatches) { 0 => logging_builder .logger(Logger::builder().build(bin_name, LevelFilter::Info)) .logger(Logger::builder().build("shadowsocks", LevelFilter::Info)) - .logger(Logger::builder().build("shadowsocks_core", LevelFilter::Info)) + .logger(Logger::builder().build("shadowsocks", LevelFilter::Info)) .build(Root::builder().appender("console").build(LevelFilter::Off)), 1 => logging_builder .logger(Logger::builder().build(bin_name, LevelFilter::Debug)) .logger(Logger::builder().build("shadowsocks", LevelFilter::Debug)) - .logger(Logger::builder().build("shadowsocks_core", LevelFilter::Debug)) + .logger(Logger::builder().build("shadowsocks", LevelFilter::Debug)) .build(Root::builder().appender("console").build(LevelFilter::Off)), 2 => logging_builder .logger(Logger::builder().build(bin_name, LevelFilter::Trace)) .logger(Logger::builder().build("shadowsocks", LevelFilter::Trace)) - .logger(Logger::builder().build("shadowsocks_core", LevelFilter::Trace)) + .logger(Logger::builder().build("shadowsocks", LevelFilter::Trace)) .build(Root::builder().appender("console").build(LevelFilter::Off)), 3 => logging_builder .logger(Logger::builder().build(bin_name, LevelFilter::Trace)) .logger(Logger::builder().build("shadowsocks", LevelFilter::Trace)) - .logger(Logger::builder().build("shadowsocks_core", LevelFilter::Trace)) + .logger(Logger::builder().build("shadowsocks", LevelFilter::Trace)) .build(Root::builder().appender("console").build(LevelFilter::Debug)), _ => logging_builder.build(Root::builder().appender("console").build(LevelFilter::Trace)), } diff --git a/bin/manager.rs b/bin/manager.rs index 191656d1..b4c3b63a 100644 --- a/bin/manager.rs +++ b/bin/manager.rs @@ -17,7 +17,7 @@ use futures::future::{self, Either}; use log::info; use tokio::{self, runtime::Builder}; -use shadowsocks_core::{ +use shadowsocks::{ acl::AccessControl, config::ManagerServerHost, crypto::v1::{available_ciphers, CipherKind}, diff --git a/bin/server.rs b/bin/server.rs index 20ee902b..80d639e1 100644 --- a/bin/server.rs +++ b/bin/server.rs @@ -17,7 +17,7 @@ use futures::future::{self, Either}; use log::info; use tokio::{self, runtime::Builder}; -use shadowsocks_core::{ +use shadowsocks::{ acl::AccessControl, crypto::v1::{available_ciphers, CipherKind}, plugin::PluginConfig, diff --git a/bin/ssurl.rs b/bin/ssurl.rs index d765e9c6..7955f9eb 100644 --- a/bin/ssurl.rs +++ b/bin/ssurl.rs @@ -6,7 +6,7 @@ use clap::clap_app; use qrcode::{types::Color, QrCode}; -use shadowsocks_core::config::{Config, ConfigType, ServerConfig}; +use shadowsocks::config::{Config, ConfigType, ServerConfig}; mod allocator; mod version; diff --git a/bin/validator/mod.rs b/bin/validator/mod.rs index b51dbe9a..e64b0318 100644 --- a/bin/validator/mod.rs +++ b/bin/validator/mod.rs @@ -5,8 +5,8 @@ use std::net::SocketAddr; #[cfg(feature = "local-dns")] -use shadowsocks_core::config::LocalDnsAddr; -use shadowsocks_core::{relay::socks5::Address, ManagerAddr, ServerAddr, ServerConfig}; +use shadowsocks::config::LocalDnsAddr; +use shadowsocks::{relay::socks5::Address, ManagerAddr, ServerAddr, ServerConfig}; macro_rules! validate_type { ($name:ident, $ty:ty, $help:expr) => { diff --git a/shadowsocks-core/Cargo.toml b/shadowsocks/Cargo.toml similarity index 99% rename from shadowsocks-core/Cargo.toml rename to shadowsocks/Cargo.toml index 317e863e..6b0eaab5 100644 --- a/shadowsocks-core/Cargo.toml +++ b/shadowsocks/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "shadowsocks-core" +name = "shadowsocks" version = "1.9.0" authors = ["Shadowsocks Contributors"] description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls." diff --git a/shadowsocks-core/LICENSE b/shadowsocks/LICENSE similarity index 100% rename from shadowsocks-core/LICENSE rename to shadowsocks/LICENSE diff --git a/shadowsocks-core/README.md b/shadowsocks/README.md similarity index 100% rename from shadowsocks-core/README.md rename to shadowsocks/README.md diff --git a/shadowsocks-core/src/acl/mod.rs b/shadowsocks/src/acl/mod.rs similarity index 100% rename from shadowsocks-core/src/acl/mod.rs rename to shadowsocks/src/acl/mod.rs diff --git a/shadowsocks-core/src/config.rs b/shadowsocks/src/config.rs similarity index 100% rename from shadowsocks-core/src/config.rs rename to shadowsocks/src/config.rs diff --git a/shadowsocks-core/src/context.rs b/shadowsocks/src/context.rs similarity index 100% rename from shadowsocks-core/src/context.rs rename to shadowsocks/src/context.rs diff --git a/shadowsocks-core/src/lib.rs b/shadowsocks/src/lib.rs similarity index 100% rename from shadowsocks-core/src/lib.rs rename to shadowsocks/src/lib.rs diff --git a/shadowsocks-core/src/plugin/mod.rs b/shadowsocks/src/plugin/mod.rs similarity index 100% rename from shadowsocks-core/src/plugin/mod.rs rename to shadowsocks/src/plugin/mod.rs diff --git a/shadowsocks-core/src/plugin/obfs_proxy.rs b/shadowsocks/src/plugin/obfs_proxy.rs similarity index 100% rename from shadowsocks-core/src/plugin/obfs_proxy.rs rename to shadowsocks/src/plugin/obfs_proxy.rs diff --git a/shadowsocks-core/src/plugin/ss_plugin.rs b/shadowsocks/src/plugin/ss_plugin.rs similarity index 100% rename from shadowsocks-core/src/plugin/ss_plugin.rs rename to shadowsocks/src/plugin/ss_plugin.rs diff --git a/shadowsocks-core/src/relay/dns_resolver/mod.rs b/shadowsocks/src/relay/dns_resolver/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/dns_resolver/mod.rs rename to shadowsocks/src/relay/dns_resolver/mod.rs diff --git a/shadowsocks-core/src/relay/dns_resolver/tokio_dns_resolver.rs b/shadowsocks/src/relay/dns_resolver/tokio_dns_resolver.rs similarity index 100% rename from shadowsocks-core/src/relay/dns_resolver/tokio_dns_resolver.rs rename to shadowsocks/src/relay/dns_resolver/tokio_dns_resolver.rs diff --git a/shadowsocks-core/src/relay/dns_resolver/trust_dns_resolver.rs b/shadowsocks/src/relay/dns_resolver/trust_dns_resolver.rs similarity index 100% rename from shadowsocks-core/src/relay/dns_resolver/trust_dns_resolver.rs rename to shadowsocks/src/relay/dns_resolver/trust_dns_resolver.rs diff --git a/shadowsocks-core/src/relay/dnsrelay/mod.rs b/shadowsocks/src/relay/dnsrelay/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/dnsrelay/mod.rs rename to shadowsocks/src/relay/dnsrelay/mod.rs diff --git a/shadowsocks-core/src/relay/dnsrelay/upstream.rs b/shadowsocks/src/relay/dnsrelay/upstream.rs similarity index 100% rename from shadowsocks-core/src/relay/dnsrelay/upstream.rs rename to shadowsocks/src/relay/dnsrelay/upstream.rs diff --git a/shadowsocks-core/src/relay/flow.rs b/shadowsocks/src/relay/flow.rs similarity index 100% rename from shadowsocks-core/src/relay/flow.rs rename to shadowsocks/src/relay/flow.rs diff --git a/shadowsocks-core/src/relay/loadbalancing/mod.rs b/shadowsocks/src/relay/loadbalancing/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/loadbalancing/mod.rs rename to shadowsocks/src/relay/loadbalancing/mod.rs diff --git a/shadowsocks-core/src/relay/loadbalancing/server.rs b/shadowsocks/src/relay/loadbalancing/server.rs similarity index 100% rename from shadowsocks-core/src/relay/loadbalancing/server.rs rename to shadowsocks/src/relay/loadbalancing/server.rs diff --git a/shadowsocks-core/src/relay/local.rs b/shadowsocks/src/relay/local.rs similarity index 100% rename from shadowsocks-core/src/relay/local.rs rename to shadowsocks/src/relay/local.rs diff --git a/shadowsocks-core/src/relay/manager.rs b/shadowsocks/src/relay/manager.rs similarity index 100% rename from shadowsocks-core/src/relay/manager.rs rename to shadowsocks/src/relay/manager.rs diff --git a/shadowsocks-core/src/relay/mod.rs b/shadowsocks/src/relay/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/mod.rs rename to shadowsocks/src/relay/mod.rs diff --git a/shadowsocks-core/src/relay/redir/mod.rs b/shadowsocks/src/relay/redir/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/redir/mod.rs rename to shadowsocks/src/relay/redir/mod.rs diff --git a/shadowsocks-core/src/relay/redir/sys/mod.rs b/shadowsocks/src/relay/redir/sys/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/redir/sys/mod.rs rename to shadowsocks/src/relay/redir/sys/mod.rs diff --git a/shadowsocks-core/src/relay/redir/sys/unix/bsd_pf.rs b/shadowsocks/src/relay/redir/sys/unix/bsd_pf.rs similarity index 100% rename from shadowsocks-core/src/relay/redir/sys/unix/bsd_pf.rs rename to shadowsocks/src/relay/redir/sys/unix/bsd_pf.rs diff --git a/shadowsocks-core/src/relay/redir/sys/unix/mod.rs b/shadowsocks/src/relay/redir/sys/unix/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/redir/sys/unix/mod.rs rename to shadowsocks/src/relay/redir/sys/unix/mod.rs diff --git a/shadowsocks-core/src/relay/server.rs b/shadowsocks/src/relay/server.rs similarity index 100% rename from shadowsocks-core/src/relay/server.rs rename to shadowsocks/src/relay/server.rs diff --git a/shadowsocks-core/src/relay/socks4.rs b/shadowsocks/src/relay/socks4.rs similarity index 100% rename from shadowsocks-core/src/relay/socks4.rs rename to shadowsocks/src/relay/socks4.rs diff --git a/shadowsocks-core/src/relay/socks5.rs b/shadowsocks/src/relay/socks5.rs similarity index 100% rename from shadowsocks-core/src/relay/socks5.rs rename to shadowsocks/src/relay/socks5.rs diff --git a/shadowsocks-core/src/relay/sys/mod.rs b/shadowsocks/src/relay/sys/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/sys/mod.rs rename to shadowsocks/src/relay/sys/mod.rs diff --git a/shadowsocks-core/src/relay/sys/unix/mod.rs b/shadowsocks/src/relay/sys/unix/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/sys/unix/mod.rs rename to shadowsocks/src/relay/sys/unix/mod.rs diff --git a/shadowsocks-core/src/relay/sys/unix/uds.rs b/shadowsocks/src/relay/sys/unix/uds.rs similarity index 100% rename from shadowsocks-core/src/relay/sys/unix/uds.rs rename to shadowsocks/src/relay/sys/unix/uds.rs diff --git a/shadowsocks-core/src/relay/sys/windows/mod.rs b/shadowsocks/src/relay/sys/windows/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/sys/windows/mod.rs rename to shadowsocks/src/relay/sys/windows/mod.rs diff --git a/shadowsocks-core/src/relay/tcprelay/aead.rs b/shadowsocks/src/relay/tcprelay/aead.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/aead.rs rename to shadowsocks/src/relay/tcprelay/aead.rs diff --git a/shadowsocks-core/src/relay/tcprelay/client.rs b/shadowsocks/src/relay/tcprelay/client.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/client.rs rename to shadowsocks/src/relay/tcprelay/client.rs diff --git a/shadowsocks-core/src/relay/tcprelay/connection.rs b/shadowsocks/src/relay/tcprelay/connection.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/connection.rs rename to shadowsocks/src/relay/tcprelay/connection.rs diff --git a/shadowsocks-core/src/relay/tcprelay/crypto_io.rs b/shadowsocks/src/relay/tcprelay/crypto_io.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/crypto_io.rs rename to shadowsocks/src/relay/tcprelay/crypto_io.rs diff --git a/shadowsocks-core/src/relay/tcprelay/http_local.rs b/shadowsocks/src/relay/tcprelay/http_local.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/http_local.rs rename to shadowsocks/src/relay/tcprelay/http_local.rs diff --git a/shadowsocks-core/src/relay/tcprelay/http_tls/mod.rs b/shadowsocks/src/relay/tcprelay/http_tls/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/http_tls/mod.rs rename to shadowsocks/src/relay/tcprelay/http_tls/mod.rs diff --git a/shadowsocks-core/src/relay/tcprelay/http_tls/native_tls.rs b/shadowsocks/src/relay/tcprelay/http_tls/native_tls.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/http_tls/native_tls.rs rename to shadowsocks/src/relay/tcprelay/http_tls/native_tls.rs diff --git a/shadowsocks-core/src/relay/tcprelay/http_tls/rustls.rs b/shadowsocks/src/relay/tcprelay/http_tls/rustls.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/http_tls/rustls.rs rename to shadowsocks/src/relay/tcprelay/http_tls/rustls.rs diff --git a/shadowsocks-core/src/relay/tcprelay/local.rs b/shadowsocks/src/relay/tcprelay/local.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/local.rs rename to shadowsocks/src/relay/tcprelay/local.rs diff --git a/shadowsocks-core/src/relay/tcprelay/mod.rs b/shadowsocks/src/relay/tcprelay/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/mod.rs rename to shadowsocks/src/relay/tcprelay/mod.rs diff --git a/shadowsocks-core/src/relay/tcprelay/monitor.rs b/shadowsocks/src/relay/tcprelay/monitor.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/monitor.rs rename to shadowsocks/src/relay/tcprelay/monitor.rs diff --git a/shadowsocks-core/src/relay/tcprelay/proxy_stream.rs b/shadowsocks/src/relay/tcprelay/proxy_stream.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/proxy_stream.rs rename to shadowsocks/src/relay/tcprelay/proxy_stream.rs diff --git a/shadowsocks-core/src/relay/tcprelay/redir/mod.rs b/shadowsocks/src/relay/tcprelay/redir/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/redir/mod.rs rename to shadowsocks/src/relay/tcprelay/redir/mod.rs diff --git a/shadowsocks-core/src/relay/tcprelay/redir/sys/mod.rs b/shadowsocks/src/relay/tcprelay/redir/sys/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/redir/sys/mod.rs rename to shadowsocks/src/relay/tcprelay/redir/sys/mod.rs diff --git a/shadowsocks-core/src/relay/tcprelay/redir/sys/unix/bsd.rs b/shadowsocks/src/relay/tcprelay/redir/sys/unix/bsd.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/redir/sys/unix/bsd.rs rename to shadowsocks/src/relay/tcprelay/redir/sys/unix/bsd.rs diff --git a/shadowsocks-core/src/relay/tcprelay/redir/sys/unix/linux.rs b/shadowsocks/src/relay/tcprelay/redir/sys/unix/linux.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/redir/sys/unix/linux.rs rename to shadowsocks/src/relay/tcprelay/redir/sys/unix/linux.rs diff --git a/shadowsocks-core/src/relay/tcprelay/redir/sys/unix/mod.rs b/shadowsocks/src/relay/tcprelay/redir/sys/unix/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/redir/sys/unix/mod.rs rename to shadowsocks/src/relay/tcprelay/redir/sys/unix/mod.rs diff --git a/shadowsocks-core/src/relay/tcprelay/redir/sys/windows/mod.rs b/shadowsocks/src/relay/tcprelay/redir/sys/windows/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/redir/sys/windows/mod.rs rename to shadowsocks/src/relay/tcprelay/redir/sys/windows/mod.rs diff --git a/shadowsocks-core/src/relay/tcprelay/redir_local.rs b/shadowsocks/src/relay/tcprelay/redir_local.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/redir_local.rs rename to shadowsocks/src/relay/tcprelay/redir_local.rs diff --git a/shadowsocks-core/src/relay/tcprelay/server.rs b/shadowsocks/src/relay/tcprelay/server.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/server.rs rename to shadowsocks/src/relay/tcprelay/server.rs diff --git a/shadowsocks-core/src/relay/tcprelay/socks4_local.rs b/shadowsocks/src/relay/tcprelay/socks4_local.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/socks4_local.rs rename to shadowsocks/src/relay/tcprelay/socks4_local.rs diff --git a/shadowsocks-core/src/relay/tcprelay/socks5_local.rs b/shadowsocks/src/relay/tcprelay/socks5_local.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/socks5_local.rs rename to shadowsocks/src/relay/tcprelay/socks5_local.rs diff --git a/shadowsocks-core/src/relay/tcprelay/stream.rs b/shadowsocks/src/relay/tcprelay/stream.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/stream.rs rename to shadowsocks/src/relay/tcprelay/stream.rs diff --git a/shadowsocks-core/src/relay/tcprelay/tunnel_local.rs b/shadowsocks/src/relay/tcprelay/tunnel_local.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/tunnel_local.rs rename to shadowsocks/src/relay/tcprelay/tunnel_local.rs diff --git a/shadowsocks-core/src/relay/tcprelay/utils.rs b/shadowsocks/src/relay/tcprelay/utils.rs similarity index 100% rename from shadowsocks-core/src/relay/tcprelay/utils.rs rename to shadowsocks/src/relay/tcprelay/utils.rs diff --git a/shadowsocks-core/src/relay/udprelay/association.rs b/shadowsocks/src/relay/udprelay/association.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/association.rs rename to shadowsocks/src/relay/udprelay/association.rs diff --git a/shadowsocks-core/src/relay/udprelay/client.rs b/shadowsocks/src/relay/udprelay/client.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/client.rs rename to shadowsocks/src/relay/udprelay/client.rs diff --git a/shadowsocks-core/src/relay/udprelay/crypto_io.rs b/shadowsocks/src/relay/udprelay/crypto_io.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/crypto_io.rs rename to shadowsocks/src/relay/udprelay/crypto_io.rs diff --git a/shadowsocks-core/src/relay/udprelay/local.rs b/shadowsocks/src/relay/udprelay/local.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/local.rs rename to shadowsocks/src/relay/udprelay/local.rs diff --git a/shadowsocks-core/src/relay/udprelay/mod.rs b/shadowsocks/src/relay/udprelay/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/mod.rs rename to shadowsocks/src/relay/udprelay/mod.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/mod.rs b/shadowsocks/src/relay/udprelay/redir/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/mod.rs rename to shadowsocks/src/relay/udprelay/redir/mod.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/sys/mod.rs b/shadowsocks/src/relay/udprelay/redir/sys/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/sys/mod.rs rename to shadowsocks/src/relay/udprelay/redir/sys/mod.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/sys/unix/bsd.rs b/shadowsocks/src/relay/udprelay/redir/sys/unix/bsd.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/sys/unix/bsd.rs rename to shadowsocks/src/relay/udprelay/redir/sys/unix/bsd.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/sys/unix/linux.rs b/shadowsocks/src/relay/udprelay/redir/sys/unix/linux.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/sys/unix/linux.rs rename to shadowsocks/src/relay/udprelay/redir/sys/unix/linux.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/sys/unix/macos.rs b/shadowsocks/src/relay/udprelay/redir/sys/unix/macos.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/sys/unix/macos.rs rename to shadowsocks/src/relay/udprelay/redir/sys/unix/macos.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/sys/unix/mod.rs b/shadowsocks/src/relay/udprelay/redir/sys/unix/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/sys/unix/mod.rs rename to shadowsocks/src/relay/udprelay/redir/sys/unix/mod.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/sys/unix/not_supported.rs b/shadowsocks/src/relay/udprelay/redir/sys/unix/not_supported.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/sys/unix/not_supported.rs rename to shadowsocks/src/relay/udprelay/redir/sys/unix/not_supported.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir/sys/windows/mod.rs b/shadowsocks/src/relay/udprelay/redir/sys/windows/mod.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir/sys/windows/mod.rs rename to shadowsocks/src/relay/udprelay/redir/sys/windows/mod.rs diff --git a/shadowsocks-core/src/relay/udprelay/redir_local.rs b/shadowsocks/src/relay/udprelay/redir_local.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/redir_local.rs rename to shadowsocks/src/relay/udprelay/redir_local.rs diff --git a/shadowsocks-core/src/relay/udprelay/server.rs b/shadowsocks/src/relay/udprelay/server.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/server.rs rename to shadowsocks/src/relay/udprelay/server.rs diff --git a/shadowsocks-core/src/relay/udprelay/socks5_local.rs b/shadowsocks/src/relay/udprelay/socks5_local.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/socks5_local.rs rename to shadowsocks/src/relay/udprelay/socks5_local.rs diff --git a/shadowsocks-core/src/relay/udprelay/tunnel_local.rs b/shadowsocks/src/relay/udprelay/tunnel_local.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/tunnel_local.rs rename to shadowsocks/src/relay/udprelay/tunnel_local.rs diff --git a/shadowsocks-core/src/relay/udprelay/utils.rs b/shadowsocks/src/relay/udprelay/utils.rs similarity index 100% rename from shadowsocks-core/src/relay/udprelay/utils.rs rename to shadowsocks/src/relay/udprelay/utils.rs diff --git a/shadowsocks-core/src/relay/utils.rs b/shadowsocks/src/relay/utils.rs similarity index 100% rename from shadowsocks-core/src/relay/utils.rs rename to shadowsocks/src/relay/utils.rs diff --git a/tests/dns.rs b/tests/dns.rs index 0e0fdcd0..e0c8b176 100644 --- a/tests/dns.rs +++ b/tests/dns.rs @@ -9,7 +9,7 @@ use tokio::{ time, }; -use shadowsocks_core::{ +use shadowsocks::{ config::{Config, ConfigType}, run_local, run_server, diff --git a/tests/http.rs b/tests/http.rs index dd643704..cb530603 100644 --- a/tests/http.rs +++ b/tests/http.rs @@ -4,7 +4,7 @@ use std::time::Duration; use tokio::{net::TcpStream, prelude::*, time}; -use shadowsocks_core::{ +use shadowsocks::{ config::{Config, ConfigType}, run_local, run_server, diff --git a/tests/socks4.rs b/tests/socks4.rs index d610915f..30dff1cd 100644 --- a/tests/socks4.rs +++ b/tests/socks4.rs @@ -11,7 +11,7 @@ use tokio::{ time::{self, Duration}, }; -use shadowsocks_core::{ +use shadowsocks::{ config::{Config, ConfigType, ServerAddr, ServerConfig}, crypto::v1::CipherKind, relay::socks4::{Address, Command, HandshakeRequest, HandshakeResponse, ResultCode}, diff --git a/tests/socks5.rs b/tests/socks5.rs index 405773e8..454dc1c9 100644 --- a/tests/socks5.rs +++ b/tests/socks5.rs @@ -8,7 +8,7 @@ use tokio::{ time::{self, Duration}, }; -use shadowsocks_core::{ +use shadowsocks::{ config::{Config, ConfigType, Mode, ServerAddr, ServerConfig}, crypto::v1::CipherKind, relay::{socks5::Address, tcprelay::client::Socks5Client}, diff --git a/tests/tunnel.rs b/tests/tunnel.rs index 786522a5..fae61752 100644 --- a/tests/tunnel.rs +++ b/tests/tunnel.rs @@ -10,7 +10,7 @@ use tokio::{ time::{self, Duration}, }; -use shadowsocks_core::{ +use shadowsocks::{ config::{Config, ConfigType}, relay::socks5::Address, run_local, diff --git a/tests/udp.rs b/tests/udp.rs index b41b3c53..fcd27284 100644 --- a/tests/udp.rs +++ b/tests/udp.rs @@ -5,7 +5,7 @@ use std::net::SocketAddr; use log::debug; use tokio::time::{self, Duration}; -use shadowsocks_core::{ +use shadowsocks::{ config::{Config, ConfigType, Mode, ServerConfig}, crypto::v1::CipherKind, relay::{socks5::Address, udprelay::client::Socks5Client},