From 8d3aea283e11ec2a367d2b6d3f0b801a72b8ca2c Mon Sep 17 00:00:00 2001 From: xerik <> Date: Fri, 3 Apr 2020 14:27:55 +0200 Subject: [PATCH] upgrades --- Cargo.lock | 202 +++++++++++---------------- Cargo.toml | 5 +- asocks5/Cargo.toml | 4 +- asocks5/examples/server.rs | 40 ++---- asocks5/src/client/udp.rs | 3 +- asocks5/src/heads/command.rs | 3 +- asocks5/src/lib.rs | 2 - asocks5/src/socks.rs | 32 +++-- src/lib.rs | 2 +- src/relay/forwarding/tcp/copy/mod.rs | 2 +- src/relay/forwarding/tcp/mod.rs | 7 +- src/relay/listen/socks.rs | 28 ++-- src/resolver/client/socks/mod.rs | 18 ++- src/resolver/client/udp.rs | 2 +- src/resolver/dnsclient.rs | 2 +- src/resolver/lookup.rs | 10 +- src/resolver/serve/mod.rs | 2 +- 17 files changed, 171 insertions(+), 193 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 81a1ebb..3a740ec 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -35,10 +35,8 @@ dependencies = [ "futures-util-preview 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-net 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "trust-dns-resolver 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -95,6 +93,11 @@ dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "bytes" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "c2-chacha" version = "0.2.2" @@ -147,14 +150,6 @@ dependencies = [ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "crossbeam-channel" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "crossbeam-deque" version = "0.7.1" @@ -554,9 +549,10 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.19" +version = "0.6.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -576,7 +572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -674,22 +670,9 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "pin-project" -version = "0.4.2" +name = "pin-project-lite" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "pin-project-internal 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "pin-utils" @@ -703,12 +686,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "proc-macro-error" -version = "0.2.6" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-error-attr 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "proc-macro-error-attr" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "syn-mid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -716,7 +713,7 @@ name = "proc-macro-hack" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -731,7 +728,7 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.5" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -755,7 +752,7 @@ name = "quote" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -825,8 +822,8 @@ dependencies = [ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "radix_trie 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-net 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", "treebitmap 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -922,21 +919,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "structopt" -version = "0.3.3" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "structopt-derive 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "structopt-derive" -version = "0.3.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro-error 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -956,11 +954,21 @@ name = "syn" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "syn-mid" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "synstructure" version = "0.10.2" @@ -1013,7 +1021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1031,23 +1039,19 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.0-alpha.6" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-fs 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-macros 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-net 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-macros 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1095,17 +1099,9 @@ name = "tokio-executor" version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1118,19 +1114,6 @@ dependencies = [ "tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "tokio-fs" -version = "0.2.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "tokio-io" version = "0.1.12" @@ -1149,15 +1132,14 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pin-project 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-macros" -version = "0.2.0-alpha.6" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1167,16 +1149,11 @@ name = "tokio-net" version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1196,7 +1173,7 @@ dependencies = [ "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1221,7 +1198,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-sink-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1233,7 +1209,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1265,19 +1241,6 @@ dependencies = [ "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "tokio-timer" -version = "0.3.0-alpha.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-core-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "futures-util-preview 0.3.0-alpha.19 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "tokio-udp" version = "0.1.5" @@ -1286,7 +1249,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1302,7 +1265,7 @@ dependencies = [ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1465,6 +1428,11 @@ name = "version_check" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "version_check" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "wasi" version = "0.7.0" @@ -1557,13 +1525,13 @@ dependencies = [ "checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" +"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" "checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" "checksum chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e8493056968583b0193c1bb04d6f7684586f3726992d6c573261941a895dbd68" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" "checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" "checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" @@ -1612,7 +1580,7 @@ dependencies = [ "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" "checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" -"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" +"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" @@ -1625,14 +1593,14 @@ dependencies = [ "checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" "checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -"checksum pin-project 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3d9156ea5979ae30ecc0460cd848738daf24cfb89eb11a41e0c369ba1f0e6aeb" -"checksum pin-project-internal 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1a375fffcd7bf53d8302fb95c1e2f3e0a1a92bd57edcab796f26f9e527c2f3da" +"checksum pin-project-lite 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "237844750cfbb86f67afe27eee600dfbbcb6188d734139b534cbfbf4f96792ae" "checksum pin-utils 0.1.0-alpha.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" -"checksum proc-macro-error 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aeccfe4d5d8ea175d5f0e4a2ad0637e0f4121d63bd99d356fb1f39ab2e7c6097" +"checksum proc-macro-error 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" +"checksum proc-macro-error-attr 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" "checksum proc-macro-hack 0.5.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd45702f76d6d3c75a80564378ae228a85f0b59d2f3ed43c91b4a69eb2ebfc5" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90cf5f418035b98e655e9cdb225047638296b862b42411c4e45bb88d700f7fc0" +"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" @@ -1655,27 +1623,27 @@ dependencies = [ "checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum structopt 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4f66a4c0ddf7aee4677995697366de0749b0139057342eccbb609b12d0affc" -"checksum structopt-derive 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8fe0c13e476b4e21ff7f5c4ace3818b6d7bdc16897c31c73862471bc1663acae" +"checksum structopt 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "c8faa2719539bbe9d77869bfb15d4ee769f99525e707931452c97b693b3f159d" +"checksum structopt-derive 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3f88b8e18c69496aad6f9ddf4630dd7d585bcaf765786cb415b9aec2fe5a0430" "checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" "checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf" +"checksum syn-mid 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" "checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" "checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -"checksum tokio 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1f17f5d6ab0f35c1506678b28fb1798bdf74fcb737e9843c7b17b73e426eba38" +"checksum tokio 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ee5a0dd887e37d37390c13ff8ac830f992307fe30a1fff0ab8427af67211ba28" "checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" "checksum tokio-codec 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9f5d22fd1e84bd4045d28813491cb7d7caae34d45c80517c2213f09a85e8787a" "checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" "checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" "checksum tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9ee9ceecf69145923834ea73f32ba40c790fd877b74a7817dd0b089f1eb9c7c8" "checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" -"checksum tokio-fs 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bf85e16971e06e680c622e0c1b455be94b086275c5ddcd6d4a83a2bfbb83cda" "checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" "checksum tokio-io 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "112784d5543df30660b04a72ca423bfbd90e8bb32f94dcf610f15401218b22c5" -"checksum tokio-macros 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "86b616374bcdadd95974e1f0dfca07dc913f1163c53840c0d664aca35114964e" +"checksum tokio-macros 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" "checksum tokio-net 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a441682cd32f3559383112c4a7f372f5c9fa1950c5cf8c8dd05274a2ce8c2654" "checksum tokio-reactor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "c56391be9805bc80163151c0b9e5164ee64f4b0200962c346fea12773158f22d" "checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" @@ -1683,7 +1651,6 @@ dependencies = [ "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" "checksum tokio-threadpool 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2bd2c6a3885302581f4401c82af70d792bb9df1700e7437b0aeb4ada94d5388c" "checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" -"checksum tokio-timer 0.3.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b97c1587fe71018eb245a4a9daa13a5a3b681bbc1f7fdadfe24720e141472c13" "checksum tokio-udp 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f02298505547f73e60f568359ef0d016d5acd6e830ab9bc7c4a5b3403440121b" "checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" "checksum tracing 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c21ff9457accc293386c20e8f754d0b059e67e325edf2284f04230d125d7e5ff" @@ -1702,6 +1669,7 @@ dependencies = [ "checksum url 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" "checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d" "checksum widestring 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effc0e4ff8085673ea7b9b2e3c73f6bd4d118810c9009ed8f1e16bd96c331db6" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" diff --git a/Cargo.toml b/Cargo.toml index a5d8944..907029a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,8 +25,9 @@ net2 = "^0.2" tokio-io = "0.2.0-alpha.6" tokio-net = "0.2.0-alpha.6" radix_trie = "0.1.*" -structopt = "^0" +structopt = "0.3.12" treebitmap = "0.3.1" trust-dns = { version = "^0.17", default-features = false } futures-preview = { version = "0.3.0-alpha.16", features = ["compat"] } -tokio = "0.2.0-alpha.6" +tokio = { version = "0.2.16", features = ["io-util", "io-driver", "rt-threaded" , "sync", "time", "tcp", "udp"] } + diff --git a/asocks5/Cargo.toml b/asocks5/Cargo.toml index cabcefa..7c07d9e 100644 --- a/asocks5/Cargo.toml +++ b/asocks5/Cargo.toml @@ -10,11 +10,9 @@ bytes = "^0.4" failure = "0.1.1" log = "^0.4" net2 = "^0.2" -tokio-io = "0.2.0-alpha.6" -tokio-net = "0.2.0-alpha.6" futures-util-preview = "0.2.2" futures-preview = { version = "0.3.0-alpha.16", features = ["compat"] } -tokio = "0.2.0-alpha.6" +tokio = { version = "0.2.16", features = ["io-util", "io-driver", "macros", "rt-threaded" , "sync", "time", "tcp", "udp"] } [dev-dependencies] structopt = "*" diff --git a/asocks5/examples/server.rs b/asocks5/examples/server.rs index ca1ad37..7383d61 100644 --- a/asocks5/examples/server.rs +++ b/asocks5/examples/server.rs @@ -15,36 +15,24 @@ use futures::executor::LocalPool; use futures::task::SpawnExt; // the main function is actually no different from any ordinary tcp server -fn main() -> Result<(), Error> { +#[tokio::main] +async fn main() -> Result<(), Error> { println!("Async socks server"); let opt: Opt = Opt::from_args(); let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::LOCALHOST), opt.port); println!("listening on {:?}", addr); - let mut executor = LocalPool::new(); - let mut spawner = executor.spawner(); - executor.run_until(async move { - let listner = tokio::net::TcpListener::bind(&addr).await.unwrap(); - let _result = listner - .incoming() - .for_each(|s| { - match s { - Ok(s) => { - let peer = s.peer_addr().expect("socket peer address"); - println!("got tcp connection from {:?}", peer); - if let Err(e) = spawner.spawn(async move { - if let Err(e) = handle_client(s).await { - eprintln!("error handling client {}", e); - }; - }) { - eprintln!("spawn error {:?}", e); - } - } - Err(e) => eprintln!("listen error {}", e), - } - futures::future::ready(()) - }) - .await; - }); + + let mut listner = tokio::net::TcpListener::bind(&addr).await.unwrap(); + loop { + let (s, _) = listner.accept().await.unwrap(); + let peer = s.peer_addr().expect("socket peer address"); + println!("got tcp connection from {:?}", peer); + tokio::spawn(async move { + if let Err(e) = handle_client(s).await { + eprintln!("error handling client {}", e); + }; + }); + } Ok(()) } diff --git a/asocks5/src/client/udp.rs b/asocks5/src/client/udp.rs index 527bd25..1545f3d 100644 --- a/asocks5/src/client/udp.rs +++ b/asocks5/src/client/udp.rs @@ -13,7 +13,6 @@ use std::net::SocketAddrV4; use std::net::{self, SocketAddr}; use std::time::Duration; use tokio::net::{TcpStream, UdpSocket}; -use tokio_net::driver::Handle; #[derive(Debug)] pub struct Socks5Datagram { @@ -47,7 +46,7 @@ impl Socks5Datagram { } }; let socket = net::UdpSocket::bind(&local)?; - let socket = UdpSocket::from_std(socket, &Handle::default())?; + let socket = UdpSocket::from_std(socket)?; Ok(Socks5Datagram { socket, diff --git a/asocks5/src/heads/command.rs b/asocks5/src/heads/command.rs index 831863b..7ddf983 100644 --- a/asocks5/src/heads/command.rs +++ b/asocks5/src/heads/command.rs @@ -10,8 +10,7 @@ use crate::socks::TcpRequestHeader; use crate::socks::TcpResponseHeader; use bytes::BufMut; use bytes::BytesMut; -use futures_util::io::AsyncReadExt; -use futures_util::io::AsyncWriteExt; + use std::net::Shutdown; use std::net::SocketAddr; use tokio::net::TcpStream; diff --git a/asocks5/src/lib.rs b/asocks5/src/lib.rs index ebb597c..d0f92ef 100644 --- a/asocks5/src/lib.rs +++ b/asocks5/src/lib.rs @@ -1,5 +1,3 @@ -#![feature(async_await)] - mod client; mod codec; mod consts; diff --git a/asocks5/src/socks.rs b/asocks5/src/socks.rs index b646f9c..e97bf12 100644 --- a/asocks5/src/socks.rs +++ b/asocks5/src/socks.rs @@ -11,12 +11,12 @@ use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use std::u8; use byteorder::BigEndian; -use byteorder::ReadBytesExt; use failure::Fail; use crate::consts; use crate::consts::Reply; use crate::Command; +use tokio::io::AsyncReadExt; use tokio::net::TcpStream; use tokio::prelude::*; @@ -89,8 +89,8 @@ pub async fn read_socks_address(mut stream: &mut TcpStream) -> Result()?); - let port = cursor.read_u16::()?; + let v4addr = Ipv4Addr::from(AsyncReadExt::read_u32(&mut cursor).await?); + let port = cursor.read_u16be()?; let addr = Address::SocketAddress(SocketAddr::V4(SocketAddrV4::new(v4addr, port))); Ok(addr) } @@ -101,7 +101,7 @@ pub async fn read_socks_address(mut stream: &mut TcpStream) -> Result()?; + let port = cursor.read_u16be()?; let addr = Address::SocketAddress(SocketAddr::V6(SocketAddrV6::new(v6addr, port, 0, 0))); @@ -116,7 +116,7 @@ pub async fn read_socks_address(mut stream: &mut TcpStream) -> Result()?; + let port = cursor.read_u16be()?; let addr = String::from_utf8_lossy(&raw_addr[..addr_len]); let addr = Address::DomainNameAddress(addr.into(), port); Ok(addr) @@ -134,8 +134,8 @@ pub async fn read_socks_socket_addr(mut stream: &mut TcpStream) -> Result()?); - let port = cursor.read_u16::()?; + let v4addr = Ipv4Addr::from(cursor.read_u32be()?); + let port = cursor.read_u16be()?; let addr = SocketAddr::V4(SocketAddrV4::new(v4addr, port)); Ok(addr) } @@ -146,7 +146,7 @@ pub async fn read_socks_socket_addr(mut stream: &mut TcpStream) -> Result()?; + let port = cursor.read_u16be()?; let addr = SocketAddr::V6(SocketAddrV6::new(v6addr, port, 0, 0)); Ok(addr) @@ -245,3 +245,19 @@ pub async fn read_handshake_request(mut s: &mut TcpStream) -> Result Result; + fn read_u32be(&mut self) -> Result; +} + +impl> CursorRead for io::Cursor { + fn read_u16be(&mut self) -> Result { + use byteorder::ReadBytesExt; + self.read_u16::() + } + fn read_u32be(&mut self) -> Result { + use byteorder::ReadBytesExt; + self.read_u32::() + } +} diff --git a/src/lib.rs b/src/lib.rs index 3fc98d7..eba2f3f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -50,7 +50,7 @@ pub fn run() -> Result<(), i32> { return Err(100); } }; - let rt = tokio::runtime::Runtime::new().unwrap(); + let mut rt = tokio::runtime::Runtime::new().unwrap(); rt.block_on(async move { let dm = conf.domain_matcher.clone(); let dns = conf.dns.clone(); diff --git a/src/relay/forwarding/tcp/copy/mod.rs b/src/relay/forwarding/tcp/copy/mod.rs index efc0a6a..02ef0fd 100644 --- a/src/relay/forwarding/tcp/copy/mod.rs +++ b/src/relay/forwarding/tcp/copy/mod.rs @@ -5,7 +5,7 @@ use futures::task::Context; use futures::{Future, Poll as Poll1}; use futures_timer::Delay; use std::pin::Pin; -use tokio_io::{AsyncRead, AsyncWrite}; +use tokio::io::{AsyncRead, AsyncWrite}; /// A future which will copy all data from a reader into a writer. /// modified version of Copy from tokio diff --git a/src/relay/forwarding/tcp/mod.rs b/src/relay/forwarding/tcp/mod.rs index 27c4c0b..68f8523 100644 --- a/src/relay/forwarding/tcp/mod.rs +++ b/src/relay/forwarding/tcp/mod.rs @@ -21,9 +21,8 @@ use std::sync::Arc; use asocks5::connect_socks_socket_addr; +use tokio::io::split; use tokio::prelude::*; -use tokio_io::split::split; -use tokio_net::driver::Handle; pub async fn handle_incoming_tcp( mut client_stream: TcpStream, @@ -56,7 +55,7 @@ async fn carry_out( data: Bytes, a: SocketAddr, r: RoutingAction, - client_stream: TcpStream, + mut client_stream: TcpStream, pr: TcpProtocol, ) -> Result<(), Error> { let mut s = match r { @@ -67,7 +66,7 @@ async fn carry_out( RoutingAction::Named(ref g) => match g.val().addr() { EgressAddr::From(ip) => { let x = bind_tcp_socket(ip)?; - tokio::net::TcpStream::connect_std(x, &a, &Handle::default()) + tokio::net::TcpStream::connect_std(x, &a) .await .map_err(|e| { format_err!( diff --git a/src/relay/listen/socks.rs b/src/relay/listen/socks.rs index 2c078c3..ed60717 100644 --- a/src/relay/listen/socks.rs +++ b/src/relay/listen/socks.rs @@ -23,24 +23,24 @@ pub async fn listen_socks( resolver: Arc, router: Arc, ) -> Result<(), Error> { - let l = tokio::net::TcpListener::bind(addr).await?; - let l = l.incoming(); - let f = l.for_each(move |s| { - match s { - Ok(s) => { - let r1 = resolver.clone(); - let rt1 = router.clone(); - tokio::spawn(async move { - let _r = handle_client(s, r1, rt1).await.map_err(|e| { - error!("error handling client {}", e); + let mut l = tokio::net::TcpListener::bind(addr).await?; + tokio::spawn(async move { + loop { + let s = l.accept().await; + match s { + Ok((s, _addr)) => { + let r1 = resolver.clone(); + let rt1 = router.clone(); + tokio::spawn(async move { + let _r = handle_client(s, r1, rt1).await.map_err(|e| { + error!("error handling client {}", e); + }); }); - }); + } + Err(e) => error!("error incoming {:?}", e), } - Err(e) => error!("error incoming {:?}", e), } - ready(()) }); - tokio::spawn(f); Ok(()) } diff --git a/src/resolver/client/socks/mod.rs b/src/resolver/client/socks/mod.rs index f712aa2..bfcd84b 100644 --- a/src/resolver/client/socks/mod.rs +++ b/src/resolver/client/socks/mod.rs @@ -71,7 +71,7 @@ impl SockGetterAsync { stream.read_exact(&mut b).await?; trace!("Read reply length {:?}", b); let mut rdr = io::Cursor::new(b); - let len = rdr.read_u16::().expect("read u16"); + let len = rdr.read_u16be().expect("read u16"); trace!("Reply length is {}", len); let mut buf = data; buf.resize(len as usize, 0); @@ -90,3 +90,19 @@ fn ns_sock_addr(ns: &NameServerRemote) -> SocketAddr { NameServerRemote::Tcp(a) => *a, } } + +pub(crate) trait CursorRead { + fn read_u16be(&mut self) -> Result; + fn read_u32be(&mut self) -> Result; +} + +impl> CursorRead for io::Cursor { + fn read_u16be(&mut self) -> Result { + use byteorder::ReadBytesExt; + self.read_u16::() + } + fn read_u32be(&mut self) -> Result { + use byteorder::ReadBytesExt; + self.read_u32::() + } +} diff --git a/src/resolver/client/udp.rs b/src/resolver/client/udp.rs index 06d650f..ccdfc26 100644 --- a/src/resolver/client/udp.rs +++ b/src/resolver/client/udp.rs @@ -10,7 +10,7 @@ use tokio_net::driver::Handle; pub async fn udp_get(addr: &SocketAddr, data: Vec) -> io::Result> { let uss = UdpSocketStd::bind("0.0.0.0:0")?; uss.set_read_timeout(Some(Duration::from_secs(TIMEOUT)))?; - let mut ust = UdpSocketTokio::from_std(uss, &Handle::default())?; + let mut ust = UdpSocketTokio::from_std(uss)?; ust.send_to(&data, addr).await?; let mut buf = data; buf.resize(998, 0); diff --git a/src/resolver/dnsclient.rs b/src/resolver/dnsclient.rs index 599e98d..190edba 100644 --- a/src/resolver/dnsclient.rs +++ b/src/resolver/dnsclient.rs @@ -69,7 +69,7 @@ fn ns_sock_addr(ns: &NameServerRemote) -> SocketAddr { pub async fn udp_bind_get(addr: SocketAddr, ip: IpAddr, data: Vec) -> io::Result> { let s = StdUdpSocket::bind(SocketAddr::from((ip, 0)))?; s.set_read_timeout(Some(Duration::from_secs(TIMEOUT)))?; - let mut s = UdpSocket::from_std(s, &Handle::default())?; + let mut s = UdpSocket::from_std(s)?; s.send_to(&data, &addr).await?; let mut buf = vec![0; 998]; let (nb, _a) = s.recv_from(&mut buf).await?; diff --git a/src/resolver/lookup.rs b/src/resolver/lookup.rs index e1ed740..f63505f 100644 --- a/src/resolver/lookup.rs +++ b/src/resolver/lookup.rs @@ -2,17 +2,16 @@ use super::dnsclient::DnsClient; use crate::conf::NameServer; use failure::Error; +use failure::_core::time::Duration; use std::net::IpAddr; use std::str::FromStr; +use tokio::time::timeout; use trust_dns::op::Message; use trust_dns::op::Query; use trust_dns::proto::rr::Name; use trust_dns::rr::RecordType; use trust_dns::serialize::binary::{BinDecodable, BinDecoder}; -use failure::_core::time::Duration; -use tokio::future::FutureExt; - pub struct AsyncResolver { client: DnsClient, } @@ -23,10 +22,7 @@ impl AsyncResolver { } pub async fn resolve(&self, name: &str) -> Result, Error> { - let result = self - .resolve_eternal(name) - .timeout(Duration::from_secs(10)) - .await?; + let result = timeout(Duration::from_secs(10), self.resolve_eternal(name)).await?; result } async fn resolve_eternal(&self, name: &str) -> Result, Error> { diff --git a/src/resolver/serve/mod.rs b/src/resolver/serve/mod.rs index 5049cad..9c83f82 100644 --- a/src/resolver/serve/mod.rs +++ b/src/resolver/serve/mod.rs @@ -43,7 +43,7 @@ pub fn serve(conf: DnsProxy, matcher: Arc) -> Result<(), Error> { } async fn recv_req(sock: &UdpSocketStd) -> io::Result<(UdpSocket, Vec, usize, SocketAddr)> { - let mut sock_tok = UdpSocket::from_std(sock.try_clone()?, &Handle::default())?; + let mut sock_tok = UdpSocket::from_std(sock.try_clone()?)?; let mut buf = vec![0; 998]; let (n, a) = sock_tok.recv_from(&mut buf).await?; Ok((sock_tok, buf, n, a))