Merge pull request #38 from lbl8603/1.2.x

1.2.x
增加日志输出内容
2024-05-11 09:21:57 +08:00 · 2024-05-10 23:19:52 +08:00 · 2024-05-10 23:18:45 +08:00 · 2024-05-10 23:18:24 +08:00 · 2024-05-10 23:16:37 +08:00 · 2024-05-09 22:51:27 +08:00
80 changed files with 4055 additions and 1406 deletions
@@ -51,9 +51,15 @@ jobs:
          - TARGET: armv7-unknown-linux-musleabihf # raspberry pi 2-3-4, not tested
            OS: ubuntu-latest
            FEATURES: openssl-vendored
+          - TARGET: armv7-unknown-linux-musleabi # raspberry pi 2-3-4, not tested
+            OS: ubuntu-latest
+            FEATURES: openssl-vendored
          - TARGET: arm-unknown-linux-musleabihf # raspberry pi 0-1, not tested
            OS: ubuntu-latest
            FEATURES: ring-cipher,openssl-vendored
+          - TARGET: arm-unknown-linux-musleabi # raspberry pi 0-1, not tested
+            OS: ubuntu-latest
+            FEATURES: ring-cipher,openssl-vendored
          - TARGET: x86_64-apple-darwin # tested on a mac, is not properly signed so there are security warnings
            OS: macos-latest
            FEATURES: ring-cipher,openssl-vendored
@@ -99,6 +105,8 @@ jobs:
        run: |
          # dependencies are only needed on ubuntu as that's the only place where
          # we make cross-compilation
+          rustup set auto-self-update disable
+          
          if [[ $OS =~ ^ubuntu.*$ ]]; then
            sudo apt-get update && sudo apt-get install -qq crossbuild-essential-arm64 crossbuild-essential-armhf musl-tools
            #  curl -s musl.cc | grep mipsel
@@ -111,9 +119,15 @@ jobs:
                ;;
              armv7-unknown-linux-musleabihf)
                MUSL_URI=armv7l-linux-musleabihf-cross
+                ;;    
+              armv7-unknown-linux-musleabi)
+                MUSL_URI=armv7m-linux-musleabi-cross
                ;;   
              arm-unknown-linux-musleabihf)
                MUSL_URI=arm-linux-musleabihf-cross
+                ;;    
+              arm-unknown-linux-musleabi)
+                MUSL_URI=arm-linux-musleabi-cross
                ;;        
              mips-unknown-linux-musl)
                MUSL_URI=mips-linux-musl-cross
@@ -124,6 +138,9 @@ jobs:
              # mips平台使用1.71.1版本
              rustup install 1.71.1
              rustup default 1.71.1  
+            else
+              rustup install 1.77
+              rustup default 1.77
            fi
          
            if [  -n "$MUSL_URI" ]; then
@@ -132,8 +149,11 @@ jobs:
              tar zxf ./musl_gcc/$MUSL_URI.tgz -C ./musl_gcc/
              sudo ln -s $(pwd)/musl_gcc/$MUSL_URI/bin/*gcc /usr/bin/
            fi
+          else
+            rustup install 1.77
+            rustup default 1.77 
          fi
-          
+          rustup -V
          
          # some additional configuration for cross-compilation on linux
          cat >>~/.cargo/config <<EOF
@@ -145,8 +165,14 @@ jobs:
          [target.armv7-unknown-linux-musleabihf]
          linker = "armv7l-linux-musleabihf-gcc"
          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]
+          [target.armv7-unknown-linux-musleabi]
+          linker = "armv7m-linux-musleabi-gcc"
+          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]
          [target.arm-unknown-linux-musleabihf]
          linker = "arm-linux-musleabihf-gcc"
+          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]   
+          [target.arm-unknown-linux-musleabi]
+          linker = "arm-linux-musleabi-gcc"
          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]
          [target.mipsel-unknown-linux-musl]
          linker = "mipsel-linux-musl-gcc"
@@ -1,4 +1,3 @@
 target/*
 vnt/src/proto/*
-vnt-cli/src/generated_serial_number.rs
-Cargo.lock
+vnt-cli/src/generated_serial_number.rs
@@ -0,0 +1,2004 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "aes-gcm"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
+dependencies = [
+ "aead",
+ "aes",
+ "cipher",
+ "ctr",
+ "ghash",
+ "subtle",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_log-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
+
+[[package]]
+name = "android_logger"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c494134f746c14dc653a35a4ea5aca24ac368529da5370ecf41fe0341c35772f"
+dependencies = [
+ "android_log-sys",
+ "env_logger",
+ "log",
+ "once_cell",
+]
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
+[[package]]
+name = "autocfg"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "common"
+version = "1.2.9"
+
+[[package]]
+name = "console"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "typenum",
+]
+
+[[package]]
+name = "ctr"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "der"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "destructure_traitobject"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7"
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+]
+
+[[package]]
+name = "dns-parser"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea"
+dependencies = [
+ "byteorder",
+ "quick-error",
+]
+
+[[package]]
+name = "ecb"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a8bfa975b1aec2145850fcaa1c6fe269a16578c44705a532ae3edc92b8881c7"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "either"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+
+[[package]]
+name = "embed-manifest"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41cd446c890d6bed1d8b53acef5f240069ebef91d6fae7c5f52efe61fe8b5eae"
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ghash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
+dependencies = [
+ "opaque-debug",
+ "polyval",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.3",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "ioctl-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c"
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+dependencies = [
+ "spin 0.5.2",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "libloading"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+dependencies = [
+ "cfg-if",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libsm"
+version = "0.5.1"
+source = "git+https://github.com/lbl8603/libsm#f9e1b8cf20d0829efb4934a940d0ba4f3ee0ac14"
+dependencies = [
+ "byteorder",
+ "getrandom",
+ "lazy_static",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "rand",
+ "yasna",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "log-mdc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7"
+
+[[package]]
+name = "log4rs"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6"
+dependencies = [
+ "anyhow",
+ "arc-swap",
+ "chrono",
+ "derivative",
+ "fnv",
+ "humantime",
+ "libc",
+ "log",
+ "log-mdc",
+ "once_cell",
+ "parking_lot",
+ "rand",
+ "serde",
+ "serde-value",
+ "serde_json",
+ "serde_yaml",
+ "thiserror",
+ "thread-id",
+ "typemap-ors",
+ "winapi",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "openssl-src"
+version = "300.1.3+3.1.2"
+source = "git+https://github.com/lbl8603/openssl-src-rs#871c5d6cfe8a7cb1c5725638d7563c0d96ca4c04"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.93"
+source = "git+https://github.com/lbl8603/rust-openssl#e8b3d2c02d2d07a0e4a82ff4e4bef210f4bc71c8"
+dependencies = [
+ "cc",
+ "libc",
+ "openssl-src",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "ordered-float"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "os_info"
+version = "3.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
+dependencies = [
+ "log",
+ "serde",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "packet"
+version = "0.1.0"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "polyval"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "protobuf"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0"
+dependencies = [
+ "once_cell",
+ "protobuf-support",
+ "thiserror",
+]
+
+[[package]]
+name = "protobuf-codegen"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77"
+dependencies = [
+ "anyhow",
+ "once_cell",
+ "protobuf",
+ "protobuf-parse",
+ "regex",
+ "tempfile",
+ "thiserror",
+]
+
+[[package]]
+name = "protobuf-parse"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642"
+dependencies = [
+ "anyhow",
+ "indexmap 1.9.3",
+ "log",
+ "protobuf",
+ "protobuf-support",
+ "tempfile",
+ "thiserror",
+ "which",
+]
+
+[[package]]
+name = "protobuf-support"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7"
+dependencies = [
+ "thiserror",
+]
+
+[[package]]
+name = "protoc-bin-vendored"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "005ca8623e5633e298ad1f917d8be0a44bcf406bf3cde3b80e63003e49a3f27d"
+dependencies = [
+ "protoc-bin-vendored-linux-aarch_64",
+ "protoc-bin-vendored-linux-ppcle_64",
+ "protoc-bin-vendored-linux-x86_32",
+ "protoc-bin-vendored-linux-x86_64",
+ "protoc-bin-vendored-macos-x86_64",
+ "protoc-bin-vendored-win32",
+]
+
+[[package]]
+name = "protoc-bin-vendored-linux-aarch_64"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fb9fc9cce84c8694b6ea01cc6296617b288b703719b725b8c9c65f7c5874435"
+
+[[package]]
+name = "protoc-bin-vendored-linux-ppcle_64"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d2a07dcf7173a04d49974930ccbfb7fd4d74df30ecfc8762cf2f895a094516"
+
+[[package]]
+name = "protoc-bin-vendored-linux-x86_32"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d54fef0b04fcacba64d1d80eed74a20356d96847da8497a59b0a0a436c9165b0"
+
+[[package]]
+name = "protoc-bin-vendored-linux-x86_64"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8782f2ce7d43a9a5c74ea4936f001e9e8442205c244f7a3d4286bd4c37bc924"
+
+[[package]]
+name = "protoc-bin-vendored-macos-x86_64"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5de656c7ee83f08e0ae5b81792ccfdc1d04e7876b1d9a38e6876a9e09e02537"
+
+[[package]]
+name = "protoc-bin-vendored-win32"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804"
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-ex"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42776a943a4f890410259860d4c308d32792ecbeaca4932a2b94b04f6d27bb9a"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom",
+ "libc",
+ "spin 0.9.8",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustix"
+version = "0.38.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+dependencies = [
+ "bitflags 2.5.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.198"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-value"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
+dependencies = [
+ "ordered-float",
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.198"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.116"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap 2.2.6",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+ "sha2",
+]
+
+[[package]]
+name = "stun-bytes"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bebd666814c8af1e06e4d489f9c3d03a4aef20bae651550c52e6e95e09f3f12"
+dependencies = [
+ "r-ex",
+]
+
+[[package]]
+name = "stun-format"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6ad3c54fde6dfd6fe5048a71515b392d22c29730533663b5300e1b511d78df5"
+dependencies = [
+ "r-ex",
+ "stun-bytes",
+]
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "sudo"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88bd84d4c082e18e37fef52c0088e4407dabcef19d23a607fb4b5ee03b7d5b83"
+dependencies = [
+ "libc",
+ "log",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "thread-id"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "tokio"
+version = "1.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+]
+
+[[package]]
+name = "tun"
+version = "0.1.0"
+dependencies = [
+ "ioctl-sys",
+ "libc",
+ "libloading",
+ "log",
+ "rand",
+ "widestring",
+ "winapi",
+]
+
+[[package]]
+name = "typemap-ors"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867"
+dependencies = [
+ "unsafe-any-ors",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "unsafe-any-ors"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad"
+dependencies = [
+ "destructure_traitobject",
+]
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "uuid"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "vnt"
+version = "1.2.9"
+dependencies = [
+ "aes",
+ "aes-gcm",
+ "anyhow",
+ "bytes",
+ "cbc",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+ "dns-parser",
+ "ecb",
+ "libc",
+ "libloading",
+ "libsm",
+ "log",
+ "mio",
+ "openssl-sys",
+ "packet",
+ "parking_lot",
+ "protobuf",
+ "protobuf-codegen",
+ "protoc-bin-vendored",
+ "rand",
+ "ring",
+ "rsa",
+ "sha2",
+ "socket2",
+ "spki",
+ "stun-format",
+ "thiserror",
+ "tokio",
+ "tun",
+]
+
+[[package]]
+name = "vnt-cli"
+version = "1.2.9"
+dependencies = [
+ "chrono",
+ "common",
+ "console",
+ "embed-manifest",
+ "getopts",
+ "log",
+ "log4rs",
+ "os_info",
+ "rand",
+ "serde",
+ "serde_yaml",
+ "sudo",
+ "uuid",
+ "vnt",
+ "winapi",
+]
+
+[[package]]
+name = "vnt-jni"
+version = "1.2.9"
+dependencies = [
+ "android_logger",
+ "common",
+ "jni",
+ "log",
+ "parking_lot",
+ "spki",
+ "vnt",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.60",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "yasna"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
+dependencies = [
+ "num-bigint",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
@@ -7,33 +7,33 @@ pub fn ips_parse(ips: &Vec<String>) -> Result<Vec<(u32, u32, Ipv4Addr)>, String>
        let net = if let Some(net) = split.next() {
            net
        } else {
-            return Err("ipv4/mask,ipv4".to_string());
+            return Err(format!("ipv4/mask,ipv4 {:?}", x));
        };
        let ip = if let Some(ip) = split.next() {
            ip
        } else {
-            return Err("ipv4/mask,ipv4".to_string());
+            return Err(format!("ipv4/mask,ipv4 {:?}", x));
        };
        let ip = if let Ok(ip) = ip.parse::<Ipv4Addr>() {
            ip
        } else {
-            return Err("not ipv4".to_string());
+            return Err(format!("not ipv4 {:?}", ip));
        };
        let mut split = net.split("/");
        let dest = if let Some(dest) = split.next() {
            dest
        } else {
-            return Err("no ipv4/mask".to_string());
+            return Err(format!("no ipv4/mask {:?}", net));
        };
        let mask = if let Some(mask) = split.next() {
            mask
        } else {
-            return Err("no netmask".to_string());
+            return Err(format!("no netmask {:?}", net));
        };
        let dest = if let Ok(dest) = dest.parse::<Ipv4Addr>() {
            dest
        } else {
-            return Err("not ipv4".to_string());
+            return Err(format!("not ipv4 {:?}", dest));
        };
        let mask = to_ip(mask)?;
        in_ips_c.push((u32::from_be_bytes(dest.octets()), mask, ip));
@@ -48,17 +48,17 @@ pub fn out_ips_parse(ips: &Vec<String>) -> Result<Vec<(u32, u32)>, String> {
        let dest = if let Some(dest) = split.next() {
            dest
        } else {
-            return Err("no ipv4/mask".to_string());
+            return Err(format!("no ipv4/mask {:?}", x));
        };
        let mask = if let Some(mask) = split.next() {
            mask
        } else {
-            return Err("no netmask".to_string());
+            return Err(format!("no netmask {:?}", x));
        };
        let dest = if let Ok(dest) = dest.parse::<Ipv4Addr>() {
            dest
        } else {
-            return Err("not ipv4".to_string());
+            return Err(format!("not ipv4 {:?}", dest));
        };
        let mask = to_ip(mask)?;
        in_ips_c.push((u32::from_be_bytes(dest.octets()), mask));
@@ -55,7 +55,10 @@ pub fn get_unique_identifier() -> Option<String> {
    // 对 linux 或 wsl 来说，读取 /etc/machine-id 即可获取当前操作系统的
    // 唯一标识，而且某些环境没有预装`dmidecode`命令
    if let Ok(identifier) = std::fs::read_to_string("/etc/machine-id") {
-        return Some(identifier);
+        let identifier = identifier.trim();
+        if !identifier.is_empty() {
+            return Some(identifier.to_string());
+        }
    }

    let output = match Command::new("dmidecode")
@@ -70,7 +73,7 @@ pub fn get_unique_identifier() -> Option<String> {
    };

    let result = String::from_utf8_lossy(&output.stdout);
-    let identifier = result.trim().to_string();
+    let identifier = result.trim();
    if identifier.is_empty() {
        None
    } else {
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-vnt = { path = "../vnt", package = "vnt",default-features = false }
+vnt = { path = "../vnt", package = "vnt", default-features = false }
 common = { path = "../common" }
 getopts = "0.2.21"
 console = "0.15.2"
@@ -28,16 +28,17 @@ sudo = "0.6.0"
 winapi = { version = "0.3.9", features = ["handleapi", "processthreadsapi", "winnt", "securitybaseapi", "impl-default"] }

 [features]
-default = ["server_encrypt","aes_gcm","aes_cbc","aes_ecb","sm4_cbc","ip_proxy"]
+default = ["server_encrypt", "aes_gcm", "aes_cbc", "aes_ecb", "sm4_cbc", "ip_proxy", "port_mapping"]
 openssl = ["vnt/openssl"]
 openssl-vendored = ["vnt/openssl-vendored"]
 ring-cipher = ["vnt/ring-cipher"]
-aes_cbc=["vnt/aes_cbc"]
-aes_ecb=["vnt/aes_ecb"]
-sm4_cbc=["vnt/sm4_cbc"]
-aes_gcm=["vnt/aes_gcm"]
-server_encrypt=["vnt/server_encrypt"]
-ip_proxy=["vnt/ip_proxy"]
+aes_cbc = ["vnt/aes_cbc"]
+aes_ecb = ["vnt/aes_ecb"]
+sm4_cbc = ["vnt/sm4_cbc"]
+aes_gcm = ["vnt/aes_gcm"]
+server_encrypt = ["vnt/server_encrypt"]
+ip_proxy = ["vnt/ip_proxy"]
+port_mapping = ["vnt/port_mapping"]
 [build-dependencies]
 embed-manifest = "1.4.0"
 rand = "0.8.5"
@@ -10,11 +10,13 @@
 ### -c
 关闭控制台交互式命令，后台运行时可以加此参数
 ### -s `<server>`
-注册和中继服务器地址，注册和转发数据
+注册和中继服务器地址，注册和转发数据，以'TXT:'开头表示解析TXT记录，TXT记录内容必须是'host:port'形式的服务器地址
 ### -e `<stun-server>`
 使用stun服务探测客户端NAT类型，不同类型有不同的打洞策略
 ### -a
 加了此参数表示使用tap网卡，默认使用tun网卡，tun网卡效率更高
+
+注意：仅在windows上支持使用tap，用于兼容低版本windows系统（低版本windows不支持wintun）
 ### --nic `<tun0>`
 指定虚拟网卡名称，默认tun模式使用vnt-tun，tap模式使用vnt-tap
 ### -i `<in-ip>`、-o  `<out-ip>`
@@ -72,9 +74,9 @@

 注意：默认情况下服务端不会对中转的数据做校验，如果要对中转的数据做校验，则需要客户端、服务端都开启此参数
 ### --punch `<punch>`
-取值ipv4/ipv6，选择只使用ipv4打洞或者只使用ipv6打洞，默认两则都会使用
+取值ipv4/ipv6，选择只使用ipv4打洞或者只使用ipv6打洞，默认两者都会使用
 ### --ports `<port1,port2>`
-指定本地监听的端口组，多个端口使用逗号分隔，多个端口可以分摊流量，增加并发，tcp会监听端口组的第一个端口，用于tcp直连
+指定本地监听的端口组，多个端口使用逗号分隔，多个端口可以分摊流量，增加并发、减缓流量限制，tcp会监听端口组的第一个端口，用于tcp直连

 - 例1：‘--ports 12345,12346,12347’ 表示udp监听12345、12346、12347这三个端口，tcp监听12345端口
 - 例2：‘--ports 0,0’ 表示udp监听两个未使用的端口，tcp监听一个未使用的端口
@@ -85,12 +87,20 @@
 ### --no-proxy
 关闭内置的ip代理，内置的代理较为简单，而且一般来说直接使用网卡NAT转发性能会更高，
 有需要可以自行配置NAT转发，[可参考‘编译’小节中的NAT配置](https://github.com/lbl8603/vnt#%E7%BC%96%E8%AF%91)
+### --dns `<223.5.5.5>`
+设置域名解析服务器地址，可以设置多个。如果使用TXT记录的域名，则dns默认使用223.5.5.5和114.114.114.114，端口省略值为53
+
+当地址解析失败时，会依次尝试后面的dns，直到有A记录、AAAA记录(或TXT记录)的解析结果
+
+### --mapping `<udp:0.0.0.0:80->10.26.0.10:80>`
+端口映射,可以设置多个映射地址，例如 '--mapping udp:0.0.0.0:80->10.26.0.10:80 --mapping tcp:0.0.0.0:80->10.26.0.11:81'
+表示将本地udp 80端口的数据转发到10.26.0.10:80，将本地tcp 80端口的数据转发到10.26.0.11:81，转发的目的地址可以使用域名+端口
 ### -f `<conf>`
 指定配置文件
 配置文件采用yaml格式，可参考：
 ```yaml
 # 全部参数
-tap: false #是否使用tap 
+tap: false #是否使用tap 仅在windows上支持使用tap
 token: xxx #组网token
 device_id: xxx #当前设备id
 name: windows 11 #当前设备名称
@@ -111,7 +121,7 @@ server_encrypt: true #服务端加密
 parallel: 1 #任务并行度
 cipher_model: aes_gcm #客户端加密算法
 finger: false #关闭数据指纹
-punch_model: ipv4 #打洞模式 
+punch_model: ipv4 #打洞模式，表示只使用ipv4地址打洞，默认会同时使用v6和v4
 ports: 
  - 0 #使用随机端口，tcp监听此端口
  - 0
@@ -122,7 +132,12 @@ device_name: vnt-tun #网卡名称
 packet_loss: 0 #指定丢包率 取值0~1之间的数 用于模拟弱网
 packet_delay: 0 #指定延迟 单位毫秒 用于模拟弱网
 dns:
-  - 8.8.8.8:53
+  - 223.5.5.5 # 首选dns
+  - 8.8.8.8 # 备选dns
+mapping:
+  - udp:0.0.0.0:80->10.26.0.10:80 # 映射udp数据
+  - tcp:0.0.0.0:80->10.26.0.10:81 # 映射tcp数据
+  - tcp:0.0.0.0:82->localhost:83 # 映射tcp数据
 ```

 或者需要哪个配置就加哪个，当然token是必须的
@@ -134,7 +149,9 @@ token: xxx #组网token
 - relay:仅中继模式，会禁止打洞/p2p直连，只使用服务器转发
 - p2p:仅直连模式，会禁止网络数据从服务器/客户端转发，只会使用服务器转发控制包
 ### --packet-loss `<0>`
-模拟丢包，取值0~1之间的小数，程序会按设定的概率主动丢包。在模拟弱网环境会有帮助。
+模拟丢包，取值0~1之间的小数，程序会按设定的概率主动丢包。在模拟弱网环境时会有帮助。
+### --packet-delay `<0>`
+模拟延迟,整数,单位毫秒(ms),程序会按设定的值延迟发包,可用于模拟弱网

 ### --list
 在后台运行时,查看其他设备列表
@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use std::net::{Ipv4Addr, SocketAddr};
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Info {
    pub name: String,
@@ -13,6 +14,9 @@ pub struct Info {
    pub ipv6_addr: String,
    pub up: u64,
    pub down: u64,
+    pub port_mapping_list: Vec<(bool, SocketAddr, String)>,
+    pub in_ips: Vec<(u32, u32, Ipv4Addr)>,
+    pub out_ips: Vec<(u32, u32)>,
 }

 #[derive(Serialize, Deserialize, Debug)]
@@ -185,6 +185,9 @@ pub fn command_info(vnt: &Vnt) -> Info {
        .unwrap_or("None".to_string());
    let up = vnt.up_stream();
    let down = vnt.down_stream();
+    let port_mapping_list = vnt.config().port_mapping_list.clone();
+    let in_ips = vnt.config().in_ips.clone();
+    let out_ips = vnt.config().out_ips.clone();
    Info {
        name,
        virtual_ip,
@@ -198,5 +201,8 @@ pub fn command_info(vnt: &Vnt) -> Info {
        ipv6_addr,
        up,
        down,
+        port_mapping_list,
+        in_ips,
+        out_ips,
    }
 }
@@ -12,7 +12,7 @@ use vnt::core::Config;
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(default)]
 pub struct FileConfig {
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    #[cfg(target_os = "windows")]
    pub tap: bool,
    pub token: String,
    pub device_id: String,
@@ -40,12 +40,14 @@ pub struct FileConfig {
    pub device_name: Option<String>,
    pub packet_loss: Option<f64>,
    pub packet_delay: u32,
+    #[cfg(feature = "port_mapping")]
+    pub mapping: Vec<String>,
 }

 impl Default for FileConfig {
    fn default() -> Self {
        Self {
-            #[cfg(any(target_os = "windows", target_os = "linux"))]
+            #[cfg(target_os = "windows")]
            tap: false,
            token: "".to_string(),
            device_id: get_device_id(),
@@ -54,7 +56,7 @@ impl Default for FileConfig {
            stun_server: vec![
                "stun1.l.google.com:19302".to_string(),
                "stun2.l.google.com:19302".to_string(),
-                "stun.qq.com:3478".to_string(),
+                "stun.miwifi.com:3478".to_string(),
            ],
            dns: vec![],
            in_ips: vec![],
@@ -77,6 +79,8 @@ impl Default for FileConfig {
            device_name: None,
            packet_loss: None,
            packet_delay: 0,
+            #[cfg(feature = "port_mapping")]
+            mapping: vec![],
        }
    }
 }
@@ -130,7 +134,7 @@ pub fn read_config(file_path: &str) -> io::Result<(Config, bool)> {
    let use_channel_type = UseChannelType::from_str(&file_conf.use_channel)
        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
    let config = Config::new(
-        #[cfg(any(target_os = "windows", target_os = "linux"))]
+        #[cfg(target_os = "windows")]
        file_conf.tap,
        file_conf.token,
        file_conf.device_id,
@@ -157,6 +161,8 @@ pub fn read_config(file_path: &str) -> io::Result<(Config, bool)> {
        use_channel_type,
        file_conf.packet_loss,
        file_conf.packet_delay,
+        #[cfg(feature = "port_mapping")]
+        file_conf.mapping,
    )
    .unwrap();
    Ok((config, file_conf.cmd))
@@ -1,4 +1,5 @@
 use console::{style, Style};
+use std::net::Ipv4Addr;

 use crate::command::entity::{DeviceItem, Info, RouteItem};

@@ -9,10 +10,15 @@ pub fn console_info(status: Info) {
    println!("Virtual ip: {}", style(status.virtual_ip).green());
    println!("Virtual gateway: {}", style(status.virtual_gateway).green());
    println!("Virtual netmask: {}", style(status.virtual_netmask).green());
-    println!(
-        "Connection status: {}",
-        style(status.connect_status).green()
-    );
+    if status.connect_status.eq_ignore_ascii_case("Connected") {
+        println!(
+            "Connection status: {}",
+            style(status.connect_status).green()
+        );
+    } else {
+        println!("Connection status: {}", style(status.connect_status).red());
+    }
+
    println!("NAT type: {}", style(status.nat_type).green());
    println!("Relay server: {}", style(status.relay_server).green());
    println!("Public ips: {}", style(status.public_ips).green());
@@ -20,6 +26,38 @@ pub fn console_info(status: Info) {
    println!("IPv6: {}", style(status.ipv6_addr).green());
    println!("Up: {}", style(convert(status.up)).green());
    println!("Down: {}", style(convert(status.down)).green());
+
+    if !status.port_mapping_list.is_empty() {
+        println!("------------------------------------------");
+        println!("Port mapping {}", status.port_mapping_list.len());
+        for (is_tcp, addr, dest) in status.port_mapping_list {
+            if is_tcp {
+                println!("  TCP: {} -> {}", addr, dest)
+            } else {
+                println!("  UDP: {} -> {}", addr, dest)
+            }
+        }
+    }
+    if !status.in_ips.is_empty() || !status.out_ips.is_empty() {
+        println!("------------------------------------------");
+    }
+    if !status.in_ips.is_empty() {
+        println!("IP forwarding {}", status.in_ips.len());
+        for (dest, mask, ip) in status.in_ips {
+            println!(
+                "  -- {} --> {}/{}",
+                ip,
+                Ipv4Addr::from(dest),
+                mask.count_ones()
+            )
+        }
+    }
+    if !status.out_ips.is_empty() {
+        println!("Allows network {}", status.out_ips.len());
+        for (dest, mask) in status.out_ips {
+            println!("  {}/{}", Ipv4Addr::from(dest), mask.count_ones())
+        }
+    }
 }

 fn convert(num: u64) -> String {
@@ -73,6 +73,7 @@ fn main() {
    opts.optopt("", "packet-loss", "丢包率", "<packet-loss>");
    opts.optopt("", "packet-delay", "延迟", "<packet-delay>");
    opts.optmulti("", "dns", "dns", "<dns>");
+    opts.optmulti("", "mapping", "mapping", "<mapping>");
    opts.optopt("f", "", "配置文件", "<conf>");
    //"后台运行时,查看其他设备列表"
    opts.optflag("", "list", "后台运行时,查看其他设备列表");
@@ -130,7 +131,7 @@ fn main() {
            println!("parameter -k not found .");
            return;
        }
-        #[cfg(any(target_os = "windows", target_os = "linux"))]
+        #[cfg(target_os = "windows")]
        let tap = matches.opt_present("a");
        let device_name = matches.opt_str("nic");
        let token: String = matches.opt_get("k").unwrap().unwrap();
@@ -156,7 +157,7 @@ fn main() {
        if stun_server.is_empty() {
            stun_server.push("stun1.l.google.com:19302".to_string());
            stun_server.push("stun2.l.google.com:19302".to_string());
-            stun_server.push("stun.qq.com:3478".to_string());
+            stun_server.push("stun.miwifi.com:3478".to_string());
        }
        let dns = matches.opt_strs("dns");
        let in_ip = matches.opt_strs("i");
@@ -287,8 +288,10 @@ fn main() {
            .opt_get::<u32>("packet-delay")
            .expect("--packet-delay")
            .unwrap_or(0);
+        #[cfg(feature = "port_mapping")]
+        let port_mapping_list = matches.opt_strs("mapping");
        let config = match Config::new(
-            #[cfg(any(target_os = "windows", target_os = "linux"))]
+            #[cfg(target_os = "windows")]
            tap,
            token,
            device_id,
@@ -315,6 +318,8 @@ fn main() {
            use_channel_type,
            packet_loss,
            packet_delay,
+            #[cfg(feature = "port_mapping")]
+            port_mapping_list,
        ) {
            Ok(config) => config,
            Err(e) => {
@@ -338,6 +343,14 @@ fn main() {
 mod callback;

 fn main0(config: Config, show_cmd: bool) {
+    #[cfg(feature = "port_mapping")]
+    for (is_tcp, addr, dest) in config.port_mapping_list.iter() {
+        if *is_tcp {
+            println!("TCP port mapping {}->{}", addr, dest)
+        } else {
+            println!("UDP port mapping {}->{}", addr, dest)
+        }
+    }
    let vnt_util = Vnt::new(config, callback::VntHandler {}).unwrap();
    let vnt_c = vnt_util.clone();
    thread::Builder::new()
@@ -412,7 +425,8 @@ fn print_usage(program: &str, _opts: Options) {
    println!("  -n <name>           给设备一个名字,便于区分不同设备,默认使用系统版本");
    println!("  -d <id>             设备唯一标识符,不使用--ip参数时,服务端凭此参数分配虚拟ip,注意不能重复");
    println!("  -s <server>         注册和中继服务器地址,以'TXT:'开头表示解析TXT记录");
-    println!("  -e <stun-server>    stun服务器,用于探测NAT类型,可多次指定,如-e addr1 -e addr2");
+    println!("  -e <stun-server>    stun服务器,用于探测NAT类型,可使用多个地址,如-e stun1.l.google.com -e stun2.l.google.com");
+    #[cfg(target_os = "windows")]
    println!("  -a                  使用tap模式,默认使用tun模式");
    println!("  -i <in-ip>          配置点对网(IP代理)时使用,-i 192.168.0.0/24,10.26.0.3表示允许接收网段192.168.0.0/24的数据");
    println!("                      并转发到10.26.0.3,可指定多个网段");
@@ -474,7 +488,9 @@ fn print_usage(program: &str, _opts: Options) {
    println!(
        "  --packet-delay <0>  模拟延迟,整数,单位毫秒(ms),程序会按设定的值延迟发包,可用于模拟弱网"
    );
-    println!("  --dns <host:port>   DNS服务器地址,可使用多个dns,默认使用114.114.114.114和8.8.8.8");
+    println!("  --dns <host:port>   DNS服务器地址,可使用多个dns,不指定时使用系统解析");
+    #[cfg(feature = "port_mapping")]
+    println!("  --mapping <mapping> 端口映射,例如 --mapping udp:0.0.0.0:80->10.26.0.10:80 --mapping tcp:0.0.0.0:80->10.26.0.10:80");

    println!();
    println!(
@@ -14,5 +14,8 @@ jni = { version = "0.21.1", default-features = false }
 log = "0.4.20"
 spki = { version = "0.7.2", features = ["fingerprint", "alloc","base64","pem"]}

+[target.'cfg(target_os = "android")'.dependencies]
+android_logger = "0.13"
+
 [lib]
 crate-type = ["staticlib", "cdylib"]
@@ -1,13 +1,16 @@
 package top.wherewego.vnt.jni;

+import java.io.Serializable;
+import java.util.Arrays;
+
 /**
 * 启动配置
 *
 * @author https://github.com/lbl8603/vnt
 */
-public class Config {
+public class Config implements Serializable {
    /**
-     * 是否是tap模式，仅支持windows和linux
+     * 是否是tap模式，仅支持windows
     */
    private boolean tap;
    /**
@@ -38,10 +41,6 @@ public class Config {
     * 是否开启服务端加密
     */
    private boolean serverEncrypt;
-    /**
-     * 仅使用中继转发
-     */
-    private boolean relay;
    /**
     * 设备id，请使用唯一值
     */
@@ -54,6 +53,10 @@ public class Config {
     * dns地址
     */
    private String[] dns;
+    /**
+     * 端口映射
+     */
+    private String[] portMapping;
    /**
     * stun服务地址
     */
@@ -170,13 +173,6 @@ public class Config {
        this.serverEncrypt = serverEncrypt;
    }

-    public boolean isRelay() {
-        return relay;
-    }
-
-    public void setRelay(boolean relay) {
-        this.relay = relay;
-    }

    public String getDeviceId() {
        return deviceId;
@@ -201,6 +197,13 @@ public class Config {
    public void setDns(String[] dns) {
        this.dns = dns;
    }
+    public String[] getPortMapping() {
+        return portMapping;
+    }
+
+    public void setPortMapping(String[] portMapping) {
+        this.portMapping = portMapping;
+    }

    public String[] getStunServer() {
        return stunServer;
@@ -297,4 +300,34 @@ public class Config {
    public void setPacketDelay(Integer packetDelay) {
        this.packetDelay = packetDelay;
    }
+
+    @Override
+    public String toString() {
+        return "Config{" +
+                "tap=" + tap +
+                ", token='" + token + '\'' +
+                ", name='" + name + '\'' +
+                ", password='" + password + '\'' +
+                ", cipherModel='" + cipherModel + '\'' +
+                ", punchModel='" + punchModel + '\'' +
+                ", mtu=" + mtu +
+                ", serverEncrypt=" + serverEncrypt +
+                ", deviceId='" + deviceId + '\'' +
+                ", server='" + server + '\'' +
+                ", dns=" + Arrays.toString(dns) +
+                ", portMapping=" + Arrays.toString(portMapping) +
+                ", stunServer=" + Arrays.toString(stunServer) +
+                ", tcp=" + tcp +
+                ", ip='" + ip + '\'' +
+                ", finger=" + finger +
+                ", firstLatency=" + firstLatency +
+                ", inIps=" + Arrays.toString(inIps) +
+                ", outIps=" + Arrays.toString(outIps) +
+                ", ports=" + Arrays.toString(ports) +
+                ", deviceName='" + deviceName + '\'' +
+                ", useChannel='" + useChannel + '\'' +
+                ", packetLossRate=" + packetLossRate +
+                ", packetDelay=" + packetDelay +
+                '}';
+    }
 }
@@ -11,7 +11,7 @@ import java.io.IOException;
 public class Vnt implements Closeable {
    private final long raw;

-    public Vnt(Config config, CallBack callBack) throws Exception{
+    public Vnt(Config config, CallBack callBack) throws Exception {
        this.raw = new0(config, callBack);
        if (this.raw == 0) {
            throw new RuntimeException();
@@ -26,6 +26,10 @@ public class Vnt implements Closeable {
        wait0(raw);
    }

+    public boolean awaitTimeout(long ms) {
+        return waitTimeout0(raw, ms);
+    }
+
    public PeerRouteInfo[] list() {
        return list0(raw);
    }
@@ -36,6 +40,8 @@ public class Vnt implements Closeable {

    private native void wait0(long raw);

+    private native boolean waitTimeout0(long raw, long ms);
+
    private native void drop0(long raw);

    private native PeerRouteInfo[] list0(long raw);
@@ -12,7 +12,7 @@ use vnt::core::Config;
 use crate::utils::*;

 pub fn new_config(env: &mut JNIEnv, config: JObject) -> Result<Config, Error> {
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    #[cfg(target_os = "windows")]
    let tap = env.get_field(&config, "tap", "Z")?.z()?;
    let token = to_string_not_null(env, &config, "token")?;
    let name = to_string_not_null(env, &config, "name")?;
@@ -21,6 +21,7 @@ pub fn new_config(env: &mut JNIEnv, config: JObject) -> Result<Config, Error> {
    let server_address_str = to_string_not_null(env, &config, "server")?;
    let stun_server = to_string_array_not_null(env, &config, "stunServer")?;
    let dns = to_string_array(env, &config, "dns")?.unwrap_or_else(|| vec![]);
+    let port_mapping = to_string_array(env, &config, "portMapping")?.unwrap_or_else(|| vec![]);
    let cipher_model = to_string_not_null(env, &config, "cipherModel")?;
    let punch_model = to_string(env, &config, "punchModel")?;
    let mtu = to_integer(env, &config, "mtu")?.map(|v| v as u32);
@@ -89,7 +90,7 @@ pub fn new_config(env: &mut JNIEnv, config: JObject) -> Result<Config, Error> {
    #[cfg(not(target_os = "android"))]
    let device_name = to_string(env, &config, "deviceName")?;
    let config = match Config::new(
-        #[cfg(any(target_os = "windows", target_os = "linux"))]
+        #[cfg(target_os = "windows")]
        tap,
        token,
        device_id,
@@ -116,12 +117,13 @@ pub fn new_config(env: &mut JNIEnv, config: JObject) -> Result<Config, Error> {
        UseChannelType::from_str(&use_channel.unwrap_or_default()).unwrap_or_default(),
        packet_loss_rate,
        packet_delay,
+        port_mapping,
    ) {
        Ok(config) => config,
        Err(e) => {
            env.throw_new(
                "java/lang/RuntimeException",
-                format!("vnt start error {}", e),
+                format!("vnt start error {:?}", e),
            )
            .expect("throw");
            return Err(Error::JavaException);
@@ -2,3 +2,4 @@ pub mod callback;
 pub mod config;
 pub mod utils;
 pub mod vnt;
+pub(crate) mod vnt_logger;
@@ -1,8 +1,9 @@
 use std::ptr;
+use std::time::Duration;

 use jni::errors::Error;
 use jni::objects::{JClass, JObject, JValue};
-use jni::sys::{jint, jlong, jobject, jobjectArray, jsize};
+use jni::sys::{jboolean, jint, jlong, jobject, jobjectArray, jsize};
 use jni::JNIEnv;

 use vnt::channel::Route;
@@ -10,7 +11,6 @@ use vnt::core::Vnt;
 use vnt::handle::PeerDeviceInfo;

 use crate::callback::CallBack;
-
 #[no_mangle]
 pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_new0(
    mut env: JNIEnv<'static>,
@@ -18,6 +18,7 @@ pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_new0(
    config: JObject,
    call_back: JObject<'static>,
 ) -> jlong {
+    crate::vnt_logger::init_log();
    let jvm = if let Ok(jvm) = env.get_java_vm() {
        jvm
    } else {
@@ -74,6 +75,16 @@ pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_wait0(
    let vnt = raw_vnt as *mut Vnt;
    let _ = (&*vnt).wait();
 }
+#[no_mangle]
+pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_waitTimeout0(
+    _env: JNIEnv,
+    _class: JClass,
+    raw_vnt: jlong,
+    time: jlong,
+) -> jboolean {
+    let vnt = raw_vnt as *mut Vnt;
+    (&*vnt).wait_timeout(Duration::from_millis(time as _)) as _
+}

 #[no_mangle]
 pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_drop0(
@@ -0,0 +1,12 @@
+#[cfg(target_os = "android")]
+pub fn init_log() {
+    use android_logger::Config;
+    use log::LevelFilter;
+    android_logger::init_once(
+        Config::default()
+            .with_max_level(LevelFilter::Info) // limit log level
+            .with_tag("vnt_jni"), // logs will show under mytag tag
+    );
+}
+#[cfg(not(target_os = "android"))]
+pub fn init_log() {}
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-tun= {path = "tun"}
+tun = { path = "tun" }
 packet = { path = "./packet" }
 bytes = "1.5.0"
 log = "0.4.17"
@@ -19,22 +19,25 @@ sha2 = { version = "0.10.6", features = ["oid"] }
 thiserror = "1.0.37"
 protobuf = "3.2.0"
 socket2 = { version = "0.5.2", features = ["all"] }
-aes-gcm = { version = "0.10.2",optional = true }
+aes-gcm = { version = "0.10.2", optional = true }
 ring = { version = "0.17.0", optional = true }
-cbc = {version = "0.1.2",optional = true}
-ecb = {version = "0.1.2",optional = true}
+cbc = { version = "0.1.2", optional = true }
+ecb = { version = "0.1.2", optional = true }
 aes = "0.8.3"
 stun-format = { version = "1.0.1", features = ["fmt", "rfc3489"] }
-rsa = { version = "0.9.2", features = [] ,optional = true}
-spki = { version = "0.7.2", features = ["fingerprint", "alloc","base64"] ,optional = true}
-openssl-sys = { git = "https://github.com/lbl8603/rust-openssl" ,optional = true}
-libsm = {git="https://github.com/lbl8603/libsm" ,optional = true}
+rsa = { version = "0.9.2", features = [], optional = true }
+spki = { version = "0.7.2", features = ["fingerprint", "alloc", "base64"], optional = true }
+openssl-sys = { git = "https://github.com/lbl8603/rust-openssl", optional = true }
+libsm = { git = "https://github.com/lbl8603/libsm", optional = true }

-mio = {version = "0.8.10",features = ["os-poll","net"]}
+mio = { version = "0.8.10", features = ["os-poll", "net"] }
 crossbeam-queue = "0.3.11"
 anyhow = "1.0.82"
 dns-parser = "0.8.0"

+tokio = { version = "1.37.0", features = ["full"], optional = true }
+
+
 [target.'cfg(target_os = "windows")'.dependencies]
 libloading = "0.8.0"

@@ -44,14 +47,15 @@ protobuf-codegen = "3.2.0"
 protoc-bin-vendored = "3.0.0"

 [features]
-default = ["server_encrypt","aes_gcm","aes_cbc","aes_ecb","sm4_cbc","ip_proxy"]
+default = ["server_encrypt", "aes_gcm", "aes_cbc", "aes_ecb", "sm4_cbc", "ip_proxy", "port_mapping"]
 openssl = ["openssl-sys"]
 # 从源码编译
 openssl-vendored = ["openssl-sys/vendored"]
 ring-cipher = ["ring"]
-aes_cbc=["cbc"]
-aes_ecb=["ecb"]
-sm4_cbc=["libsm"]
-aes_gcm=["aes-gcm"]
-server_encrypt =["aes-gcm","rsa","spki"]
-ip_proxy=[]
+aes_cbc = ["cbc"]
+aes_ecb = ["ecb"]
+sm4_cbc = ["libsm"]
+aes_gcm = ["aes-gcm"]
+server_encrypt = ["aes-gcm", "rsa", "spki"]
+ip_proxy = ["tokio"]
+port_mapping = ["tokio"]
@@ -81,6 +81,9 @@ impl<B: AsRef<[u8]> + AsMut<[u8]>> IpV4Packet<B> {
    pub fn set_flags(&mut self, flags: u8) {
        self.buffer.as_mut()[6] = (self.buffer.as_ref()[6] & 0b11100000) | (flags << 5)
    }
+    pub fn set_ttl(&mut self, ttl: u8) {
+        self.buffer.as_mut()[8] = ttl
+    }
    fn set_checksum(&mut self, value: u16) {
        self.header_mut()[10..12].copy_from_slice(&value.to_be_bytes())
    }
@@ -16,11 +16,11 @@ use crate::channel::{Route, RouteKey, UseChannelType, DEFAULT_RT};

 /// 传输通道上下文，持有udp socket、tcp socket和路由信息
 #[derive(Clone)]
-pub struct Context {
+pub struct ChannelContext {
    inner: Arc<ContextInner>,
 }

-impl Context {
+impl ChannelContext {
    pub fn new(
        main_udp_socket: Vec<UdpSocket>,
        use_channel_type: UseChannelType,
@@ -63,7 +63,7 @@ impl Context {
    }
 }

-impl Deref for Context {
+impl Deref for ChannelContext {
    type Target = ContextInner;

    fn deref(&self) -> &Self::Target {
@@ -324,7 +324,16 @@ impl RouteTable {
            } else {
                let len = v.len();
                if len != 0 {
-                    return Ok(v[index % len].0);
+                    let route = &v[index % len].0;
+                    // 跳过默认rt的路由(一般是刚加入的)，这有助于提升稳定性
+                    if route.rt != DEFAULT_RT {
+                        return Ok(*route);
+                    }
+                    for (route, _) in v {
+                        if route.rt != DEFAULT_RT {
+                            return Ok(*route);
+                        }
+                    }
                }
            }
        }
@@ -347,6 +356,15 @@ impl RouteTable {
            _ => {}
        }
        let key = route.route_key();
+        if only_if_absent {
+            if let Some((_, list)) = self.route_table.read().get(&id) {
+                for (x, _) in list {
+                    if x.route_key() == key {
+                        return;
+                    }
+                }
+            }
+        }
        let mut route_table = self.route_table.write();
        let (_, list) = route_table
            .entry(id)
@@ -1,6 +1,6 @@
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::RouteKey;

 pub trait RecvChannelHandler: Clone + Send + 'static {
-    fn handle(&mut self, buf: &mut [u8], route_key: RouteKey, context: &Context);
+    fn handle(&mut self, buf: &mut [u8], route_key: RouteKey, context: &ChannelContext);
 }
@@ -1,16 +1,16 @@
 use std::net::Ipv4Addr;
 use std::time::Duration;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::Route;

 pub struct Idle {
    read_idle: Duration,
-    context: Context,
+    context: ChannelContext,
 }

 impl Idle {
-    pub fn new(read_idle: Duration, context: Context) -> Self {
+    pub fn new(read_idle: Duration, context: ChannelContext) -> Self {
        Self { read_idle, context }
    }
 }
@@ -1,13 +1,13 @@
-use std::io;
+use anyhow::Context;
 use std::net::{SocketAddr, UdpSocket};
 use std::str::FromStr;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::handler::RecvChannelHandler;
 use crate::channel::sender::AcceptSocketSender;
 use crate::channel::tcp_channel::tcp_listen;
 use crate::channel::udp_channel::udp_listen;
-use crate::util::{io_convert, StopManager};
+use crate::util::StopManager;

 pub mod context;
 pub mod handler;
@@ -53,12 +53,6 @@ impl Default for UseChannelType {
        UseChannelType::All
    }
 }
-#[derive(Copy, Clone, Eq, PartialEq)]
-pub enum Status {
-    Cone,
-    Symmetric,
-    Close,
-}

 #[derive(Copy, Clone, Debug)]
 pub struct Route {
@@ -74,7 +68,7 @@ pub struct RouteSortKey {
    pub metric: u8,
    pub rt: i64,
 }
-const DEFAULT_RT: i64 = 999;
+const DEFAULT_RT: i64 = 9999;
 impl Route {
    pub fn new(is_tcp: bool, index: usize, addr: SocketAddr, metric: u8, rt: i64) -> Self {
        Self {
@@ -151,7 +145,7 @@ pub fn init_context(
    is_tcp: bool,
    packet_loss_rate: Option<f64>,
    packet_delay: u32,
-) -> io::Result<(Context, mio::net::TcpListener)> {
+) -> anyhow::Result<(ChannelContext, mio::net::TcpListener)> {
    assert!(!ports.is_empty(), "not channel");
    let mut udps = Vec::with_capacity(ports.len());
    //检查系统是否支持ipv6
@@ -167,9 +161,9 @@ pub fn init_context(
        let (socket, address) = if use_ipv6 {
            let address: SocketAddr = format!("[::]:{}", port).parse().unwrap();
            let socket = socket2::Socket::new(socket2::Domain::IPV6, socket2::Type::DGRAM, None)?;
-            io_convert(socket.set_only_v6(false), |_| {
-                format!("set_only_v6 failed: {}", &address)
-            })?;
+            socket
+                .set_only_v6(false)
+                .with_context(|| format!("set_only_v6 failed: {}", &address))?;
            (socket, address)
        } else {
            let address: SocketAddr = format!("0.0.0.0:{}", port).parse().unwrap();
@@ -178,20 +172,19 @@ pub fn init_context(
                address,
            )
        };
-
-        io_convert(socket.set_send_buffer_size(2 * 1024 * 1024), |_| {
-            format!("set_send_buffer_size failed: {}", &address)
-        })?;
-        io_convert(socket.set_recv_buffer_size(2 * 1024 * 1024), |_| {
-            format!("set_recv_buffer_size failed: {}", &address)
-        })?;
-        io_convert(socket.bind(&address.into()), |_| {
-            format!("bind failed: {}", &address)
-        })?;
+        if let Err(e) = socket.set_send_buffer_size(2 * 1024 * 1024) {
+            log::warn!("set_send_buffer_size {:?}", e);
+        }
+        if let Err(e) = socket.set_recv_buffer_size(2 * 1024 * 1024) {
+            log::warn!("set_send_buffer_size {:?}", e);
+        }
+        socket
+            .bind(&address.into())
+            .with_context(|| format!("bind failed: {}", &address))?;
        let main_channel: UdpSocket = socket.into();
        udps.push(main_channel);
    }
-    let context = Context::new(
+    let context = ChannelContext::new(
        udps,
        use_channel_type,
        first_latency,
@@ -206,9 +199,9 @@ pub fn init_context(
    let (socket, address) = if use_ipv6 {
        let address: SocketAddr = format!("[::]:{}", port).parse().unwrap();
        let socket = socket2::Socket::new(socket2::Domain::IPV6, socket2::Type::STREAM, None)?;
-        io_convert(socket.set_only_v6(false), |_| {
-            format!("set_only_v6 failed: {}", &address)
-        })?;
+        socket
+            .set_only_v6(false)
+            .with_context(|| format!("set_only_v6 failed: {}", &address))?;
        (socket, address)
    } else {
        let address: SocketAddr = format!("0.0.0.0:{}", port).parse().unwrap();
@@ -225,12 +218,12 @@ pub fn init_context(
            } else {
                format!("0.0.0.0:{}", port).parse().unwrap()
            };
-            io_convert(socket.bind(&address.into()), |_| {
-                format!("bind failed: {}", &address)
-            })?;
+            socket
+                .bind(&address.into())
+                .with_context(|| format!("bind failed: {}", &address))?;
        } else {
            //手动指定的ip,直接报错
-            io_convert(Err(e), |_| format!("bind failed: {}", &address))?;
+            Err(anyhow::anyhow!("{:?},bind failed: {}", e, address))?;
        }
    }
    socket.listen(128)?;
@@ -242,10 +235,10 @@ pub fn init_context(

 pub fn init_channel<H>(
    tcp_listener: mio::net::TcpListener,
-    context: Context,
+    context: ChannelContext,
    stop_manager: StopManager,
    recv_handler: H,
-) -> io::Result<(
+) -> anyhow::Result<(
    AcceptSocketSender<Option<Vec<mio::net::UdpSocket>>>,
    AcceptSocketSender<(mio::net::TcpStream, SocketAddr, Option<Vec<u8>>)>,
 )>
@@ -8,8 +8,10 @@ use mio::net::TcpStream;
 use rand::prelude::SliceRandom;
 use rand::Rng;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::sender::AcceptSocketSender;
+use crate::external_route::ExternalRoute;
+use crate::nat::NatTest;

 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum PunchModel {
@@ -101,7 +103,7 @@ impl NatInfo {
        if port != 0 {
            if let Some(public_port) = self.public_ports.get_mut(index) {
                if *public_port != port {
-                    log::info!("端口变化={}:{}", ip, port)
+                    log::info!("端口变化={}:{} index={}", ip, port, index)
                }
                *public_port = port;
            }
@@ -179,20 +181,24 @@ impl NatInfo {

 #[derive(Clone)]
 pub struct Punch {
-    context: Context,
+    context: ChannelContext,
    port_vec: Vec<u16>,
    port_index: HashMap<Ipv4Addr, usize>,
    punch_model: PunchModel,
    is_tcp: bool,
    tcp_socket_sender: AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
+    external_route: ExternalRoute,
+    nat_test: NatTest,
 }

 impl Punch {
    pub fn new(
-        context: Context,
+        context: ChannelContext,
        punch_model: PunchModel,
        is_tcp: bool,
        tcp_socket_sender: AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
+        external_route: ExternalRoute,
+        nat_test: NatTest,
    ) -> Self {
        let mut port_vec: Vec<u16> = (1..65535).collect();
        port_vec.push(65535);
@@ -205,12 +211,17 @@ impl Punch {
            punch_model,
            is_tcp,
            tcp_socket_sender,
+            external_route,
+            nat_test,
        }
    }
 }

 impl Punch {
    fn connect_tcp(&self, buf: &[u8], addr: SocketAddr) -> bool {
+        if self.nat_test.is_local_address(true, addr) {
+            return false;
+        }
        // mio是非阻塞的，不能立马判断是否能连接成功，所以用标准库的tcp
        match std::net::TcpStream::connect_timeout(&addr, Duration::from_millis(100)) {
            Ok(tcp_stream) => {
@@ -232,13 +243,26 @@ impl Punch {
        &mut self,
        buf: &[u8],
        id: Ipv4Addr,
-        nat_info: NatInfo,
+        mut nat_info: NatInfo,
        punch_tcp: bool,
    ) -> io::Result<()> {
        if self.context.route_table.no_need_punch(&id) {
            log::info!("已打洞成功,无需打洞:{:?}", id);
            return Ok(());
        }
+        nat_info
+            .public_ips
+            .retain(|ip| self.external_route.route(&ip).is_none());
+        nat_info
+            .local_ipv4
+            .filter(|ip| self.external_route.route(&ip).is_none());
+        nat_info.ipv6.filter(|ip| {
+            if let Some(ip) = ip.to_ipv4_mapped() {
+                self.external_route.route(&ip).is_none()
+            } else {
+                true
+            }
+        });
        if punch_tcp && self.is_tcp && nat_info.tcp_port != 0 {
            //向tcp发起连接
            if let Some(ipv6_addr) = nat_info.local_tcp_ipv6addr() {
@@ -263,17 +287,21 @@ impl Punch {
        let channel_num = self.context.channel_num();
        for index in 0..channel_num {
            if let Some(ipv4_addr) = nat_info.local_udp_ipv4addr(index) {
-                let _ = self.context.send_main_udp(index, buf, ipv4_addr);
+                if !self.nat_test.is_local_address(false, ipv4_addr) {
+                    let _ = self.context.send_main_udp(index, buf, ipv4_addr);
+                }
            }
        }

        if self.punch_model != PunchModel::IPv4 {
            for index in 0..channel_num {
                if let Some(ipv6_addr) = nat_info.local_udp_ipv6addr(index) {
-                    let rs = self.context.send_main_udp(index, buf, ipv6_addr);
-                    log::info!("发送到ipv6地址:{:?},rs={:?}", ipv6_addr, rs);
-                    if rs.is_ok() && self.punch_model == PunchModel::IPv6 {
-                        return Ok(());
+                    if !self.nat_test.is_local_address(false, ipv6_addr) {
+                        let rs = self.context.send_main_udp(index, buf, ipv6_addr);
+                        log::info!("发送到ipv6地址:{:?},rs={:?}", ipv6_addr, rs);
+                        if rs.is_ok() && self.punch_model == PunchModel::IPv6 {
+                            return Ok(());
+                        }
                    }
                }
            }
@@ -5,22 +5,22 @@ use std::sync::Arc;

 use mio::Token;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::notify::{AcceptNotify, WritableNotify};

 #[derive(Clone)]
 pub struct ChannelSender {
-    context: Context,
+    context: ChannelContext,
 }

 impl ChannelSender {
-    pub fn new(context: Context) -> Self {
+    pub fn new(context: ChannelContext) -> Self {
        Self { context }
    }
 }

 impl Deref for ChannelSender {
-    type Target = Context;
+    type Target = ChannelContext;

    fn deref(&self) -> &Self::Target {
        &self.context
@@ -15,7 +15,7 @@ use std::{io, thread};
 use mio::net::{TcpListener, TcpStream};
 use mio::{Events, Interest, Poll, Registry, Token, Waker};

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::handler::RecvChannelHandler;
 use crate::channel::notify::{AcceptNotify, WritableNotify};
 use crate::channel::sender::{AcceptSocketSender, PacketSender};
@@ -30,7 +30,7 @@ pub fn tcp_listen<H>(
    tcp_server: TcpListener,
    stop_manager: StopManager,
    recv_handler: H,
-    context: Context,
+    context: ChannelContext,
 ) -> io::Result<AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>>
 where
    H: RecvChannelHandler,
@@ -74,7 +74,7 @@ fn tcp_listen0<H>(
    accept_notify: AcceptNotify,
    accept_tcp_receiver: Receiver<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
    mut recv_handler: H,
-    context: Context,
+    context: ChannelContext,
 ) -> io::Result<()>
 where
    H: RecvChannelHandler,
@@ -158,7 +158,7 @@ where
 fn init_writable_handler(
    receiver: Receiver<(TcpStream, Token, SocketAddr, Option<Vec<u8>>)>,
    stop_manager: StopManager,
-    context: Context,
+    context: ChannelContext,
 ) -> io::Result<WritableNotify> {
    let poll = Poll::new()?;
    let writable_notify = WritableNotify::new(Waker::new(poll.registry(), NOTIFY)?);
@@ -190,7 +190,7 @@ fn tcp_writable_listen(
    receiver: Receiver<(TcpStream, Token, SocketAddr, Option<Vec<u8>>)>,
    mut poll: Poll,
    writable_notify: WritableNotify,
-    context: &Context,
+    context: &ChannelContext,
 ) -> io::Result<()> {
    let mut events = Events::with_capacity(1024);
    let mut write_map: HashMap<
@@ -338,7 +338,7 @@ fn readable_handle<H>(
    token: &Token,
    map: &mut HashMap<Token, (RouteKey, TcpStream, Box<[u8; BUFFER_SIZE]>, usize)>,
    recv_handler: &mut H,
-    context: &Context,
+    context: &ChannelContext,
 ) -> io::Result<()>
 where
    H: RecvChannelHandler,
@@ -447,7 +447,7 @@ fn closed_handle_w(
            Option<(Vec<u8>, usize)>,
        ),
    >,
-    context: &Context,
+    context: &ChannelContext,
 ) {
    if let Some((tcp, addr, _, _)) = map.remove(token) {
        context.tcp_map.write().remove(&addr);
@@ -6,7 +6,7 @@ use mio::event::Source;
 use mio::net::UdpSocket;
 use mio::{Events, Interest, Poll, Token, Waker};

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::handler::RecvChannelHandler;
 use crate::channel::notify::AcceptNotify;
 use crate::channel::sender::AcceptSocketSender;
@@ -16,7 +16,7 @@ use crate::util::StopManager;
 pub fn udp_listen<H>(
    stop_manager: StopManager,
    recv_handler: H,
-    context: Context,
+    context: ChannelContext,
 ) -> io::Result<AcceptSocketSender<Option<Vec<UdpSocket>>>>
 where
    H: RecvChannelHandler,
@@ -30,7 +30,7 @@ const NOTIFY: Token = Token(0);
 fn sub_udp_listen<H>(
    stop_manager: StopManager,
    recv_handler: H,
-    context: Context,
+    context: ChannelContext,
 ) -> io::Result<AcceptSocketSender<Option<Vec<UdpSocket>>>>
 where
    H: RecvChannelHandler,
@@ -61,7 +61,7 @@ where
 fn sub_udp_listen0<H>(
    mut poll: Poll,
    mut recv_handler: H,
-    context: Context,
+    context: ChannelContext,
    accept_notify: AcceptNotify,
    accept_receiver: Receiver<Option<Vec<UdpSocket>>>,
 ) -> io::Result<()>
@@ -205,7 +205,7 @@ where
 fn main_udp_listen<H>(
    stop_manager: StopManager,
    recv_handler: H,
-    context: Context,
+    context: ChannelContext,
 ) -> io::Result<()>
 where
    H: RecvChannelHandler,
@@ -231,7 +231,11 @@ where
    Ok(())
 }

-pub fn main_udp_listen0<H>(mut poll: Poll, mut recv_handler: H, context: Context) -> io::Result<()>
+pub fn main_udp_listen0<H>(
+    mut poll: Poll,
+    mut recv_handler: H,
+    context: ChannelContext,
+) -> io::Result<()>
 where
    H: RecvChannelHandler,
 {
@@ -1,5 +1,4 @@
 use std::collections::HashMap;
-use std::io;
 use std::net::Ipv4Addr;
 use std::sync::Arc;
 use std::time::Duration;
@@ -11,7 +10,7 @@ use rsa::signature::digest::Digest;
 #[cfg(not(target_os = "android"))]
 use tun::device::IFace;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::idle::Idle;
 use crate::channel::punch::{NatInfo, Punch};
 use crate::channel::{init_channel, init_context, Route, RouteKey};
@@ -40,7 +39,7 @@ pub struct Vnt {
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
    nat_test: NatTest,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
-    context: Context,
+    context: ChannelContext,
    peer_nat_info_map: Arc<RwLock<HashMap<Ipv4Addr, NatInfo>>>,
    down_count_watcher: WatchU64Adder,
    up_count_watcher: WatchSingleU64Adder,
@@ -48,7 +47,7 @@ pub struct Vnt {
 }

 impl Vnt {
-    pub fn new<Call: VntCallback>(config: Config, callback: Call) -> io::Result<Self> {
+    pub fn new<Call: VntCallback>(config: Config, callback: Call) -> anyhow::Result<Self> {
        log::info!("config:{:?}", config);
        //服务端非对称加密
        #[cfg(feature = "server_encrypt")]
@@ -94,13 +93,27 @@ impl Vnt {
            config.server_address_str.clone(),
            config.name_servers.clone(),
        );
-        let ports = config.ports.as_ref().map_or(vec![0, 0], |v| {
+        // 服务停止管理器
+        let stop_manager = {
+            let callback = callback.clone();
+            StopManager::new(move || callback.stop())
+        };
+        #[cfg(feature = "port_mapping")]
+        crate::port_mapping::start_port_mapping(
+            stop_manager.clone(),
+            config.port_mapping_list.clone(),
+        )?;
+        let mut ports = config.ports.as_ref().map_or(vec![0, 0], |v| {
            if v.is_empty() {
                vec![0, 0]
            } else {
                v.clone()
            }
        });
+        if config.use_channel_type.is_only_relay() {
+            //中继模式下只监听一个端口就够了
+            ports.truncate(1);
+        }
        //通道上下文
        let (context, tcp_listener) = init_context(
            ports,
@@ -132,11 +145,6 @@ impl Vnt {
            callback.create_tun(tun_info);
            device
        };
-        // 服务停止管理器
-        let stop_manager = {
-            let callback = callback.clone();
-            StopManager::new(move || callback.stop())
-        };
        // 定时器
        let scheduler = Scheduler::new(stop_manager.clone())?;
        let external_route = ExternalRoute::new(config.in_ips.clone());
@@ -146,7 +154,6 @@ impl Vnt {
        let proxy_map = if !config.out_ips.is_empty() && !config.no_proxy {
            Some(crate::ip_proxy::init_proxy(
                context.clone(),
-                scheduler.clone(),
                stop_manager.clone(),
                current_device.clone(),
                client_cipher.clone(),
@@ -211,6 +218,8 @@ impl Vnt {
            config.punch_model,
            config.tcp,
            tcp_socket_sender.clone(),
+            external_route.clone(),
+            nat_test.clone(),
        );

        #[cfg(not(target_os = "android"))]
@@ -280,7 +289,7 @@ impl Vnt {

 pub fn start<Call: VntCallback>(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    nat_test: NatTest,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
@@ -322,15 +331,17 @@ pub fn start<Call: VntCallback>(
            client_cipher.clone(),
        );
    }
-    // 定时地址探测
-    maintain::addr_request(
-        &scheduler,
-        context.clone(),
-        current_device.clone(),
-        server_cipher.clone(),
-        config_info.clone(),
-    );
+
    if !context.use_channel_type().is_only_relay() {
+        // 定时地址探测
+        maintain::addr_request(
+            &scheduler,
+            context.clone(),
+            current_device.clone(),
+            server_cipher.clone(),
+            nat_test.clone(),
+            config_info.clone(),
+        );
        // 定时打洞
        maintain::punch(
            &scheduler,
@@ -407,4 +418,10 @@ impl Vnt {
    pub fn wait(&self) {
        self.stop_manager.wait()
    }
+    pub fn wait_timeout(&self, dur: Duration) -> bool {
+        self.stop_manager.wait_timeout(dur)
+    }
+    pub fn config(&self) -> &Config {
+        &self.config
+    }
 }
@@ -13,7 +13,7 @@ mod conn;

 #[derive(Clone, Debug)]
 pub struct Config {
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    #[cfg(target_os = "windows")]
    pub tap: bool,
    pub token: String,
    pub device_id: String,
@@ -43,18 +43,21 @@ pub struct Config {
    //控制丢包率
    pub packet_loss_rate: Option<f64>,
    pub packet_delay: u32,
+    // 端口映射
+    #[cfg(feature = "port_mapping")]
+    pub port_mapping_list: Vec<(bool, SocketAddr, String)>,
 }

 impl Config {
    pub fn new(
-        #[cfg(any(target_os = "windows", target_os = "linux"))] tap: bool,
+        #[cfg(target_os = "windows")] tap: bool,
        token: String,
        device_id: String,
        name: String,
        server_address_str: String,
        mut name_servers: Vec<String>,
        mut stun_server: Vec<String>,
-        in_ips: Vec<(u32, u32, Ipv4Addr)>,
+        mut in_ips: Vec<(u32, u32, Ipv4Addr)>,
        out_ips: Vec<(u32, u32)>,
        password: Option<String>,
        mtu: Option<u32>,
@@ -72,6 +75,8 @@ impl Config {
        use_channel_type: UseChannelType,
        packet_loss_rate: Option<f64>,
        packet_delay: u32,
+        // 例如 [udp:127.0.0.1:80->10.26.0.10:8080,tcp:127.0.0.1:80->10.26.0.10:8080]
+        #[cfg(feature = "port_mapping")] port_mapping_list: Vec<String>,
    ) -> anyhow::Result<Self> {
        for x in stun_server.iter_mut() {
            if !x.contains(":") {
@@ -94,14 +99,17 @@ impl Config {
        if name.is_empty() || name.len() > 128 {
            return Err(anyhow!("name too long"));
        }
-        if name_servers.is_empty() {
-            name_servers.push("114.114.114.114:53".to_string());
-            name_servers.push("8.8.8.8:53".to_string());
-        }
        let server_address =
            address_choose(dns_query_all(&server_address_str, name_servers.clone())?)?;
+        #[cfg(feature = "port_mapping")]
+        let port_mapping_list = crate::port_mapping::convert(port_mapping_list)?;
+
+        for (dest, mask, _) in &mut in_ips {
+            *dest = *mask & *dest;
+        }
+        in_ips.sort_by(|(dest1, _, _), (dest2, _, _)| dest2.cmp(dest1));
        Ok(Self {
-            #[cfg(any(target_os = "windows", target_os = "linux"))]
+            #[cfg(target_os = "windows")]
            tap,
            token,
            device_id,
@@ -130,6 +138,8 @@ impl Config {
            use_channel_type,
            packet_loss_rate,
            packet_delay,
+            #[cfg(feature = "port_mapping")]
+            port_mapping_list,
        })
    }
 }
@@ -1,15 +1,18 @@
 use std::net::Ipv4Addr;
 use std::sync::Arc;

-// 目标ip，子网掩码，网关
-
+// 目标网段，子网掩码，网关
 #[derive(Clone)]
 pub struct ExternalRoute {
    route_table: Vec<(u32, u32, Ipv4Addr)>,
 }

 impl ExternalRoute {
-    pub fn new(route_table: Vec<(u32, u32, Ipv4Addr)>) -> Self {
+    pub fn new(mut route_table: Vec<(u32, u32, Ipv4Addr)>) -> Self {
+        for (dest, mask, _) in &mut route_table {
+            *dest = *mask & *dest;
+        }
+        route_table.sort_by(|(dest1, _, _), (dest2, _, _)| dest2.cmp(dest1));
        Self { route_table }
    }
    pub fn route(&self, ip: &Ipv4Addr) -> Option<Ipv4Addr> {
@@ -18,7 +21,7 @@ impl ExternalRoute {
        }
        let ip = u32::from_be_bytes(ip.octets());
        for (dest, mask, gateway) in self.route_table.iter() {
-            if *mask & ip == *mask & *dest {
+            if *mask & ip == *dest {
                return Some(*gateway);
            }
        }
@@ -27,18 +30,23 @@ impl ExternalRoute {
    pub fn to_route(&self) -> Vec<(Ipv4Addr, Ipv4Addr)> {
        self.route_table
            .iter()
-            .map(|(dest, mask, _)| (Ipv4Addr::from(*dest & *mask), Ipv4Addr::from(*mask)))
+            .map(|(dest, mask, _)| (Ipv4Addr::from(*dest), Ipv4Addr::from(*mask)))
            .collect::<Vec<(Ipv4Addr, Ipv4Addr)>>()
    }
 }

+// 目标网段，子网掩码
 #[derive(Clone)]
 pub struct AllowExternalRoute {
    route_table: Arc<Vec<(u32, u32)>>,
 }

 impl AllowExternalRoute {
-    pub fn new(route_table: Vec<(u32, u32)>) -> Self {
+    pub fn new(mut route_table: Vec<(u32, u32)>) -> Self {
+        for (dest, mask) in &mut route_table {
+            *dest = *mask & *dest;
+        }
+        route_table.sort_by(|(dest1, _), (dest2, _)| dest2.cmp(dest1));
        Self {
            route_table: Arc::new(route_table),
        }
@@ -7,7 +7,7 @@ use crossbeam_utils::atomic::AtomicCell;
 use parking_lot::Mutex;
 use protobuf::Message;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 #[cfg(feature = "server_encrypt")]
 use crate::cipher::RsaCipher;
 use crate::handle::{GATEWAY_IP, SELF_IP};
@@ -16,7 +16,7 @@ use crate::proto::message::HandshakeRequest;
 use crate::proto::message::SecretHandshakeRequest;
 #[cfg(feature = "server_encrypt")]
 use crate::protocol::body::RSA_ENCRYPTION_RESERVED;
-use crate::protocol::{service_packet, NetPacket, Protocol, Version, MAX_TTL};
+use crate::protocol::{service_packet, NetPacket, Protocol, MAX_TTL};

 pub enum HandshakeEnum {
    NotSecret,
@@ -37,7 +37,7 @@ impl Handshake {
            rsa_cipher,
        }
    }
-    pub fn send(&self, context: &Context, secret: bool, addr: SocketAddr) -> io::Result<()> {
+    pub fn send(&self, context: &ChannelContext, secret: bool, addr: SocketAddr) -> io::Result<()> {
        let last = self.time.load();
        //短时间不重复发送
        if last.elapsed() < Duration::from_secs(3) {
@@ -65,7 +65,7 @@ impl Handshake {
        })?;
        let buf = vec![0u8; 12 + bytes.len()];
        let mut net_packet = NetPacket::new(buf)?;
-        net_packet.set_version(Version::V1);
+        net_packet.set_default_version();
        net_packet.set_gateway_flag(true);
        net_packet.set_destination(GATEWAY_IP);
        net_packet.set_source(SELF_IP);
@@ -97,7 +97,7 @@ pub fn secret_handshake_request_packet(
        12 + bytes.len(),
        vec![0u8; 12 + bytes.len() + RSA_ENCRYPTION_RESERVED],
    )?;
-    net_packet.set_version(Version::V1);
+    net_packet.set_default_version();
    net_packet.set_gateway_flag(true);
    net_packet.set_destination(GATEWAY_IP);
    net_packet.set_source(SELF_IP);
@@ -3,18 +3,21 @@ use std::time::Duration;

 use crossbeam_utils::atomic::AtomicCell;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
+use crate::channel::punch::NatType;
 use crate::cipher::Cipher;
 use crate::handle::{BaseConfigInfo, CurrentDeviceInfo};
+use crate::nat::NatTest;
 use crate::protocol::body::ENCRYPTION_RESERVED;
-use crate::protocol::{control_packet, NetPacket, Protocol, Version, MAX_TTL};
+use crate::protocol::{control_packet, NetPacket, Protocol, MAX_TTL};
 use crate::util::Scheduler;

 pub fn addr_request(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
    server_cipher: Cipher,
+    nat_test: NatTest,
    _config: BaseConfigInfo,
 ) {
    pub_address_request(
@@ -22,46 +25,83 @@ pub fn addr_request(
        context,
        current_device_info.clone(),
        server_cipher,
+        nat_test,
+        0,
    );
 }
-pub fn pub_address_request(
+
+fn pub_address_request(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
    server_cipher: Cipher,
+    nat_test: NatTest,
+    count: usize,
 ) {
-    addr_request0(&context, &current_device_info, &server_cipher);
-    // 9秒发送一次
-    let rs = scheduler.timeout(Duration::from_secs(9), |s| {
-        pub_address_request(s, context, current_device_info, server_cipher)
+    let channel_num = context.channel_num();
+    let index = count % channel_num;
+    let mut time = if index == channel_num - 1 { 19 } else { 1 };
+    if let Err(e) = addr_request0(
+        &context,
+        &current_device_info,
+        &server_cipher,
+        &nat_test,
+        index,
+    ) {
+        log::warn!("{:?}", e);
+    }
+    let nat_info = nat_test.nat_info();
+    if nat_info.nat_type == NatType::Symmetric {
+        //对称网络探测端口没啥作用，把频率放低，（锥形网络也只在打洞前需要探测端口，后续可以改改）
+        if !nat_info.public_ports.contains(&0) && !nat_info.public_ips.is_empty() {
+            time = 600;
+        }
+    }
+
+    let rs = scheduler.timeout(Duration::from_secs(time), move |s| {
+        pub_address_request(
+            s,
+            context,
+            current_device_info,
+            server_cipher,
+            nat_test,
+            index + 1,
+        )
    });
    if !rs {
        log::info!("定时任务停止");
    }
 }

-pub fn addr_request0(
-    context: &Context,
+fn addr_request0(
+    context: &ChannelContext,
    current_device: &AtomicCell<CurrentDeviceInfo>,
    server_cipher: &Cipher,
-) {
+    nat_test: &NatTest,
+    index: usize,
+) -> anyhow::Result<()> {
    let current_dev = current_device.load();
-    if current_dev.connect_server.is_ipv4() && current_dev.status.online() {
+    if current_dev.status.offline() {
+        return Ok(());
+    }
+
+    if current_dev.connect_server.is_ipv4() && !context.is_main_tcp() {
        // 如果连接的是ipv4服务，则探测公网端口
        let gateway_ip = current_dev.virtual_gateway;
        let src_ip = current_dev.virtual_ip;
        let mut packet = NetPacket::new_encrypt([0; 12 + ENCRYPTION_RESERVED]).unwrap();
-        packet.set_version(Version::V1);
+        packet.set_default_version();
        packet.set_gateway_flag(true);
        packet.set_protocol(Protocol::Control);
        packet.set_transport_protocol(control_packet::Protocol::AddrRequest.into());
        packet.first_set_ttl(MAX_TTL);
        packet.set_source(src_ip);
        packet.set_destination(gateway_ip);
-        if let Err(e) = server_cipher.encrypt_ipv4(&mut packet) {
-            log::warn!("AddrRequest err={:?}", e)
-        } else {
-            context.try_send_all_main(packet.buffer(), current_dev.connect_server);
-        }
+        server_cipher.encrypt_ipv4(&mut packet)?;
+        context.send_main_udp(index, packet.buffer(), current_dev.connect_server)?;
+    } else {
+        let (data, addr) = nat_test.send_data()?;
+        context.send_main_udp(index, &data, addr)?;
    }
+    Ok(())
 }
@@ -7,18 +7,18 @@ use crossbeam_utils::atomic::AtomicCell;
 use parking_lot::Mutex;
 use rand::prelude::SliceRandom;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::cipher::Cipher;
 use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
 use crate::protocol::body::ENCRYPTION_RESERVED;
 use crate::protocol::control_packet::PingPacket;
-use crate::protocol::{control_packet, NetPacket, Protocol, Version};
+use crate::protocol::{control_packet, NetPacket, Protocol};
 use crate::util::Scheduler;

 /// 定时发送心跳包
 pub fn heartbeat(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
    client_cipher: Cipher,
@@ -48,7 +48,7 @@ pub fn heartbeat(
 }

 fn heartbeat0(
-    context: &Context,
+    context: &ChannelContext,
    current_device: &CurrentDeviceInfo,
    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
    client_cipher: &Cipher,
@@ -125,7 +125,7 @@ fn heartbeat0(
 /// 客户端中继路径探测,延迟启动
 pub fn client_relay(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
    client_cipher: Cipher,
@@ -141,7 +141,7 @@ pub fn client_relay(
 /// 客户端中继路径探测,每30秒探测一次
 fn client_relay_(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
    client_cipher: Cipher,
@@ -163,7 +163,7 @@ fn client_relay_(
 }

 fn client_relay0(
-    context: &Context,
+    context: &ChannelContext,
    current_device: &CurrentDeviceInfo,
    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
    client_cipher: &Cipher,
@@ -213,7 +213,7 @@ fn heartbeat_packet(
    dest: Ipv4Addr,
 ) -> io::Result<NetPacket<[u8; 12 + 4 + ENCRYPTION_RESERVED]>> {
    let mut net_packet = NetPacket::new_encrypt([0u8; 12 + 4 + ENCRYPTION_RESERVED])?;
-    net_packet.set_version(Version::V1);
+    net_packet.set_default_version();
    net_packet.set_protocol(Protocol::Control);
    net_packet.set_transport_protocol(control_packet::Protocol::Ping.into());
    net_packet.first_set_ttl(5);
@@ -6,7 +6,7 @@ use std::time::Duration;
 use crossbeam_utils::atomic::AtomicCell;
 use mio::net::TcpStream;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::idle::{Idle, IdleType};
 use crate::channel::sender::AcceptSocketSender;
 use crate::handle::callback::{ConnectInfo, ErrorType};
@@ -18,7 +18,7 @@ use crate::{ErrorInfo, VntCallback};
 pub fn idle_route<Call: VntCallback>(
    scheduler: &Scheduler,
    idle: Idle,
-    context: Context,
+    context: ChannelContext,
    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
    call: Call,
 ) {
@@ -33,7 +33,7 @@ pub fn idle_route<Call: VntCallback>(

 pub fn idle_gateway<Call: VntCallback>(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
    config: BaseConfigInfo,
    tcp_socket_sender: AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
@@ -68,7 +68,7 @@ pub fn idle_gateway<Call: VntCallback>(
 }

 fn idle_gateway0<Call: VntCallback>(
-    context: &Context,
+    context: &ChannelContext,
    current_device: &AtomicCell<CurrentDeviceInfo>,
    config: &BaseConfigInfo,
    tcp_socket_sender: &AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
@@ -95,7 +95,7 @@ fn idle_gateway0<Call: VntCallback>(

 fn idle_route0<Call: VntCallback>(
    idle: &Idle,
-    context: &Context,
+    context: &ChannelContext,
    current_device: &AtomicCell<CurrentDeviceInfo>,
    call: &Call,
 ) -> Duration {
@@ -117,7 +117,7 @@ fn idle_route0<Call: VntCallback>(
 }

 fn check_gateway_channel<Call: VntCallback>(
-    context: &Context,
+    context: &ChannelContext,
    current_device_info: &AtomicCell<CurrentDeviceInfo>,
    config: &BaseConfigInfo,
    tcp_socket_sender: &AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
@@ -6,7 +6,7 @@ mod re_nat_type;
 pub use re_nat_type::retrieve_nat_type;

 mod addr_request;
-pub use addr_request::addr_request;
+pub use addr_request::*;

 mod punch;
 pub use punch::*;
@@ -10,14 +10,14 @@ use parking_lot::Mutex;
 use protobuf::Message;
 use rand::prelude::SliceRandom;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::punch::{NatInfo, NatType, Punch};
 use crate::cipher::Cipher;
 use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
 use crate::nat::NatTest;
 use crate::proto::message::{PunchInfo, PunchNatType};
 use crate::protocol::body::ENCRYPTION_RESERVED;
-use crate::protocol::{control_packet, other_turn_packet, NetPacket, Protocol, Version, MAX_TTL};
+use crate::protocol::{control_packet, other_turn_packet, NetPacket, Protocol, MAX_TTL};
 use crate::util::Scheduler;

 #[derive(Clone)]
@@ -86,7 +86,7 @@ pub fn punch_channel() -> (PunchSender, PunchReceiver) {

 pub fn punch(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    nat_test: NatTest,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
@@ -135,7 +135,7 @@ fn punch_start(
 ) {
    while let Ok((peer_ip, nat_info)) = receiver.recv() {
        let mut packet = NetPacket::new_encrypt([0u8; 12 + ENCRYPTION_RESERVED]).unwrap();
-        packet.set_version(Version::V1);
+        packet.set_default_version();
        packet.first_set_ttl(1);
        packet.set_protocol(Protocol::Control);
        packet.set_transport_protocol(control_packet::Protocol::PunchRequest.into());
@@ -166,7 +166,7 @@ fn punch_start(
 /// 定时发起打洞请求
 fn punch_request(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    nat_test: NatTest,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
@@ -214,7 +214,7 @@ fn punch_request(

 /// 随机对需要打洞的客户端发起打洞请求
 fn punch0(
-    context: &Context,
+    context: &ChannelContext,
    nat_test: &NatTest,
    device_list: &Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
    current_device: CurrentDeviceInfo,
@@ -322,7 +322,7 @@ fn punch_packet(
        .write_to_bytes()
        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("punch_packet {:?}", e)))?;
    let mut net_packet = NetPacket::new_encrypt(vec![0u8; 12 + bytes.len() + ENCRYPTION_RESERVED])?;
-    net_packet.set_version(Version::V1);
+    net_packet.set_default_version();
    net_packet.set_protocol(Protocol::OtherTurn);
    net_packet.set_transport_protocol(other_turn_packet::Protocol::Punch.into());
    net_packet.first_set_ttl(MAX_TTL);
@@ -1,7 +1,7 @@
 use std::thread;
 use std::time::Duration;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::sender::AcceptSocketSender;
 use crate::nat;
 use crate::nat::NatTest;
@@ -10,7 +10,7 @@ use crate::util::Scheduler;
 /// 10分钟探测一次nat
 pub fn retrieve_nat_type(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    nat_test: NatTest,
    udp_socket_sender: AcceptSocketSender<Option<Vec<mio::net::UdpSocket>>>,
 ) {
@@ -21,7 +21,7 @@ pub fn retrieve_nat_type(
 }

 fn retrieve_nat_type0(
-    context: Context,
+    context: ChannelContext,
    nat_test: NatTest,
    udp_socket_sender: AcceptSocketSender<Option<Vec<mio::net::UdpSocket>>>,
 ) {
@@ -1,8 +1,8 @@
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::handle::CurrentDeviceInfo;
 use crate::proto::message::{ClientStatusInfo, PunchNatType, RouteItem};
 use crate::protocol::body::ENCRYPTION_RESERVED;
-use crate::protocol::{service_packet, NetPacket, Protocol, Version, HEAD_LEN, MAX_TTL};
+use crate::protocol::{service_packet, NetPacket, Protocol, HEAD_LEN, MAX_TTL};
 use crate::util::{Scheduler, WatchSingleU64Adder, WatchU64Adder};
 use crossbeam_utils::atomic::AtomicCell;
 use protobuf::Message;
@@ -13,7 +13,7 @@ use std::time::Duration;
 /// 上报状态给服务器
 pub fn up_status(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
    down_count_watcher: WatchU64Adder,
    up_count_watcher: WatchSingleU64Adder,
@@ -31,7 +31,7 @@ pub fn up_status(

 fn up_status0(
    scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
    down_count_watcher: WatchU64Adder,
    up_count_watcher: WatchSingleU64Adder,
@@ -59,7 +59,7 @@ fn up_status0(
 }

 fn send_up_status_packet(
-    context: &Context,
+    context: &ChannelContext,
    current_device_info: &AtomicCell<CurrentDeviceInfo>,
    down_count_watcher: &WatchU64Adder,
    up_count_watcher: &WatchSingleU64Adder,
@@ -91,7 +91,7 @@ fn send_up_status_packet(
        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("up_status_packet {:?}", e)))?;
    let mut net_packet =
        NetPacket::new_encrypt(vec![0; HEAD_LEN + buf.len() + ENCRYPTION_RESERVED])?;
-    net_packet.set_version(Version::V1);
+    net_packet.set_default_version();
    net_packet.set_gateway_flag(true);
    net_packet.set_protocol(Protocol::Service);
    net_packet.set_transport_protocol_into(service_packet::Protocol::ClientStatusInfo);
@@ -9,7 +9,7 @@ use packet::icmp::{icmp, Kind};
 use packet::ip::ipv4;
 use packet::ip::ipv4::packet::IpV4Packet;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::punch::NatInfo;
 use crate::channel::{Route, RouteKey};
 use crate::cipher::Cipher;
@@ -24,11 +24,12 @@ use crate::proto::message::{PunchInfo, PunchNatType};
 use crate::protocol::body::ENCRYPTION_RESERVED;
 use crate::protocol::control_packet::ControlPacket;
 use crate::protocol::{
-    control_packet, ip_turn_packet, other_turn_packet, NetPacket, Protocol, Version, MAX_TTL,
+    control_packet, ip_turn_packet, other_turn_packet, NetPacket, Protocol, MAX_TTL,
 };
 use crate::tun_tap_device::tun_create_helper::DeviceAdapter;
 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 use tun::device::IFace;
+
 /// 处理来源于客户端的包
 #[derive(Clone)]
 pub struct ClientPacketHandler {
@@ -70,7 +71,7 @@ impl PacketHandler for ClientPacketHandler {
        &self,
        mut net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
    ) -> io::Result<()> {
        self.client_cipher.decrypt_ipv4(&mut net_packet)?;
@@ -99,7 +100,7 @@ impl ClientPacketHandler {
    fn ip_turn(
        &self,
        mut net_packet: NetPacket<&mut [u8]>,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
        route_key: RouteKey,
    ) -> io::Result<()> {
@@ -142,6 +143,31 @@ impl ClientPacketHandler {
                        //拦截不符合的目标
                        return Ok(());
                    }
+                    match ipv4.protocol() {
+                        ipv4::protocol::Protocol::Tcp => {
+                            let payload = ipv4.payload();
+                            if payload.len() < 20 {
+                                return Ok(());
+                            }
+                            let destination_port =
+                                u16::from_be_bytes(payload[2..4].try_into().unwrap());
+                            if self.nat_test.is_local_tcp(real_dest, destination_port) {
+                                return Ok(());
+                            }
+                        }
+                        ipv4::protocol::Protocol::Udp => {
+                            let payload = ipv4.payload();
+                            if payload.len() < 8 {
+                                return Ok(());
+                            }
+                            let destination_port =
+                                u16::from_be_bytes(payload[2..4].try_into().unwrap());
+                            if self.nat_test.is_local_udp(real_dest, destination_port) {
+                                return Ok(());
+                            }
+                        }
+                        _ => {}
+                    }
                    #[cfg(feature = "ip_proxy")]
                    if let Some(ip_proxy_map) = &self.ip_proxy_map {
                        if ip_proxy_map.recv_handle(&mut ipv4, source, destination)? {
@@ -160,7 +186,7 @@ impl ClientPacketHandler {
    }
    fn control(
        &self,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
        mut net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
@@ -192,6 +218,14 @@ impl ClientPacketHandler {
                if context.use_channel_type().is_only_relay() {
                    return Ok(());
                }
+                //忽略掉来源于自己的包
+                if self
+                    .nat_test
+                    .is_local_address(route_key.is_tcp(), route_key.addr)
+                {
+                    return Ok(());
+                }
+
                //回应
                net_packet.set_transport_protocol(control_packet::Protocol::PunchResponse.into());
                net_packet.set_source(current_device.virtual_ip);
@@ -199,21 +233,28 @@ impl ClientPacketHandler {
                net_packet.first_set_ttl(1);
                self.client_cipher.encrypt_ipv4(&mut net_packet)?;
                context.send_by_key(net_packet.buffer(), route_key)?;
-                let route = Route::from_default_rt(route_key, 1);
-                context.route_table.add_route_if_absent(source, route);
+                // 收到PunchRequest就添加路由，会导致单向通信的问题，删掉试试
+                // let route = Route::from_default_rt(route_key, 1);
+                // context.route_table.add_route_if_absent(source, route);
            }
            ControlPacket::PunchResponse => {
                log::info!("PunchResponse={:?},source={}", route_key, source);
                if context.use_channel_type().is_only_relay() {
                    return Ok(());
                }
+                if self
+                    .nat_test
+                    .is_local_address(route_key.is_tcp(), route_key.addr)
+                {
+                    return Ok(());
+                }
                let route = Route::from_default_rt(route_key, 1);
                context.route_table.add_route_if_absent(source, route);
            }
            ControlPacket::AddrRequest => match route_key.addr.ip() {
                std::net::IpAddr::V4(ipv4) => {
                    let mut packet = NetPacket::new_encrypt([0; 12 + 6 + ENCRYPTION_RESERVED])?;
-                    packet.set_version(Version::V1);
+                    packet.set_default_version();
                    packet.set_protocol(Protocol::Control);
                    packet.set_transport_protocol(control_packet::Protocol::AddrResponse.into());
                    packet.first_set_ttl(MAX_TTL);
@@ -233,7 +274,7 @@ impl ClientPacketHandler {
    }
    fn other_turn(
        &self,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
        net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
@@ -312,7 +353,7 @@ impl ClientPacketHandler {
                    })?;
                    let mut punch_packet =
                        NetPacket::new_encrypt(vec![0u8; 12 + bytes.len() + ENCRYPTION_RESERVED])?;
-                    punch_packet.set_version(Version::V1);
+                    punch_packet.set_default_version();
                    punch_packet.set_protocol(Protocol::OtherTurn);
                    punch_packet.set_transport_protocol(other_turn_packet::Protocol::Punch.into());
                    punch_packet.first_set_ttl(MAX_TTL);
@@ -6,7 +6,7 @@ use std::{io, thread};
 use crossbeam_utils::atomic::AtomicCell;
 use parking_lot::{Mutex, RwLock};

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::handler::RecvChannelHandler;
 use crate::channel::punch::NatInfo;
 use crate::channel::RouteKey;
@@ -39,10 +39,22 @@ pub struct RecvDataHandler<Call> {
    client: ClientPacketHandler,
    server: ServerPacketHandler<Call>,
    counter: U64Adder,
+    nat_test: NatTest,
 }

 impl<Call: VntCallback> RecvChannelHandler for RecvDataHandler<Call> {
-    fn handle(&mut self, buf: &mut [u8], route_key: RouteKey, context: &Context) {
+    fn handle(&mut self, buf: &mut [u8], route_key: RouteKey, context: &ChannelContext) {
+        //判断stun响应包
+        if !route_key.is_tcp() {
+            if let Ok(rs) = self
+                .nat_test
+                .recv_data(route_key.index(), route_key.addr, buf)
+            {
+                if rs {
+                    return;
+                }
+            }
+        }
        if let Err(e) = self.handle0(buf, route_key, context) {
            log::error!("[{}]-{:?}", thread::current().name().unwrap_or(""), e);
        }
@@ -78,7 +90,7 @@ impl<Call: VntCallback> RecvDataHandler<Call> {
            config_info,
            nat_test.clone(),
            callback,
-            external_route,
+            external_route.clone(),
            handshake,
        );
        let client = ClientPacketHandler::new(
@@ -86,7 +98,7 @@ impl<Call: VntCallback> RecvDataHandler<Call> {
            client_cipher,
            punch_sender,
            peer_nat_info_map,
-            nat_test,
+            nat_test.clone(),
            route,
            #[cfg(feature = "ip_proxy")]
            ip_proxy_map,
@@ -98,13 +110,14 @@ impl<Call: VntCallback> RecvDataHandler<Call> {
            client,
            server,
            counter,
+            nat_test,
        }
    }
    fn handle0(
        &mut self,
        buf: &mut [u8],
        route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
    ) -> io::Result<()> {
        // 统计流量
        self.counter.add(buf.len() as _);
@@ -145,7 +158,7 @@ pub trait PacketHandler {
        &self,
        net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
    ) -> io::Result<()>;
 }
@@ -12,7 +12,7 @@ use packet::icmp::{icmp, Kind};
 use packet::ip::ipv4;
 use packet::ip::ipv4::packet::IpV4Packet;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::{Route, RouteKey};
 use crate::cipher::Cipher;
 #[cfg(feature = "server_encrypt")]
@@ -31,7 +31,7 @@ use crate::proto::message::{DeviceList, HandshakeResponse, RegistrationResponse}
 use crate::protocol::body::ENCRYPTION_RESERVED;
 use crate::protocol::control_packet::ControlPacket;
 use crate::protocol::error_packet::InErrorPacket;
-use crate::protocol::{ip_turn_packet, service_packet, NetPacket, Protocol, Version, MAX_TTL};
+use crate::protocol::{ip_turn_packet, service_packet, NetPacket, Protocol, MAX_TTL};
 use crate::tun_tap_device::tun_create_helper::DeviceAdapter;
 use crate::{proto, PeerClientInfo};
 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
@@ -95,7 +95,7 @@ impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
        &self,
        mut net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
    ) -> io::Result<()> {
        context
@@ -248,7 +248,7 @@ impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
 impl<Call: VntCallback> ServerPacketHandler<Call> {
    fn service(
        &self,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
        net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
@@ -320,8 +320,7 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                                    "device_fd == 0".into(),
                                ));
                            } else {
-                                let device = Arc::new(tun::Device::new(device_fd as _)?);
-                                if let Err(e) = self.device.start(device) {
+                                if let Err(e) = self.device.start(device_fd as _) {
                                    self.callback.error(ErrorInfo::new_msg(
                                        ErrorType::Unknown,
                                        format!("{:?}", e),
@@ -435,7 +434,11 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                .collect(),
        );
    }
-    fn register(&self, current_device: &CurrentDeviceInfo, context: &Context) -> io::Result<()> {
+    fn register(
+        &self,
+        current_device: &CurrentDeviceInfo,
+        context: &ChannelContext,
+    ) -> io::Result<()> {
        if current_device.status.online() {
            log::info!("已连接的不需要注册，{:?}", self.config_info);
            return Ok(());
@@ -468,7 +471,7 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
    }
    fn error(
        &self,
-        context: &Context,
+        context: &ChannelContext,
        _current_device: &CurrentDeviceInfo,
        net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
@@ -518,7 +521,7 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
    }
    fn control(
        &self,
-        context: &Context,
+        context: &ChannelContext,
        current_device: &CurrentDeviceInfo,
        net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
@@ -539,7 +542,7 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                    let mut poll_device = NetPacket::new_encrypt([0; 12 + ENCRYPTION_RESERVED])?;
                    poll_device.set_source(current_device.virtual_ip);
                    poll_device.set_destination(GATEWAY_IP);
-                    poll_device.set_version(Version::V1);
+                    poll_device.set_default_version();
                    poll_device.set_gateway_flag(true);
                    poll_device.first_set_ttl(MAX_TTL);
                    poll_device.set_protocol(Protocol::Service);
@@ -1,4 +1,4 @@
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::RouteKey;
 use crate::handle::recv_data::PacketHandler;
 use crate::handle::CurrentDeviceInfo;
@@ -19,7 +19,7 @@ impl PacketHandler for TurnPacketHandler {
        &self,
        mut net_packet: NetPacket<&mut [u8]>,
        route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
        _current_device: &CurrentDeviceInfo,
    ) -> std::io::Result<()> {
        // ttl减一
@@ -7,7 +7,7 @@ use crate::cipher::Cipher;
 use crate::handle::{GATEWAY_IP, SELF_IP};
 use crate::proto::message::RegistrationRequest;
 use crate::protocol::body::ENCRYPTION_RESERVED;
-use crate::protocol::{service_packet, NetPacket, Protocol, Version, MAX_TTL};
+use crate::protocol::{service_packet, NetPacket, Protocol, MAX_TTL};

 /// 注册数据
 pub fn registration_request_packet(
@@ -43,7 +43,7 @@ pub fn registration_request_packet(
    let mut net_packet = NetPacket::new_encrypt(buf)?;
    net_packet.set_destination(GATEWAY_IP);
    net_packet.set_source(SELF_IP);
-    net_packet.set_version(Version::V1);
+    net_packet.set_default_version();
    net_packet.set_gateway_flag(true);
    net_packet.set_protocol(Protocol::Service);
    net_packet.set_transport_protocol(service_packet::Protocol::RegistrationRequest.into());
@@ -1,187 +1,11 @@
-use std::io;
-use std::net::Ipv4Addr;
-
-use parking_lot::Mutex;
-
-use packet::ip::ipv4::packet::IpV4Packet;
-use packet::ip::ipv4::protocol::Protocol;
-
-use crate::channel::context::Context;
-use crate::cipher::Cipher;
-use crate::external_route::ExternalRoute;
-use crate::handle::{check_dest, CurrentDeviceInfo, PeerDeviceInfo};
-#[cfg(feature = "ip_proxy")]
-use crate::ip_proxy::{IpProxyMap, ProxyHandler};
-use crate::protocol;
-use crate::protocol::body::ENCRYPTION_RESERVED;
-use crate::protocol::ip_turn_packet::BroadcastPacket;
-use crate::protocol::{ip_turn_packet, NetPacket, Version, MAX_TTL};
-
 mod channel_group;
 pub mod tun_handler;

-fn broadcast(
-    server_cipher: &Cipher,
-    sender: &Context,
-    net_packet: &mut NetPacket<&mut [u8]>,
-    current_device: &CurrentDeviceInfo,
-    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
-) -> io::Result<()> {
-    let list: Vec<Ipv4Addr> = device_list
-        .lock()
-        .1
-        .iter()
-        .filter(|info| info.status.is_online())
-        .map(|info| info.virtual_ip)
-        .collect();
-    const MAX_COUNT: usize = 8;
-    let mut p2p_ips = Vec::with_capacity(8);
-    let mut relay_ips = Vec::with_capacity(8);
-    let mut overflow = false;
-    for (index, peer_ip) in list.into_iter().enumerate() {
-        if index > MAX_COUNT {
-            overflow = true;
-            break;
-        }
-        if let Some(route) = sender.route_table.route_one_p2p(&peer_ip) {
-            if sender
-                .send_by_key(net_packet.buffer(), route.route_key())
-                .is_ok()
-            {
-                p2p_ips.push(peer_ip);
-                continue;
-            }
-        }
-        relay_ips.push(peer_ip);
-    }
-    if !overflow && relay_ips.is_empty() {
-        //全部p2p,不需要服务器中转
-        return Ok(());
-    }
-
-    if p2p_ips.is_empty() {
-        //都没有p2p则直接由服务器转发
-        if current_device.status.online() {
-            sender.send_default(net_packet.buffer(), current_device.connect_server)?;
-        }
-        return Ok(());
-    }
-    if !overflow && relay_ips.len() == 2 {
-        // 如果转发的ip数不多就直接发
-        for peer_ip in relay_ips {
-            //非直连的广播要改变目的地址，不然服务端收到了会再次广播
-            net_packet.set_destination(peer_ip);
-            sender.send_ipv4_by_id(
-                net_packet.buffer(),
-                &peer_ip,
-                current_device.connect_server,
-                current_device.status.online(),
-            )?;
-        }
-        return Ok(());
-    }
-    if current_device.status.offline() {
-        //离线的不再转发
-        return Ok(());
-    }
-    let buf = vec![0u8; 12 + 1 + p2p_ips.len() * 4 + net_packet.data_len() + ENCRYPTION_RESERVED];
-    //剩余的发送到服务端，需要告知哪些已发送过
-    let mut server_packet = NetPacket::new_encrypt(buf)?;
-    server_packet.set_version(Version::V1);
-    server_packet.set_gateway_flag(true);
-    server_packet.first_set_ttl(MAX_TTL);
-    server_packet.set_source(net_packet.source());
-    //使用对应的目的地址
-    server_packet.set_destination(net_packet.destination());
-    server_packet.set_protocol(protocol::Protocol::IpTurn);
-    server_packet.set_transport_protocol(ip_turn_packet::Protocol::Ipv4Broadcast.into());
-
-    let mut broadcast = BroadcastPacket::unchecked(server_packet.payload_mut());
-    broadcast.set_address(&p2p_ips)?;
-    broadcast.set_data(net_packet.buffer())?;
-    server_cipher.encrypt_ipv4(&mut server_packet)?;
-    sender.send_default(server_packet.buffer(), current_device.connect_server)
-}
-
-/// 实现一个原地发送，必须保证是如下结构
-/// |12字节开头|ip报文|至少1024字节结尾|
-///
-#[inline]
-pub fn base_handle(
-    context: &Context,
-    buf: &mut [u8],
-    data_len: usize, //数据总长度=12+ip包长度
-    current_device: CurrentDeviceInfo,
-    ip_route: &ExternalRoute,
-    #[cfg(feature = "ip_proxy")] proxy_map: &Option<IpProxyMap>,
-    client_cipher: &Cipher,
-    server_cipher: &Cipher,
-    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
-) -> io::Result<()> {
-    let ipv4_packet = IpV4Packet::new(&buf[12..data_len])?;
-    let protocol = ipv4_packet.protocol();
-    let src_ip = ipv4_packet.source_ip();
-    let mut dest_ip = ipv4_packet.destination_ip();
-    let mut net_packet = NetPacket::new0(data_len, buf)?;
-    net_packet.set_version(Version::V1);
-    net_packet.set_protocol(protocol::Protocol::IpTurn);
-    net_packet.set_transport_protocol(ip_turn_packet::Protocol::Ipv4.into());
-    net_packet.first_set_ttl(6);
-    net_packet.set_source(src_ip);
-    net_packet.set_destination(dest_ip);
-    if dest_ip == current_device.virtual_gateway {
-        // 发到网关的加密方式不一样，要单独处理
-        if protocol == Protocol::Icmp {
-            net_packet.set_gateway_flag(true);
-            server_cipher.encrypt_ipv4(&mut net_packet)?;
-            context.send_default(net_packet.buffer(), current_device.connect_server)?;
-        }
-        return Ok(());
-    }
-    if dest_ip.is_multicast() {
-        //当作广播处理
-        dest_ip = Ipv4Addr::BROADCAST;
-        net_packet.set_destination(Ipv4Addr::BROADCAST);
-    }
-    if dest_ip.is_broadcast() || current_device.broadcast_ip == dest_ip {
-        // 广播 发送到直连目标
-        client_cipher.encrypt_ipv4(&mut net_packet)?;
-        broadcast(
-            server_cipher,
-            context,
-            &mut net_packet,
-            &current_device,
-            device_list,
-        )?;
-        return Ok(());
-    }
-    if !check_dest(
-        dest_ip,
-        current_device.virtual_netmask,
-        current_device.virtual_network,
-    ) {
-        if let Some(r_dest_ip) = ip_route.route(&dest_ip) {
-            //路由的目标不能是自己
-            if r_dest_ip == src_ip {
-                return Ok(());
-            }
-            //需要修改目的地址
-            dest_ip = r_dest_ip;
-            net_packet.set_destination(r_dest_ip);
-        } else {
-            return Ok(());
-        }
-    }
-    #[cfg(feature = "ip_proxy")]
-    if let Some(proxy_map) = proxy_map {
-        let mut ipv4_packet = IpV4Packet::new(net_packet.payload_mut())?;
-        proxy_map.send_handle(&mut ipv4_packet)?;
-    }
-    client_cipher.encrypt_ipv4(&mut net_packet)?;
-    context.send_ipv4_by_id(
-        net_packet.buffer(),
-        &dest_ip,
-        current_device.connect_server,
-        current_device.status.online(),
-    )
-}
+#[cfg(unix)]
+mod unix;
+#[cfg(unix)]
+pub(crate) use unix::*;
+#[cfg(target_os = "windows")]
+mod windows;
+#[cfg(target_os = "windows")]
+pub(crate) use windows::*;
@@ -1,3 +1,4 @@
+use std::net::Ipv4Addr;
 use std::sync::Arc;
 use std::{io, thread};

@@ -6,22 +7,27 @@ use parking_lot::Mutex;

 use packet::icmp::icmp::IcmpPacket;
 use packet::icmp::Kind;
-use packet::ip::ipv4;
 use packet::ip::ipv4::packet::IpV4Packet;
+use packet::ip::ipv4::protocol::Protocol;
 use tun::device::IFace;
 use tun::Device;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::cipher::Cipher;
 use crate::external_route::ExternalRoute;
-use crate::handle::tun_tap::channel_group::{channel_group, GroupSyncSender};
-use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
+use crate::handle::tun_tap::channel_group::channel_group;
+use crate::handle::{check_dest, CurrentDeviceInfo, PeerDeviceInfo};
 #[cfg(feature = "ip_proxy")]
 use crate::ip_proxy::IpProxyMap;
+use crate::ip_proxy::ProxyHandler;
+use crate::protocol;
+use crate::protocol::body::ENCRYPTION_RESERVED;
+use crate::protocol::ip_turn_packet::BroadcastPacket;
+use crate::protocol::{ip_turn_packet, NetPacket, MAX_TTL};
 use crate::util::{SingleU64Adder, StopManager};

 fn icmp(device_writer: &Device, mut ipv4_packet: IpV4Packet<&mut [u8]>) -> io::Result<()> {
-    if ipv4_packet.protocol() == ipv4::protocol::Protocol::Icmp {
+    if ipv4_packet.protocol() == Protocol::Icmp {
        let mut icmp = IcmpPacket::new(ipv4_packet.payload_mut())?;
        if icmp.kind() == Kind::EchoRequest {
            icmp.set_kind(Kind::EchoReply);
@@ -37,8 +43,8 @@ fn icmp(device_writer: &Device, mut ipv4_packet: IpV4Packet<&mut [u8]>) -> io::R
 }

 /// 接收tun数据，并且转发到udp上
-fn handle(
-    context: &Context,
+pub(crate) fn handle(
+    context: &ChannelContext,
    data: &mut [u8],
    len: usize,
    device_writer: &Device,
@@ -59,7 +65,7 @@ fn handle(
    if src_ip == dest_ip {
        return icmp(&device_writer, ipv4_packet);
    }
-    return crate::handle::tun_tap::base_handle(
+    return base_handle(
        context,
        data,
        len,
@@ -75,7 +81,7 @@ fn handle(

 pub fn start(
    stop_manager: StopManager,
-    context: Context,
+    context: ChannelContext,
    device: Arc<Device>,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
    ip_route: ExternalRoute,
@@ -86,23 +92,6 @@ pub fn start(
    mut up_counter: SingleU64Adder,
    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
 ) -> io::Result<()> {
-    let worker = {
-        #[cfg(any(target_os = "macos", target_os = "android"))]
-        let current_device = current_device.clone();
-        let device = device.clone();
-        stop_manager.add_listener("tun_device".into(), move || {
-            if let Err(e) = device.shutdown() {
-                log::warn!("{:?}", e);
-            }
-            #[cfg(any(target_os = "macos", target_os = "android"))]
-            {
-                let ip = current_device.load().virtual_ip;
-                if let Ok(udp) = std::net::UdpSocket::bind("0.0.0.0:0") {
-                    let _ = udp.send_to(b"stop", format!("{:?}:1234", ip));
-                }
-            }
-        })?
-    };
    if parallel > 1 {
        let (sender, receivers) = channel_group::<(Vec<u8>, usize)>(parallel, 16);
        for (index, receiver) in receivers.into_iter().enumerate() {
@@ -147,16 +136,20 @@ pub fn start(
        thread::Builder::new()
            .name("tunHandlerM".into())
            .spawn(move || {
-                if let Err(e) = start_multi(stop_manager, device, sender, &mut up_counter) {
+                if let Err(e) = crate::handle::tun_tap::start_multi(
+                    stop_manager,
+                    device,
+                    sender,
+                    &mut up_counter,
+                ) {
                    log::warn!("stop:{}", e);
                }
-                worker.stop_all();
            })?;
    } else {
        thread::Builder::new()
            .name("tunHandlerS".into())
            .spawn(move || {
-                if let Err(e) = start_simple(
+                if let Err(e) = crate::handle::tun_tap::start_simple(
                    stop_manager,
                    &context,
                    device,
@@ -171,73 +164,173 @@ pub fn start(
                ) {
                    log::warn!("stop:{}", e);
                }
-                worker.stop_all();
            })?;
    }
    Ok(())
 }

-fn start_simple(
-    stop_manager: StopManager,
-    context: &Context,
-    device: Arc<Device>,
-    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
-    ip_route: ExternalRoute,
-    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
-    client_cipher: Cipher,
-    server_cipher: Cipher,
-    up_counter: &mut SingleU64Adder,
-    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+fn broadcast(
+    server_cipher: &Cipher,
+    sender: &ChannelContext,
+    net_packet: &mut NetPacket<&mut [u8]>,
+    current_device: &CurrentDeviceInfo,
+    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
 ) -> io::Result<()> {
-    let mut buf = [0; 1024 * 16];
-    loop {
-        if stop_manager.is_stop() {
-            return Ok(());
+    let list: Vec<Ipv4Addr> = device_list
+        .lock()
+        .1
+        .iter()
+        .filter(|info| info.status.is_online())
+        .map(|info| info.virtual_ip)
+        .collect();
+    const MAX_COUNT: usize = 8;
+    let mut p2p_ips = Vec::with_capacity(8);
+    let mut relay_ips = Vec::with_capacity(8);
+    let mut overflow = false;
+    for (index, peer_ip) in list.into_iter().enumerate() {
+        if index > MAX_COUNT {
+            overflow = true;
+            break;
        }
-        let len = device.read(&mut buf[12..])? + 12;
-        //单线程的
-        up_counter.add(len as u64);
-        #[cfg(any(target_os = "macos"))]
-        let mut buf = &mut buf[4..];
-        // buf是重复利用的，需要重置头部
-        buf[..12].fill(0);
-        match handle(
-            context,
-            &mut buf,
-            len,
-            &device,
-            current_device.load(),
-            &ip_route,
-            #[cfg(feature = "ip_proxy")]
-            &ip_proxy_map,
-            &client_cipher,
-            &server_cipher,
-            &device_list,
-        ) {
-            Ok(_) => {}
-            Err(e) => {
-                log::warn!("{:?}", e)
+        if let Some(route) = sender.route_table.route_one_p2p(&peer_ip) {
+            if sender
+                .send_by_key(net_packet.buffer(), route.route_key())
+                .is_ok()
+            {
+                p2p_ips.push(peer_ip);
+                continue;
            }
        }
+        relay_ips.push(peer_ip);
    }
+    if !overflow && relay_ips.is_empty() {
+        //全部p2p,不需要服务器中转
+        return Ok(());
+    }
+
+    if p2p_ips.is_empty() {
+        //都没有p2p则直接由服务器转发
+        if current_device.status.online() {
+            sender.send_default(net_packet.buffer(), current_device.connect_server)?;
+        }
+        return Ok(());
+    }
+    if !overflow && relay_ips.len() == 2 {
+        // 如果转发的ip数不多就直接发
+        for peer_ip in relay_ips {
+            //非直连的广播要改变目的地址，不然服务端收到了会再次广播
+            net_packet.set_destination(peer_ip);
+            sender.send_ipv4_by_id(
+                net_packet.buffer(),
+                &peer_ip,
+                current_device.connect_server,
+                current_device.status.online(),
+            )?;
+        }
+        return Ok(());
+    }
+    if current_device.status.offline() {
+        //离线的不再转发
+        return Ok(());
+    }
+    let buf = vec![0u8; 12 + 1 + p2p_ips.len() * 4 + net_packet.data_len() + ENCRYPTION_RESERVED];
+    //剩余的发送到服务端，需要告知哪些已发送过
+    let mut server_packet = NetPacket::new_encrypt(buf)?;
+    server_packet.set_default_version();
+    server_packet.set_gateway_flag(true);
+    server_packet.first_set_ttl(MAX_TTL);
+    server_packet.set_source(net_packet.source());
+    //使用对应的目的地址
+    server_packet.set_destination(net_packet.destination());
+    server_packet.set_protocol(protocol::Protocol::IpTurn);
+    server_packet.set_transport_protocol(ip_turn_packet::Protocol::Ipv4Broadcast.into());
+
+    let mut broadcast = BroadcastPacket::unchecked(server_packet.payload_mut());
+    broadcast.set_address(&p2p_ips)?;
+    broadcast.set_data(net_packet.buffer())?;
+    server_cipher.encrypt_ipv4(&mut server_packet)?;
+    sender.send_default(server_packet.buffer(), current_device.connect_server)
 }

-fn start_multi(
-    stop_manager: StopManager,
-    device: Arc<Device>,
-    mut group_sync_sender: GroupSyncSender<(Vec<u8>, usize)>,
-    up_counter: &mut SingleU64Adder,
+/// 实现一个原地发送，必须保证是如下结构
+/// |12字节开头|ip报文|至少1024字节结尾|
+///
+#[inline]
+fn base_handle(
+    context: &ChannelContext,
+    buf: &mut [u8],
+    data_len: usize, //数据总长度=12+ip包长度
+    current_device: CurrentDeviceInfo,
+    ip_route: &ExternalRoute,
+    #[cfg(feature = "ip_proxy")] proxy_map: &Option<IpProxyMap>,
+    client_cipher: &Cipher,
+    server_cipher: &Cipher,
+    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
 ) -> io::Result<()> {
-    loop {
-        if stop_manager.is_stop() {
-            return Ok(());
+    let ipv4_packet = IpV4Packet::new(&buf[12..data_len])?;
+    let protocol = ipv4_packet.protocol();
+    let src_ip = ipv4_packet.source_ip();
+    let mut dest_ip = ipv4_packet.destination_ip();
+    let mut net_packet = NetPacket::new0(data_len, buf)?;
+    net_packet.set_default_version();
+    net_packet.set_protocol(protocol::Protocol::IpTurn);
+    net_packet.set_transport_protocol(ip_turn_packet::Protocol::Ipv4.into());
+    net_packet.first_set_ttl(6);
+    net_packet.set_source(src_ip);
+    net_packet.set_destination(dest_ip);
+    if dest_ip == current_device.virtual_gateway {
+        // 发到网关的加密方式不一样，要单独处理
+        if protocol == Protocol::Icmp {
+            net_packet.set_gateway_flag(true);
+            server_cipher.encrypt_ipv4(&mut net_packet)?;
+            context.send_default(net_packet.buffer(), current_device.connect_server)?;
        }
-        let mut buf = vec![0; 1024 * 16];
-        let len = device.read(&mut buf[12..])? + 12;
-        //单线程的
-        up_counter.add(len as u64);
-        if group_sync_sender.send((buf, len)).is_err() {
+        return Ok(());
+    }
+    if dest_ip.is_multicast() {
+        //当作广播处理
+        dest_ip = Ipv4Addr::BROADCAST;
+        net_packet.set_destination(Ipv4Addr::BROADCAST);
+    }
+    if dest_ip.is_broadcast() || current_device.broadcast_ip == dest_ip {
+        // 广播 发送到直连目标
+        client_cipher.encrypt_ipv4(&mut net_packet)?;
+        broadcast(
+            server_cipher,
+            context,
+            &mut net_packet,
+            &current_device,
+            device_list,
+        )?;
+        return Ok(());
+    }
+    if !check_dest(
+        dest_ip,
+        current_device.virtual_netmask,
+        current_device.virtual_network,
+    ) {
+        if let Some(r_dest_ip) = ip_route.route(&dest_ip) {
+            //路由的目标不能是自己
+            if r_dest_ip == src_ip {
+                return Ok(());
+            }
+            //需要修改目的地址
+            dest_ip = r_dest_ip;
+            net_packet.set_destination(r_dest_ip);
+        } else {
            return Ok(());
        }
    }
+    #[cfg(feature = "ip_proxy")]
+    if let Some(proxy_map) = proxy_map {
+        let mut ipv4_packet = IpV4Packet::new(net_packet.payload_mut())?;
+        proxy_map.send_handle(&mut ipv4_packet)?;
+    }
+    client_cipher.encrypt_ipv4(&mut net_packet)?;
+    context.send_ipv4_by_id(
+        net_packet.buffer(),
+        &dest_ip,
+        current_device.connect_server,
+        current_device.status.online(),
+    )
 }
@@ -0,0 +1,183 @@
+use crate::channel::context::ChannelContext;
+use crate::cipher::Cipher;
+use crate::external_route::ExternalRoute;
+use crate::handle::tun_tap::channel_group::GroupSyncSender;
+use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
+use crate::ip_proxy::IpProxyMap;
+use crate::util::{SingleU64Adder, StopManager};
+use crossbeam_utils::atomic::AtomicCell;
+use mio::event::Source;
+use mio::unix::SourceFd;
+use mio::{Events, Interest, Poll, Token, Waker};
+use parking_lot::Mutex;
+use std::io;
+use std::os::fd::AsRawFd;
+use std::sync::Arc;
+use tun::Device;
+
+const STOP: Token = Token(0);
+const FD: Token = Token(1);
+
+pub(crate) fn start_simple(
+    stop_manager: StopManager,
+    context: &ChannelContext,
+    device: Arc<Device>,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    up_counter: &mut SingleU64Adder,
+    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+) -> io::Result<()> {
+    let poll = Poll::new()?;
+    let waker = Arc::new(Waker::new(poll.registry(), STOP)?);
+    let _waker = waker.clone();
+    let worker = stop_manager.add_listener("tun_device".into(), move || {
+        let _ = waker.wake();
+    })?;
+    if let Err(e) = start_simple0(
+        poll,
+        context,
+        device,
+        current_device,
+        ip_route,
+        #[cfg(feature = "ip_proxy")]
+        ip_proxy_map,
+        client_cipher,
+        server_cipher,
+        up_counter,
+        device_list,
+    ) {
+        log::error!("{:?}", e);
+    };
+    worker.stop_all();
+    drop(_waker);
+    Ok(())
+}
+
+fn start_simple0(
+    mut poll: Poll,
+    context: &ChannelContext,
+    device: Arc<Device>,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    up_counter: &mut SingleU64Adder,
+    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+) -> io::Result<()> {
+    let mut buf = [0; 1024 * 16];
+    let fd = device.as_tun_fd();
+    fd.set_nonblock()?;
+    SourceFd(&fd.as_raw_fd()).register(poll.registry(), FD, Interest::READABLE)?;
+    let mut evnets = Events::with_capacity(4);
+    #[cfg(not(target_os = "macos"))]
+    let start = 12;
+    #[cfg(target_os = "macos")]
+    let start = 12 - 4;
+    loop {
+        poll.poll(&mut evnets, None)?;
+        for event in evnets.iter() {
+            if event.token() == STOP {
+                return Ok(());
+            }
+            loop {
+                let len = match fd.read(&mut buf[start..]) {
+                    Ok(len) => len + start,
+                    Err(e) => {
+                        if e.kind() == io::ErrorKind::WouldBlock {
+                            break;
+                        }
+                        Err(e)?
+                    }
+                };
+                //单线程的
+                up_counter.add(len as u64);
+                // buf是重复利用的，需要重置头部
+                buf[..12].fill(0);
+                match crate::handle::tun_tap::tun_handler::handle(
+                    context,
+                    &mut buf,
+                    len,
+                    &device,
+                    current_device.load(),
+                    &ip_route,
+                    #[cfg(feature = "ip_proxy")]
+                    &ip_proxy_map,
+                    &client_cipher,
+                    &server_cipher,
+                    &device_list,
+                ) {
+                    Ok(_) => {}
+                    Err(e) => {
+                        log::warn!("{:?}", e)
+                    }
+                }
+            }
+        }
+    }
+}
+
+pub(crate) fn start_multi(
+    stop_manager: StopManager,
+    device: Arc<Device>,
+    group_sync_sender: GroupSyncSender<(Vec<u8>, usize)>,
+    up_counter: &mut SingleU64Adder,
+) -> io::Result<()> {
+    let poll = Poll::new()?;
+    let waker = Arc::new(Waker::new(poll.registry(), STOP)?);
+    let _waker = waker.clone();
+    let worker = stop_manager.add_listener("tun_device".into(), move || {
+        let _ = waker.wake();
+    })?;
+    if let Err(e) = start_multi0(poll, device, group_sync_sender, up_counter) {
+        log::error!("{:?}", e);
+    };
+    worker.stop_all();
+    drop(_waker);
+    Ok(())
+}
+
+fn start_multi0(
+    mut poll: Poll,
+    device: Arc<Device>,
+    mut group_sync_sender: GroupSyncSender<(Vec<u8>, usize)>,
+    up_counter: &mut SingleU64Adder,
+) -> io::Result<()> {
+    let fd = device.as_tun_fd();
+    fd.set_nonblock()?;
+    SourceFd(&fd.as_raw_fd()).register(poll.registry(), FD, Interest::READABLE)?;
+    let mut evnets = Events::with_capacity(4);
+    let mut buf = vec![0; 1024 * 16];
+    #[cfg(not(target_os = "macos"))]
+    let start = 12;
+    #[cfg(target_os = "macos")]
+    let start = 12 - 4;
+    loop {
+        poll.poll(&mut evnets, None)?;
+        for event in evnets.iter() {
+            if event.token() == STOP {
+                return Ok(());
+            }
+            loop {
+                let len = match fd.read(&mut buf[start..]) {
+                    Ok(len) => len + start,
+                    Err(e) => {
+                        if e.kind() == io::ErrorKind::WouldBlock {
+                            break;
+                        }
+                        Err(e)?
+                    }
+                };
+                //单线程的
+                up_counter.add(len as u64);
+                if group_sync_sender.send((buf, len)).is_err() {
+                    return Ok(());
+                }
+                buf = vec![0; 1024 * 16];
+            }
+        }
+    }
+}
@@ -0,0 +1,124 @@
+use crate::channel::context::ChannelContext;
+use crate::cipher::Cipher;
+use crate::external_route::ExternalRoute;
+use crate::handle::tun_tap::channel_group::GroupSyncSender;
+use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
+use crate::ip_proxy::IpProxyMap;
+use crate::util::{SingleU64Adder, StopManager};
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use std::io;
+use std::sync::Arc;
+use tun::device::IFace;
+use tun::Device;
+
+pub(crate) fn start_simple(
+    stop_manager: StopManager,
+    context: &ChannelContext,
+    device: Arc<Device>,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    up_counter: &mut SingleU64Adder,
+    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+) -> io::Result<()> {
+    let worker = {
+        let device = device.clone();
+        stop_manager.add_listener("tun_device".into(), move || {
+            if let Err(e) = device.shutdown() {
+                log::warn!("{:?}", e);
+            }
+        })?
+    };
+    if let Err(e) = start_simple0(
+        context,
+        device,
+        current_device,
+        ip_route,
+        #[cfg(feature = "ip_proxy")]
+        ip_proxy_map,
+        client_cipher,
+        server_cipher,
+        up_counter,
+        device_list,
+    ) {
+        log::error!("{:?}", e);
+    }
+    worker.stop_all();
+    Ok(())
+}
+fn start_simple0(
+    context: &ChannelContext,
+    device: Arc<Device>,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    up_counter: &mut SingleU64Adder,
+    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+) -> io::Result<()> {
+    let mut buf = [0; 1024 * 16];
+    loop {
+        let len = device.read(&mut buf[12..])? + 12;
+        //单线程的
+        up_counter.add(len as u64);
+        // buf是重复利用的，需要重置头部
+        buf[..12].fill(0);
+        match crate::handle::tun_tap::tun_handler::handle(
+            context,
+            &mut buf,
+            len,
+            &device,
+            current_device.load(),
+            &ip_route,
+            #[cfg(feature = "ip_proxy")]
+            &ip_proxy_map,
+            &client_cipher,
+            &server_cipher,
+            &device_list,
+        ) {
+            Ok(_) => {}
+            Err(e) => {
+                log::warn!("tun/tap {:?}", e)
+            }
+        }
+    }
+}
+pub(crate) fn start_multi(
+    stop_manager: StopManager,
+    device: Arc<Device>,
+    group_sync_sender: GroupSyncSender<(Vec<u8>, usize)>,
+    up_counter: &mut SingleU64Adder,
+) -> io::Result<()> {
+    let worker = {
+        let device = device.clone();
+        stop_manager.add_listener("tun_device_multi".into(), move || {
+            if let Err(e) = device.shutdown() {
+                log::warn!("{:?}", e);
+            }
+        })?
+    };
+    if let Err(e) = start_multi0(device, group_sync_sender, up_counter) {
+        log::error!("{:?}", e);
+    };
+    worker.stop_all();
+    Ok(())
+}
+fn start_multi0(
+    device: Arc<Device>,
+    mut group_sync_sender: GroupSyncSender<(Vec<u8>, usize)>,
+    up_counter: &mut SingleU64Adder,
+) -> io::Result<()> {
+    loop {
+        let mut buf = vec![0; 1024 * 16];
+        let len = device.read(&mut buf[12..])? + 12;
+        //单线程的
+        up_counter.add(len as u64);
+        if group_sync_sender.send((buf, len)).is_err() {
+            return Ok(());
+        }
+    }
+}
@@ -1,24 +1,23 @@
+use anyhow::Context;
 use std::collections::HashMap;
+use std::io;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4};
 use std::sync::Arc;
-use std::{io, thread};

 use crossbeam_utils::atomic::AtomicCell;
-use mio::net::UdpSocket;
-use mio::{Events, Interest, Poll, Token, Waker};
 use parking_lot::Mutex;
+use tokio::net::UdpSocket;

 use packet::icmp::icmp;
 use packet::icmp::icmp::HeaderOther;
 use packet::ip::ipv4::packet::IpV4Packet;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::cipher::Cipher;
 use crate::handle::CurrentDeviceInfo;
 use crate::ip_proxy::ProxyHandler;
 use crate::protocol;
-use crate::protocol::{NetPacket, Version, MAX_TTL};
-use crate::util::StopManager;
+use crate::protocol::{NetPacket, MAX_TTL};
 #[derive(Clone)]
 pub struct IcmpProxy {
    icmp_socket: Arc<std::net::UdpSocket>,
@@ -27,41 +26,50 @@ pub struct IcmpProxy {
 }

 impl IcmpProxy {
-    pub fn new(
-        context: Context,
-        stop_manager: StopManager,
+    pub async fn new(
+        context: ChannelContext,
        current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
        client_cipher: Cipher,
-    ) -> io::Result<Self> {
+    ) -> anyhow::Result<Self> {
+        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
        let icmp_socket = socket2::Socket::new(
            socket2::Domain::IPV4,
            socket2::Type::RAW,
            Some(socket2::Protocol::ICMPV4),
-        )?;
+        )
+        .context("new Socket RAW ICMPV4 failed")?;
+        #[cfg(target_os = "android")]
+        let icmp_socket = socket2::Socket::new(
+            socket2::Domain::IPV4,
+            socket2::Type::DGRAM,
+            Some(socket2::Protocol::ICMPV4),
+        )
+        .context("new Socket DGRAM ICMPV4 failed")?;
        let addr: SocketAddrV4 = SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0);
-        icmp_socket.bind(&socket2::SockAddr::from(addr))?;
+        icmp_socket
+            .bind(&socket2::SockAddr::from(addr))
+            .context("bind Socket ICMPV4 failed")?;
        icmp_socket.set_nonblocking(true)?;
        let std_socket: std::net::UdpSocket = icmp_socket.into();
-        let mio_icmp_socket = UdpSocket::from_std(std_socket.try_clone()?);
+
+        let tokio_icmp_socket = UdpSocket::from_std(std_socket.try_clone()?)?;
        let nat_map: Arc<Mutex<HashMap<(Ipv4Addr, u16, u16), Ipv4Addr>>> =
            Arc::new(Mutex::new(HashMap::with_capacity(16)));
        {
            let nat_map = nat_map.clone();
-            thread::Builder::new()
-                .name("icmpProxy".into())
-                .spawn(move || {
-                    if let Err(e) = icmp_proxy(
-                        mio_icmp_socket,
-                        nat_map,
-                        context,
-                        stop_manager,
-                        current_device,
-                        client_cipher,
-                    ) {
-                        log::warn!("icmp_proxy:{:?}", e);
-                    }
-                })
-                .expect("icmpProxy");
+            tokio::spawn(async {
+                if let Err(e) = icmp_proxy(
+                    tokio_icmp_socket,
+                    nat_map,
+                    context,
+                    current_device,
+                    client_cipher,
+                )
+                .await
+                {
+                    log::warn!("icmp_proxy:{:?}", e);
+                }
+            });
        }
        Ok(Self {
            icmp_socket: Arc::new(std_socket),
@@ -70,93 +78,57 @@ impl IcmpProxy {
    }
 }

-const SERVER_VAL: usize = 0;
-const SERVER: Token = Token(SERVER_VAL);
-const NOTIFY_VAL: usize = 1;
-const NOTIFY: Token = Token(NOTIFY_VAL);
-
-fn icmp_proxy(
-    mut icmp_socket: UdpSocket,
+async fn icmp_proxy(
+    icmp_socket: UdpSocket,
    // 对端-> 真实来源
    nat_map: Arc<Mutex<HashMap<(Ipv4Addr, u16, u16), Ipv4Addr>>>,
-    context: Context,
-    stop_manager: StopManager,
+    context: ChannelContext,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
    client_cipher: Cipher,
 ) -> io::Result<()> {
-    let mut poll = Poll::new()?;
-    poll.registry()
-        .register(&mut icmp_socket, SERVER, Interest::READABLE)?;
-    let mut events = Events::with_capacity(32);
-    let stop = Arc::new(Waker::new(poll.registry(), NOTIFY)?);
-    let _stop = stop.clone();
-    let _worker = stop_manager.add_listener("icmp_proxy".into(), move || {
-        if let Err(e) = stop.wake() {
-            log::warn!("stop icmp_proxy:{:?}", e);
-        }
-    })?;
    let mut buf = [0u8; 65535 - 20 - 8];
    loop {
-        poll.poll(&mut events, None)?;
-        if stop_manager.is_stop() {
-            return Ok(());
-        }
-        for event in events.iter() {
-            match event.token() {
-                SERVER => readable_handle(
-                    &icmp_socket,
+        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+        let start = 12;
+        #[cfg(target_os = "android")]
+        let start = 12 + 20;
+        loop {
+            let (len, addr) = icmp_socket.recv_from(&mut buf[start..]).await?;
+            if let IpAddr::V4(peer_ip) = addr.ip() {
+                #[cfg(target_os = "android")]
+                {
+                    let buf = &mut buf[12..];
+                    // ipv4 头部20字节
+                    buf[0] = 0b0100_0110;
+                    //写入总长度
+                    buf[2..4].copy_from_slice(&((20 + len) as u16).to_be_bytes());
+
+                    let mut ipv4 = IpV4Packet::unchecked(buf);
+                    ipv4.set_flags(2);
+                    ipv4.set_ttl(1);
+                    ipv4.set_protocol(packet::ip::ipv4::protocol::Protocol::Icmp);
+                    ipv4.set_source_ip(peer_ip);
+                }
+                recv_handle(
                    &mut buf,
+                    start + len,
+                    peer_ip,
                    &nat_map,
                    &context,
                    &current_device,
                    &client_cipher,
-                ),
-                NOTIFY => {
-                    return Ok(());
-                }
-                _ => {}
+                );
            }
        }
    }
 }
-fn readable_handle(
-    icmp_socket: &UdpSocket,
-    buf: &mut [u8],
-    nat_map: &Mutex<HashMap<(Ipv4Addr, u16, u16), Ipv4Addr>>,
-    context: &Context,
-    current_device: &AtomicCell<CurrentDeviceInfo>,
-    client_cipher: &Cipher,
-) {
-    loop {
-        let (len, addr) = match icmp_socket.recv_from(&mut buf[12..]) {
-            Ok(rs) => rs,
-            Err(e) => {
-                if e.kind() == io::ErrorKind::WouldBlock {
-                    break;
-                }
-                log::warn!("icmp_socket {:?}", e);
-                return;
-            }
-        };
-        if let IpAddr::V4(peer_ip) = addr.ip() {
-            recv_handle(
-                buf,
-                12 + len,
-                peer_ip,
-                &nat_map,
-                &context,
-                &current_device,
-                &client_cipher,
-            );
-        }
-    }
-}
+
 fn recv_handle(
    buf: &mut [u8],
    data_len: usize,
    peer_ip: Ipv4Addr,
    nat_map: &Mutex<HashMap<(Ipv4Addr, u16, u16), Ipv4Addr>>,
-    context: &Context,
+    context: &ChannelContext,
    current_device: &AtomicCell<CurrentDeviceInfo>,
    client_cipher: &Cipher,
 ) {
@@ -172,7 +144,7 @@ fn recv_handle(
                        let virtual_ip = current_device.virtual_ip();

                        let mut net_packet = NetPacket::new0(data_len, buf).unwrap();
-                        net_packet.set_version(Version::V1);
+                        net_packet.set_default_version();
                        net_packet.set_protocol(protocol::Protocol::IpTurn);
                        net_packet.set_transport_protocol(
                            protocol::ip_turn_packet::Protocol::Ipv4.into(),
@@ -194,11 +166,17 @@ fn recv_handle(
                        }
                    }
                }
-                _ => {}
+                h => {
+                    log::warn!("不支持的icmp代理 {:?},{:?}", peer_ip, h)
+                }
            },
-            Err(_) => {}
+            Err(e) => {
+                log::warn!("icmp {:?}", e)
+            }
        },
-        Err(_) => {}
+        Err(e) => {
+            log::warn!("icmp {:?}", e)
+        }
    }
 }

@@ -225,12 +203,13 @@ impl ProxyHandler for IcmpProxy {
                    SocketAddr::from(SocketAddrV4::new(dest_ip, 0)),
                )?;
            }
-            _ => {
+            header_other => {
                log::warn!(
-                    "不支持的ip代理Icmp协议:{}->{}->{}",
+                    "不支持的ip代理Icmp协议:{}->{}->{},{:?}",
                    source,
                    destination,
-                    dest_ip
+                    dest_ip,
+                    header_other
                );
            }
        }
@@ -1,19 +1,19 @@
-use std::io;
 use std::net::Ipv4Addr;
 use std::sync::Arc;
+use std::{io, thread};

 use crossbeam_utils::atomic::AtomicCell;

 use packet::ip::ipv4;
 use packet::ip::ipv4::packet::IpV4Packet;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::cipher::Cipher;
 use crate::handle::CurrentDeviceInfo;
 use crate::ip_proxy::icmp_proxy::IcmpProxy;
 use crate::ip_proxy::tcp_proxy::TcpProxy;
 use crate::ip_proxy::udp_proxy::UdpProxy;
-use crate::util::{Scheduler, StopManager};
+use crate::util::StopManager;

 pub mod icmp_proxy;
 pub mod tcp_proxy;
@@ -37,15 +37,41 @@ pub struct IpProxyMap {
 }

 pub fn init_proxy(
-    context: Context,
-    scheduler: Scheduler,
+    context: ChannelContext,
    stop_manager: StopManager,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
    client_cipher: Cipher,
-) -> io::Result<IpProxyMap> {
-    let icmp_proxy = IcmpProxy::new(context, stop_manager.clone(), current_device, client_cipher)?;
-    let tcp_proxy = TcpProxy::new(stop_manager.clone())?;
-    let udp_proxy = UdpProxy::new(scheduler, stop_manager)?;
+) -> anyhow::Result<IpProxyMap> {
+    let runtime = tokio::runtime::Builder::new_multi_thread()
+        .enable_all()
+        .thread_name("ipProxy")
+        .build()?;
+    let proxy_map = runtime.block_on(init_proxy0(context, current_device, client_cipher))?;
+    let (sender, receiver) = tokio::sync::oneshot::channel::<()>();
+    let worker = stop_manager.add_listener("ipProxy".into(), move || {
+        let _ = sender.send(());
+    })?;
+    thread::Builder::new()
+        .name("ipProxy".into())
+        .spawn(move || {
+            runtime.block_on(async {
+                let _ = receiver.await;
+            });
+            runtime.shutdown_background();
+            drop(worker);
+        })?;
+
+    return Ok(proxy_map);
+}
+
+async fn init_proxy0(
+    context: ChannelContext,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    client_cipher: Cipher,
+) -> anyhow::Result<IpProxyMap> {
+    let icmp_proxy = IcmpProxy::new(context, current_device, client_cipher).await?;
+    let tcp_proxy = TcpProxy::new().await?;
+    let udp_proxy = UdpProxy::new().await?;

    Ok(IpProxyMap {
        icmp_proxy,
@@ -1,28 +1,16 @@
-use std::io::{Read, Write};
-use std::net::{Ipv4Addr, Shutdown, SocketAddrV4};
-#[cfg(unix)]
-use std::os::fd::AsRawFd;
-#[cfg(windows)]
-use std::os::windows::io::AsRawSocket;
+use anyhow::Context;
+use std::net::{Ipv4Addr, SocketAddrV4};
 use std::sync::Arc;
 use std::time::Duration;
-use std::{collections::HashMap, io, net::SocketAddr, thread};
+use std::{collections::HashMap, io, net::SocketAddr};

-use bytes::{BufMut, BytesMut};
-use mio::net::TcpStream;
-use mio::{net::TcpListener, Events, Interest, Poll, Registry, Token, Waker};
 use parking_lot::Mutex;
+use tokio::net::{TcpListener, TcpSocket, TcpStream};

 use packet::ip::ipv4::packet::IpV4Packet;
 use packet::tcp::tcp::TcpPacket;

 use crate::ip_proxy::ProxyHandler;
-use crate::util::StopManager;
-
-const SERVER_VAL: usize = 0;
-const SERVER: Token = Token(SERVER_VAL);
-const NOTIFY_VAL: usize = 1;
-const NOTIFY: Token = Token(NOTIFY_VAL);

 #[derive(Clone)]
 pub struct TcpProxy {
@@ -31,21 +19,16 @@ pub struct TcpProxy {
 }

 impl TcpProxy {
-    pub fn new(stop_manager: StopManager) -> io::Result<Self> {
+    pub async fn new() -> anyhow::Result<Self> {
        let nat_map: Arc<Mutex<HashMap<SocketAddrV4, SocketAddrV4>>> =
            Arc::new(Mutex::new(HashMap::with_capacity(16)));
-        let tcp_listener = TcpListener::bind(format!("0.0.0.0:{}", 0).parse().unwrap())?;
+        let tcp_listener = TcpListener::bind(format!("0.0.0.0:{}", 0))
+            .await
+            .context("TcpProxy bind failed")?;
        let port = tcp_listener.local_addr()?.port();
        {
            let nat_map = nat_map.clone();
-            thread::Builder::new()
-                .name("tcpProxy".into())
-                .spawn(move || {
-                    if let Err(e) = tcp_proxy(tcp_listener, nat_map, stop_manager) {
-                        log::warn!("tcp_proxy:{:?}", e);
-                    }
-                })
-                .expect("tcpProxy");
+            tokio::spawn(tcp_proxy(tcp_listener, nat_map));
        }
        Ok(Self { port, nat_map })
    }
@@ -93,365 +76,74 @@ impl ProxyHandler for TcpProxy {
    }
 }

-fn tcp_proxy(
-    mut tcp_listener: TcpListener,
+async fn tcp_proxy(
+    tcp_listener: TcpListener,
    nat_map: Arc<Mutex<HashMap<SocketAddrV4, SocketAddrV4>>>,
-    stop_manager: StopManager,
-) -> io::Result<()> {
-    let mut poll = Poll::new()?;
-    poll.registry()
-        .register(&mut tcp_listener, SERVER, Interest::READABLE)?;
-    let mut events = Events::with_capacity(32);
-    let mut tcp_map: HashMap<usize, ProxyValue> = HashMap::with_capacity(16);
-    let mut mapping: HashMap<usize, usize> = HashMap::with_capacity(16);
-    let stop = Arc::new(Waker::new(poll.registry(), NOTIFY)?);
-    let _stop = stop.clone();
-    let _worker = stop_manager.add_listener("tcp_proxy".into(), move || {
-        if let Err(e) = stop.wake() {
-            log::warn!("stop tcp_proxy:{:?}", e);
-        }
-    })?;
-    loop {
-        poll.poll(&mut events, None)?;
-        if stop_manager.is_stop() {
-            return Ok(());
-        }
-        for event in events.iter() {
-            match event.token() {
-                SERVER => {
-                    accept_handle(
-                        poll.registry(),
-                        &tcp_listener,
-                        &nat_map,
-                        &mut tcp_map,
-                        &mut mapping,
-                    );
-                }
-                NOTIFY => {
-                    return Ok(());
-                }
-                Token(index) => {
-                    let (val, src_index) = if let Some(v) = tcp_map.get_mut(&index) {
-                        (v, index)
-                    } else {
-                        if let Some(dest_index) = mapping.get(&index) {
-                            if let Some(v) = tcp_map.get_mut(dest_index) {
-                                (v, *dest_index)
-                            } else {
-                                continue;
-                            }
-                        } else {
-                            continue;
-                        }
-                    };
-                    let (stream1, stream2, buf1, buf2, state1, state2) = val.as_mut(index);
-                    if event.is_readable() {
-                        if let Err(_) = readable_handle(stream1, stream2, buf1, state2) {
-                            *state1 |= READ_CLOSED;
-                        }
-                    }
-                    if event.is_writable() {
-                        let read = buf2.len() >= BUF_LEN;
-                        if let Err(_) = writable_handle(stream1, buf2) {
-                            *state1 |= WRITE_CLOSED;
-                        } else if read {
-                            if readable_handle(stream2, stream1, buf2, state1).is_err() {
-                                *state2 |= READ_CLOSED;
-                            }
-                        }
-                    }
-                    if event.is_read_closed() || event.is_error() {
-                        *state1 |= READ_CLOSED;
-                    }
-                    if event.is_write_closed() || event.is_error() {
-                        *state1 |= WRITE_CLOSED;
-                    }
-                    if is_write_closed(*state1) {
-                        let _ = stream1.shutdown(Shutdown::Write);
-                        let _ = stream2.shutdown(Shutdown::Read);
-                    }
-                    if is_read_closed(*state1) {
-                        let _ = stream1.shutdown(Shutdown::Read);
-                        if buf1.is_empty() {
-                            let _ = stream2.shutdown(Shutdown::Write);
-                        }
-                    }
-                    if (is_both_closed(*state1) && buf1.is_empty())
-                        || (is_both_closed(*state2) && buf2.is_empty())
-                        || (is_write_closed(*state1) && is_write_closed(*state2)
-                            || (is_read_closed(*state1)
-                                && is_read_closed(*state2)
-                                && buf1.is_empty()
-                                && buf2.is_empty()))
-                    {
-                        close(src_index, &mut tcp_map, &mut mapping);
-                    }
-                }
-            }
-        }
-    }
-}
-
-fn accept_handle(
-    registry: &Registry,
-    tcp_listener: &TcpListener,
-    nat_map: &Mutex<HashMap<SocketAddrV4, SocketAddrV4>>,
-    tcp_map: &mut HashMap<usize, ProxyValue>,
-    mapping: &mut HashMap<usize, usize>,
 ) {
    loop {
-        match tcp_listener.accept() {
-            Ok((mut src_stream, addr)) => {
-                #[cfg(windows)]
-                let src_fd = src_stream.as_raw_socket() as usize;
-                #[cfg(unix)]
-                let src_fd = src_stream.as_raw_fd() as usize;
-                if src_fd == SERVER_VAL || src_fd == NOTIFY_VAL {
-                    log::error!("fd错误:{:?}", src_fd);
-                    continue;
-                }
-                let addr = match addr {
-                    SocketAddr::V4(addr) => addr,
-                    SocketAddr::V6(_) => {
-                        // 忽略ipv6
-                        continue;
-                    }
-                };
-                let _ = src_stream.set_nodelay(false);
-                if let Some(dest_addr) = nat_map.lock().get(&addr).cloned() {
-                    match tcp_connect(addr.port(), dest_addr.into()) {
-                        Ok(mut dest_stream) => {
-                            #[cfg(windows)]
-                            let dest_fd = dest_stream.as_raw_socket() as usize;
-                            #[cfg(unix)]
-                            let dest_fd = dest_stream.as_raw_fd() as usize;
-                            if dest_fd == SERVER_VAL || dest_fd == NOTIFY_VAL {
-                                log::error!("fd错误:{:?}", dest_fd);
-                                continue;
-                            }
-                            if let Err(e) = registry.register(
-                                &mut src_stream,
-                                Token(src_fd),
-                                Interest::READABLE.add(Interest::WRITABLE),
-                            ) {
-                                log::error!("register src_stream:{:?}", e);
-                                continue;
-                            }
-                            if let Err(e) = registry.register(
-                                &mut dest_stream,
-                                Token(dest_fd),
-                                Interest::READABLE.add(Interest::WRITABLE),
-                            ) {
-                                log::error!("register dest_stream:{:?}", e);
-                                continue;
-                            }
-                            tcp_map.insert(
-                                src_fd,
-                                ProxyValue::new(src_stream, dest_stream, src_fd, dest_fd),
-                            );
-                            mapping.insert(dest_fd, src_fd);
-                        }
-                        Err(e) => {
-                            log::error!("connect:{:?} {}->{}", e, addr, dest_addr);
-                        }
+        match tcp_listener.accept().await {
+            Ok((tcp_stream, sender_addr)) => match sender_addr {
+                SocketAddr::V4(sender_addr) => {
+                    if let Some(dest_addr) = nat_map.lock().get(&sender_addr).cloned() {
+                        tokio::spawn(async move {
+                            let peer_tcp_stream =
+                                match tcp_connect(sender_addr.port(), dest_addr.into()).await {
+                                    Ok(peer_tcp_stream) => peer_tcp_stream,
+                                    Err(e) => {
+                                        log::warn!(
+                                            "tcp代理异常:{:?},来源:{},目标：{}",
+                                            e,
+                                            sender_addr,
+                                            dest_addr
+                                        );
+                                        return;
+                                    }
+                                };
+                            proxy(sender_addr, dest_addr, tcp_stream, peer_tcp_stream).await
+                        });
+                    } else {
+                        log::warn!("tcp代理异常: 来源:{},未找到目标", sender_addr);
                    }
                }
-            }
+                SocketAddr::V6(_) => {}
+            },
            Err(e) => {
-                if e.kind() == io::ErrorKind::WouldBlock {
-                    break;
-                }
-                log::error!("accept:{:?}", e);
+                log::warn!("tcp代理监听:{:?}", e);
            }
        }
    }
 }
-
-fn tcp_connect(src_port: u16, addr: SocketAddr) -> io::Result<TcpStream> {
-    let socket = socket2::Socket::new(
-        socket2::Domain::IPV4,
-        socket2::Type::STREAM,
-        Some(socket2::Protocol::TCP),
-    )?;
+/// 优先使用来源端口建立tcp连接
+async fn tcp_connect(src_port: u16, addr: SocketAddr) -> anyhow::Result<TcpStream> {
+    let socket = TcpSocket::new_v4()?;
    if socket
-        .bind(&SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, src_port).into())
+        .bind(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, src_port).into())
        .is_err()
    {
-        socket.bind(&SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0).into())?;
-    }
-    if let Err(e) = socket.set_tcp_keepalive(
-        &socket2::TcpKeepalive::new()
-            .with_time(Duration::from_secs(120))
-            .with_interval(Duration::from_secs(10)),
-    ) {
-        log::warn!("set_tcp_keepalive err {:?}", e);
+        socket.bind(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0).into())?;
    }
    let _ = socket.set_nodelay(false);
-    socket.connect_timeout(&addr.into(), Duration::from_secs(3))?;
-    socket.set_nonblocking(true)?;
-    Ok(TcpStream::from_std(socket.into()))
+    let tcp_stream = tokio::time::timeout(Duration::from_secs(5), socket.connect(addr))
+        .await
+        .with_context(|| format!("TCP connection timeout {}", addr))?
+        .with_context(|| format!("TCP connection target failed {}", addr))?;
+    Ok(tcp_stream)
 }

-#[derive(Debug)]
-struct ProxyValue {
-    src_stream: TcpStream,
-    dest_stream: TcpStream,
-    src_fd: usize,
-    dest_fd: usize,
-    src_buf: BytesMut,
-    dest_buf: BytesMut,
-    src_state: u8,
-    dest_state: u8,
-}
-
-const BUF_LEN: usize = 65536;
-
-impl ProxyValue {
-    fn new(src_stream: TcpStream, dest_stream: TcpStream, src_fd: usize, dest_fd: usize) -> Self {
-        Self {
-            src_stream,
-            dest_stream,
-            src_fd,
-            dest_fd,
-            src_buf: BytesMut::with_capacity(BUF_LEN),
-            dest_buf: BytesMut::with_capacity(BUF_LEN),
-            src_state: NORMAL,
-            dest_state: NORMAL,
-        }
-    }
-    fn as_mut(
-        &mut self,
-        index: usize,
-    ) -> (
-        &mut TcpStream,
-        &mut TcpStream,
-        &mut BytesMut,
-        &mut BytesMut,
-        &mut u8,
-        &mut u8,
-    ) {
-        if index == self.src_fd {
-            (
-                &mut self.src_stream,
-                &mut self.dest_stream,
-                &mut self.src_buf,
-                &mut self.dest_buf,
-                &mut self.src_state,
-                &mut self.dest_state,
-            )
-        } else {
-            (
-                &mut self.dest_stream,
-                &mut self.src_stream,
-                &mut self.dest_buf,
-                &mut self.src_buf,
-                &mut self.dest_state,
-                &mut self.src_state,
-            )
-        }
-    }
-}
-
-fn readable_handle(
-    stream1: &mut TcpStream,
-    stream2: &mut TcpStream,
-    mid_buf: &mut BytesMut,
-    state2: &mut u8,
-) -> io::Result<()> {
-    let mut buf = [0; BUF_LEN];
-
-    loop {
-        if mid_buf.len() >= BUF_LEN {
-            // 达到上限不再继续读取
-            return Ok(());
-        }
-        match stream1.read(&mut buf) {
-            Ok(len) => {
-                if len == 0 {
-                    return Err(io::Error::from(io::ErrorKind::UnexpectedEof));
-                }
-                let mut buf = &buf[..len];
-                if mid_buf.is_empty() {
-                    // 直接写入，避免在buf中过渡
-                    while !buf.is_empty() {
-                        match stream2.write(buf) {
-                            Ok(end) => {
-                                if end == 0 {
-                                    *state2 |= WRITE_CLOSED;
-                                    return Err(io::Error::from(io::ErrorKind::WriteZero));
-                                }
-                                buf = &buf[end..];
-                            }
-                            Err(e) => {
-                                if e.kind() != io::ErrorKind::WouldBlock {
-                                    *state2 |= WRITE_CLOSED;
-                                    return Err(e);
-                                }
-                                break;
-                            }
-                        }
-                    }
-                    if buf.is_empty() {
-                        continue;
-                    }
-                }
-                mid_buf.reserve(buf.len());
-                mid_buf.put_slice(buf);
-            }
-            Err(e) => {
-                if e.kind() == io::ErrorKind::WouldBlock {
-                    break;
-                }
-                return Err(e);
-            }
-        }
-    }
-    Ok(())
-}
-
-fn writable_handle(stream: &mut TcpStream, mid_buf: &mut BytesMut) -> io::Result<()> {
-    while !mid_buf.is_empty() {
-        match stream.write(&mid_buf) {
-            Ok(len) => {
-                let _ = mid_buf.split_to(len);
-            }
-            Err(e) => {
-                if e.kind() == io::ErrorKind::WouldBlock {
-                    break;
-                }
-                return Err(e);
-            }
-        }
-    }
-    Ok(())
-}
-
-fn close(
-    index: usize,
-    tcp_map: &mut HashMap<usize, ProxyValue>,
-    mapping: &mut HashMap<usize, usize>,
+async fn proxy(
+    sender_addr: SocketAddrV4,
+    dest_addr: SocketAddrV4,
+    client: TcpStream,
+    server: TcpStream,
 ) {
-    if let Some(val) = tcp_map.remove(&index) {
-        let _ = val.src_stream.shutdown(Shutdown::Both);
-        let _ = val.dest_stream.shutdown(Shutdown::Both);
-        mapping.remove(&val.src_fd);
-        mapping.remove(&val.dest_fd);
+    let (mut client_read, mut client_write) = client.into_split();
+    let (mut server_read, mut server_write) = server.into_split();
+    tokio::spawn(async move {
+        if let Err(e) = tokio::io::copy(&mut client_read, &mut server_write).await {
+            log::warn!("client tcp proxy {}->{},{:?}", sender_addr, dest_addr, e);
+        }
+    });
+    if let Err(e) = tokio::io::copy(&mut server_read, &mut client_write).await {
+        log::warn!("server tcp proxy {}->{},{:?}", sender_addr, dest_addr, e);
    }
 }
-
-const NORMAL: u8 = 0b00;
-const READ_CLOSED: u8 = 0b01;
-const WRITE_CLOSED: u8 = 0b10;
-const BOTH_CLOSED: u8 = 0b11;
-
-fn is_read_closed(state: u8) -> bool {
-    (state & READ_CLOSED == READ_CLOSED) || is_both_closed(state)
-}
-
-fn is_write_closed(state: u8) -> bool {
-    (state & WRITE_CLOSED == WRITE_CLOSED) || is_both_closed(state)
-}
-
-fn is_both_closed(state: u8) -> bool {
-    state & BOTH_CLOSED == BOTH_CLOSED
-}
@@ -1,30 +1,17 @@
+use anyhow::Context;
+use crossbeam_utils::atomic::AtomicCell;
 use std::net::{Ipv4Addr, SocketAddrV4};
-#[cfg(unix)]
-use std::os::fd::AsRawFd;
-#[cfg(windows)]
-use std::os::windows::io::AsRawSocket;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
-use std::{collections::HashMap, io, net::SocketAddr, rc::Rc, thread};
+use std::{collections::HashMap, io, net::SocketAddr};

-use mio::{net::UdpSocket, Events, Interest, Poll, Token};
-use mio::{Registry, Waker};
 use parking_lot::Mutex;
+use tokio::net::UdpSocket;

 use packet::ip::ipv4::packet::IpV4Packet;
 use packet::udp::udp::UdpPacket;

 use crate::ip_proxy::ProxyHandler;
-use crate::util::{Scheduler, StopManager};
-
-const SERVER_VAL: usize = 0;
-const SERVER: Token = Token(SERVER_VAL);
-const NOTIFY_VAL: usize = 1;
-const NOTIFY: Token = Token(NOTIFY_VAL);
-// 开了ip代理后使用mstsc，mstsc会误以为在真实局域网，从而不维护udp心跳，导致断连，所以这里尽量长一点过期时间
-const NAT_TIMEOUT: Duration = Duration::from_secs(20 * 60);
-const NAT_FAST_TIMEOUT: Duration = Duration::from_secs(5 * 60);
-const NAT_MAX: usize = 5_000;

 #[derive(Clone)]
 pub struct UdpProxy {
@@ -33,21 +20,20 @@ pub struct UdpProxy {
 }

 impl UdpProxy {
-    pub fn new(scheduler: Scheduler, stop_manager: StopManager) -> io::Result<Self> {
+    pub async fn new() -> anyhow::Result<Self> {
        let nat_map: Arc<Mutex<HashMap<SocketAddrV4, SocketAddrV4>>> =
            Arc::new(Mutex::new(HashMap::with_capacity(16)));
-        let udp = UdpSocket::bind(format!("0.0.0.0:{}", 0).parse().unwrap())?;
+        let udp = UdpSocket::bind(format!("0.0.0.0:{}", 0))
+            .await
+            .context("UdpProxy bind failed")?;
        let port = udp.local_addr()?.port();
        {
            let nat_map = nat_map.clone();
-            thread::Builder::new()
-                .name("udpProxy".into())
-                .spawn(move || {
-                    if let Err(e) = udp_proxy(udp, nat_map, scheduler, stop_manager) {
-                        log::warn!("udp_proxy:{:?}", e);
-                    }
-                })
-                .expect("udpProxy");
+            tokio::spawn(async {
+                if let Err(e) = udp_proxy(udp, nat_map).await {
+                    log::warn!("udp_proxy:{:?}", e);
+                }
+            });
        }
        Ok(Self { port, nat_map })
    }
@@ -95,218 +81,101 @@ impl ProxyHandler for UdpProxy {
    }
 }

-fn udp_proxy(
-    mut udp: UdpSocket,
+async fn udp_proxy(
+    udp: UdpSocket,
    nat_map: Arc<Mutex<HashMap<SocketAddrV4, SocketAddrV4>>>,
-    scheduler: Scheduler,
-    stop_manager: StopManager,
 ) -> io::Result<()> {
-    let mut poll = Poll::new()?;
+    let mut buf = [0u8; 65536];

-    poll.registry()
-        .register(&mut udp, SERVER, Interest::READABLE)?;
-    let mut events = Events::with_capacity(32);
-    let mut buf = [0; 65536];
-    let mut token_map: HashMap<Token, (Rc<UdpSocket>, SocketAddrV4, Instant)> =
-        HashMap::with_capacity(64);
-    let mut udp_map: HashMap<SocketAddrV4, (Rc<UdpSocket>, Instant)> = HashMap::with_capacity(64);
-    let mut timeout = false;
-    let waker = Arc::new(Waker::new(poll.registry(), NOTIFY)?);
-    let stop = waker.clone();
-    let _worker = stop_manager.add_listener("udp_proxy".into(), move || {
-        if let Err(e) = stop.wake() {
-            log::warn!("stop udp_proxy:{:?}", e);
-        }
-    })?;
+    let inner_map: Arc<Mutex<HashMap<SocketAddrV4, (Arc<UdpSocket>, Arc<AtomicCell<Instant>>)>>> =
+        Arc::new(Mutex::new(HashMap::with_capacity(64)));
+    let udp_socket = Arc::new(udp);
    loop {
-        let mut check = false;
-        if token_map.is_empty() {
-            poll.poll(&mut events, None)?;
-        } else {
-            //所有事件 50分钟超时
-            if let Err(e) = poll.poll(&mut events, Some(Duration::from_secs(50 * 60))) {
-                if e.kind() == io::ErrorKind::TimedOut || e.kind() == io::ErrorKind::WouldBlock {
-                    token_map.clear();
-                    udp_map.clear();
-                    continue;
+        match udp_socket.recv_from(&mut buf).await {
+            Ok((len, sender_addr)) => match sender_addr {
+                SocketAddr::V4(sender_addr) => {
+                    if let Err(e) =
+                        udp_proxy0(&buf[..len], sender_addr, &inner_map, &nat_map, &udp_socket)
+                            .await
+                    {
+                        log::warn!("udp proxy {} {:?}", sender_addr, e);
+                    }
                }
-                return Err(e);
+                SocketAddr::V6(_) => {}
+            },
+            Err(e) => {
+                log::warn!("udp代理异常:{:?}", e);
            }
-        }
-        if stop_manager.is_stop() {
-            return Ok(());
-        }
-        for event in events.iter() {
-            match event.token() {
-                SERVER => server_handle(
-                    poll.registry(),
-                    &udp,
-                    &nat_map,
-                    &mut token_map,
-                    &mut udp_map,
-                    &mut buf,
-                ),
-                NOTIFY => {
-                    check = true;
-                }
-                token => {
-                    if let Err(e) = readable_handle(&udp, &mut token_map, &token, &mut buf) {
-                        log::error!("发送目标失败:{:?}", e);
-                        if let Some((_, src_addr, _)) = token_map.remove(&token) {
-                            udp_map.remove(&src_addr);
+        };
+    }
+}
+
+async fn udp_proxy0(
+    buf: &[u8],
+    sender_addr: SocketAddrV4,
+    inner_map: &Arc<Mutex<HashMap<SocketAddrV4, (Arc<UdpSocket>, Arc<AtomicCell<Instant>>)>>>,
+    map: &Arc<Mutex<HashMap<SocketAddrV4, SocketAddrV4>>>,
+    udp_socket: &Arc<UdpSocket>,
+) -> io::Result<()> {
+    let option = inner_map.lock().get(&sender_addr).cloned();
+    if let Some((udp, time)) = option {
+        time.store(Instant::now());
+        udp.send(buf).await?;
+    } else {
+        let option = map.lock().get(&sender_addr).cloned();
+        if let Some(dest_addr) = option {
+            //先使用相同的端口，冲突了再随机端口
+            let peer_udp_socket =
+                match UdpSocket::bind(format!("0.0.0.0:{}", sender_addr.port())).await {
+                    Ok(udp) => udp,
+                    Err(_) => UdpSocket::bind("0.0.0.0:0").await?,
+                };
+            peer_udp_socket.connect(dest_addr).await?;
+            peer_udp_socket.send(buf).await?;
+            let peer_udp_socket = Arc::new(peer_udp_socket);
+            let inner_map = inner_map.clone();
+            let time = Arc::new(AtomicCell::new(Instant::now()));
+            inner_map
+                .lock()
+                .insert(sender_addr, (peer_udp_socket.clone(), time.clone()));
+            let udp_socket = udp_socket.clone();
+            let map = map.clone();
+            tokio::spawn(async move {
+                let mut buf = [0u8; 65536];
+                loop {
+                    match tokio::time::timeout(
+                        Duration::from_secs(600),
+                        peer_udp_socket.recv(&mut buf),
+                    )
+                    .await
+                    {
+                        Ok(rs) => match rs {
+                            Ok(len) => match udp_socket.send_to(&buf[..len], sender_addr).await {
+                                Ok(_) => {}
+                                Err(e) => {
+                                    log::warn!("udp proxy {}->{} {:?}", sender_addr, dest_addr, e);
+                                    break;
+                                }
+                            },
+                            Err(e) => {
+                                log::warn!("udp proxy {}->{} {:?}", sender_addr, dest_addr, e);
+
+                                break;
+                            }
+                        },
+                        Err(_) => {
+                            if time.load().elapsed() > Duration::from_secs(580) {
+                                //超时关闭
+                                log::warn!("udp proxy timeout {}->{}", sender_addr, dest_addr);
+                                break;
+                            }
                        }
                    }
                }
-            }
-        }
-        if check {
-            //超时校验
-            if token_map.len() > NAT_MAX / 2 {
-                check_handle(&mut token_map, &mut udp_map, NAT_FAST_TIMEOUT)
-            } else {
-                check_handle(&mut token_map, &mut udp_map, NAT_TIMEOUT)
-            }
-            timeout = false;
-        }
-        if !token_map.is_empty() && !timeout {
-            //注册超时监听
-            timeout = true;
-            let waker = waker.clone();
-            scheduler.timeout(NAT_FAST_TIMEOUT, move |_| {
-                let _ = waker.wake();
+                inner_map.lock().remove(&sender_addr);
+                map.lock().remove(&sender_addr);
            });
        }
    }
-}
-
-fn check_handle(
-    token_map: &mut HashMap<Token, (Rc<UdpSocket>, SocketAddrV4, Instant)>,
-    udp_map: &mut HashMap<SocketAddrV4, (Rc<UdpSocket>, Instant)>,
-    timeout: Duration,
-) {
-    let mut remove_list = Vec::new();
-    for (token, (_, addr, time)) in token_map.iter() {
-        if time.elapsed() > timeout {
-            if let Some((_, time)) = udp_map.get(addr) {
-                if time.elapsed() > timeout {
-                    //映射超时，需要移除
-                    remove_list.push(*token);
-                }
-            }
-        }
-    }
-    for token in remove_list {
-        if let Some((_, src_addr, _)) = token_map.remove(&token) {
-            udp_map.remove(&src_addr);
-        }
-    }
-}
-
-fn server_handle(
-    registry: &Registry,
-    udp: &UdpSocket,
-    nat_map: &Mutex<HashMap<SocketAddrV4, SocketAddrV4>>,
-    token_map: &mut HashMap<Token, (Rc<UdpSocket>, SocketAddrV4, Instant)>,
-    udp_map: &mut HashMap<SocketAddrV4, (Rc<UdpSocket>, Instant)>,
-    buf: &mut [u8],
-) {
-    loop {
-        let (len, src_addr) = match udp.recv_from(buf) {
-            Ok((len, src_addr)) => match src_addr {
-                SocketAddr::V4(addr) => (len, addr),
-                SocketAddr::V6(_) => {
-                    continue;
-                }
-            },
-            Err(e) => {
-                if e.kind() == io::ErrorKind::WouldBlock {
-                    break;
-                }
-                log::error!("接收数据失败:{:?}", e);
-                break;
-            }
-        };
-        if let Some((dest_udp, time)) = udp_map.get_mut(&src_addr) {
-            //发送失败就当丢包了
-            let _ = dest_udp.send(&buf[..len]);
-            *time = Instant::now();
-        } else if let Some(dest_addr) = nat_map.lock().get(&src_addr).cloned() {
-            if token_map.len() >= NAT_MAX {
-                log::error!(
-                    "UDP NAT_MAX:src_addr={:?},dest_addr={:?}",
-                    src_addr,
-                    dest_addr
-                );
-                continue;
-            }
-            match udp_connect(src_addr.port(), dest_addr.into()) {
-                Ok((token_val, mut dest_udp)) => {
-                    let token = Token(token_val);
-                    if let Err(e) = registry.register(&mut dest_udp, token, Interest::READABLE) {
-                        log::error!("register失败:{:?},addr={:?}", e, dest_addr);
-                        continue;
-                    }
-                    if dest_udp.send(&buf[..len]).is_ok() {
-                        let dest_udp = Rc::new(dest_udp);
-                        token_map.insert(token, (dest_udp.clone(), src_addr, Instant::now()));
-                        udp_map.insert(src_addr, (dest_udp, Instant::now()));
-                    }
-                }
-                Err(e) => {
-                    log::error!("绑定目标地址失败:{:?}", e);
-                    continue;
-                }
-            };
-        }
-    }
-}
-
-/// 得到一个 fd不为SERVER_VAL或者NOTYFY_VAL的socket
-fn udp_connect(src_port: u16, addr: SocketAddr) -> io::Result<(usize, UdpSocket)> {
-    loop {
-        let udp = if let Ok(udp) =
-            UdpSocket::bind(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, src_port).into())
-        {
-            udp
-        } else {
-            UdpSocket::bind(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0).into())?
-        };
-        #[cfg(windows)]
-        let fd = udp.as_raw_socket() as usize;
-        #[cfg(unix)]
-        let fd = udp.as_raw_fd() as usize;
-        if fd == SERVER_VAL || fd == NOTIFY_VAL {
-            continue;
-        }
-        // 只接收目标的数据
-        udp.connect(addr)?;
-        return Ok((fd, udp));
-    }
-}
-
-fn readable_handle(
-    udp: &UdpSocket,
-    token_map: &mut HashMap<Token, (Rc<UdpSocket>, SocketAddrV4, Instant)>,
-    token: &Token,
-    buf: &mut [u8],
-) -> io::Result<()> {
-    if let Some((dest_udp, src_addr, time)) = token_map.get_mut(&token) {
-        loop {
-            let len = match dest_udp.recv(buf) {
-                Ok(rs) => rs,
-                Err(e) => {
-                    if e.kind() == io::ErrorKind::WouldBlock {
-                        break;
-                    }
-                    return Err(e);
-                }
-            };
-            if len == 0 {
-                return Err(io::Error::from(io::ErrorKind::UnexpectedEof));
-            }
-            let _ = udp.send_to(&buf[..len], (*src_addr).into());
-        }
-        *time = Instant::now();
-    }
    Ok(())
 }
@@ -8,6 +8,8 @@ pub mod handle;
 #[cfg(feature = "ip_proxy")]
 pub mod ip_proxy;
 pub mod nat;
+#[cfg(feature = "port_mapping")]
+pub mod port_mapping;
 pub mod proto;
 pub mod protocol;
 pub mod tun_tap_device;
@@ -1,12 +1,14 @@
+use anyhow::Context;
 use std::io;
-use std::net::UdpSocket;
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, ToSocketAddrs};
+use std::net::{SocketAddr, UdpSocket};
 use std::ops::Sub;
 use std::sync::Arc;
 use std::time::{Duration, Instant};

 use crossbeam_utils::atomic::AtomicCell;
 use parking_lot::Mutex;
+use rand::Rng;

 use crate::channel::punch::{NatInfo, NatType};
 use crate::proto::message::PunchNatType;
@@ -22,6 +24,7 @@ pub fn local_ipv4_() -> io::Result<Ipv4Addr> {
        IpAddr::V6(_) => Ok(Ipv4Addr::UNSPECIFIED),
    }
 }
+
 pub fn local_ipv4() -> Option<Ipv4Addr> {
    match local_ipv4_() {
        Ok(ipv4) => Some(ipv4),
@@ -41,6 +44,7 @@ pub fn local_ipv6_() -> io::Result<Ipv6Addr> {
        IpAddr::V6(ip) => Ok(ip),
    }
 }
+
 pub fn local_ipv6() -> Option<Ipv6Addr> {
    match local_ipv6_() {
        Ok(ipv6) => Some(ipv6),
@@ -56,6 +60,8 @@ pub struct NatTest {
    stun_server: Vec<String>,
    info: Arc<Mutex<NatInfo>>,
    time: Arc<AtomicCell<Instant>>,
+    udp_ports: Vec<u16>,
+    tcp_port: u16,
 }

 impl From<NatType> for PunchNatType {
@@ -85,8 +91,9 @@ impl NatTest {
        udp_ports: Vec<u16>,
        tcp_port: u16,
    ) -> NatTest {
-        let server = stun_server[0].clone();
-        stun_server.resize(3, server);
+        if stun_server.len() > 5 {
+            stun_server.truncate(5);
+        }
        let ports = vec![0; udp_ports.len()];
        let nat_info = NatInfo::new(
            Vec::new(),
@@ -94,7 +101,7 @@ impl NatTest {
            0,
            local_ipv4,
            ipv6,
-            udp_ports,
+            udp_ports.clone(),
            tcp_port,
            NatType::Cone,
        );
@@ -105,6 +112,8 @@ impl NatTest {
            time: Arc::new(AtomicCell::new(
                Instant::now().sub(Duration::from_secs(100)),
            )),
+            udp_ports,
+            tcp_port,
        }
    }
    pub fn can_update(&self) -> bool {
@@ -116,6 +125,66 @@ impl NatTest {
    pub fn nat_info(&self) -> NatInfo {
        self.info.lock().clone()
    }
+    pub fn is_local_udp(&self, ipv4: Ipv4Addr, port: u16) -> bool {
+        for x in &self.udp_ports {
+            if x == &port {
+                let guard = self.info.lock();
+                if let Some(ip) = guard.local_ipv4 {
+                    if ipv4 == ip {
+                        return true;
+                    }
+                }
+                break;
+            }
+        }
+        false
+    }
+    pub fn is_local_tcp(&self, ipv4: Ipv4Addr, port: u16) -> bool {
+        if self.tcp_port == port {
+            let guard = self.info.lock();
+            if let Some(ip) = guard.local_ipv4 {
+                if ipv4 == ip {
+                    return true;
+                }
+            }
+        }
+        false
+    }
+    pub fn is_local_address(&self, is_tcp: bool, addr: SocketAddr) -> bool {
+        let port = addr.port();
+        let check_ip = || {
+            let guard = self.info.lock();
+            match addr.ip() {
+                IpAddr::V4(ipv4) => {
+                    if let Some(ip) = guard.local_ipv4 {
+                        if ipv4 == ip {
+                            return true;
+                        }
+                    }
+                }
+                IpAddr::V6(ipv6) => {
+                    if let Some(ip) = guard.ipv6 {
+                        if ipv6 == ip {
+                            return true;
+                        }
+                    }
+                }
+            }
+            false
+        };
+        if is_tcp {
+            if self.tcp_port == port {
+                return check_ip();
+            }
+        } else {
+            for x in &self.udp_ports {
+                if x == &port {
+                    return check_ip();
+                }
+            }
+        }
+        false
+    }
    pub fn update_addr(&self, index: usize, ip: Ipv4Addr, port: u16) {
        let mut guard = self.info.lock();
        guard.update_addr(index, ip, port)
@@ -135,4 +204,66 @@ impl NatTest {

        Ok(guard.clone())
    }
+    pub fn send_data(&self) -> anyhow::Result<(Vec<u8>, SocketAddr)> {
+        let len = self.stun_server.len();
+        let stun_server = if len == 1 {
+            &self.stun_server[0]
+        } else {
+            let index = rand::thread_rng().gen_range(0..self.stun_server.len());
+            &self.stun_server[index]
+        };
+        let addr = stun_server
+            .to_socket_addrs()?
+            .next()
+            .with_context(|| format!("stun error {:?}", stun_server))?;
+        Ok((stun::send_stun_request(), addr))
+    }
+    pub fn recv_data(
+        &self,
+        index: usize,
+        source_addr: SocketAddr,
+        buf: &[u8],
+    ) -> anyhow::Result<bool> {
+        if let Some(addr) = stun::recv_stun_response(buf) {
+            if let SocketAddr::V4(addr) = addr {
+                let mut check_fail = true;
+                let source_ip = match source_addr.ip() {
+                    IpAddr::V4(ip) => ip,
+                    IpAddr::V6(ip) => {
+                        if let Some(ip) = ip.to_ipv4_mapped() {
+                            ip
+                        } else {
+                            return Ok(false);
+                        }
+                    }
+                };
+                'a: for stun_server in &self.stun_server {
+                    for x in stun_server.to_socket_addrs()? {
+                        if source_addr.port() == x.port() {
+                            if let IpAddr::V4(ip) = x.ip() {
+                                if ip == source_ip {
+                                    check_fail = false;
+                                    break 'a;
+                                }
+                            };
+                        }
+                    }
+                }
+                if check_fail {
+                    return Ok(false);
+                }
+                let ip = addr.ip();
+                if !ip.is_multicast()
+                    && !ip.is_broadcast()
+                    && !ip.is_unspecified()
+                    && !ip.is_loopback()
+                    && !ip.is_private()
+                {
+                    self.update_addr(index, *addr.ip(), addr.port());
+                    return Ok(true);
+                }
+            }
+        }
+        return Ok(false);
+    }
 }
@@ -1,11 +1,13 @@
 use std::collections::HashSet;
 use std::io;
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::time::Duration;

 use crate::channel::punch::NatType;
+use rand::RngCore;
 use std::net::UdpSocket;
 use stun_format::Attr;
+
 pub fn stun_test_nat(stun_servers: Vec<String>) -> io::Result<(NatType, Vec<Ipv4Addr>, u16)> {
    let mut th = Vec::new();
    for _ in 0..2 {
@@ -36,26 +38,19 @@ pub fn stun_test_nat(stun_servers: Vec<String>) -> io::Result<(NatType, Vec<Ipv4
    }
    Ok((nat_type, hash_set.into_iter().collect(), port_range))
 }
+
 pub fn stun_test_nat0(stun_servers: Vec<String>) -> io::Result<(NatType, Vec<Ipv4Addr>, u16)> {
    let udp = UdpSocket::bind("0.0.0.0:0")?;
-    udp.set_read_timeout(Some(Duration::from_millis(300)))?;
+    udp.set_read_timeout(Some(Duration::from_millis(500)))?;
    let mut nat_type = NatType::Cone;
-    let mut port_range = 0;
+    let mut min_port = u16::MAX;
+    let mut max_port = 0;
    let mut hash_set = HashSet::new();
    let mut pub_addrs = HashSet::new();
    for x in &stun_servers {
        match test_nat(&udp, x) {
-            Ok((addr, nat_type_t, ip_list_t, port_range_t)) => {
-                if nat_type_t == NatType::Symmetric {
-                    nat_type = NatType::Symmetric;
-                }
-                for x in ip_list_t {
-                    hash_set.insert(x);
-                }
-                if port_range < port_range_t {
-                    port_range = port_range_t;
-                }
-                pub_addrs.insert(addr);
+            Ok(addr) => {
+                pub_addrs.extend(addr);
            }
            Err(e) => {
                log::warn!("stun {} error {:?} ", x, e);
@@ -65,72 +60,71 @@ pub fn stun_test_nat0(stun_servers: Vec<String>) -> io::Result<(NatType, Vec<Ipv
    if pub_addrs.len() > 1 {
        nat_type = NatType::Symmetric;
    }
-    Ok((nat_type, hash_set.into_iter().collect(), port_range))
-}
-
-fn test_nat(
-    udp: &UdpSocket,
-    stun_server: &String,
-) -> io::Result<(SocketAddr, NatType, Vec<Ipv4Addr>, u16)> {
-    udp.connect(stun_server)?;
-    let mut port_range = 0;
-    let mut hash_set = HashSet::new();
-    let mut nat_type = NatType::Cone;
-    let (mapped_addr1, changed_addr1) = test_nat_(&udp, true, true)?;
-    match mapped_addr1.ip() {
-        IpAddr::V4(ip) => {
-            hash_set.insert(ip);
-        }
-        IpAddr::V6(_) => {}
-    }
-    if udp.connect(changed_addr1).is_ok() {
-        match test_nat_(&udp, false, false) {
-            Ok((mapped_addr2, _)) => {
-                match mapped_addr2.ip() {
-                    IpAddr::V4(ip) => {
-                        hash_set.insert(ip);
-                        if mapped_addr1 != mapped_addr2 {
-                            nat_type = NatType::Symmetric;
-                        }
-                    }
-                    IpAddr::V6(_) => {}
-                }
-                port_range = mapped_addr2.port().abs_diff(mapped_addr1.port());
+    for addr in &pub_addrs {
+        if let SocketAddr::V4(addr) = addr {
+            hash_set.insert(*addr.ip());
+            if min_port > addr.port() {
+                min_port = addr.port()
            }
-            Err(e) => {
-                log::warn!("stun {} error {:?} ", stun_server, e);
+            if max_port < addr.port() {
+                max_port = addr.port()
            }
        }
    }
-    log::warn!(
-        "stun {} mapped_addr {:?} nat_type {:?}",
-        stun_server,
-        mapped_addr1,
-        nat_type
-    );
    Ok((
-        mapped_addr1,
        nat_type,
        hash_set.into_iter().collect(),
-        port_range,
+        max_port - min_port,
    ))
 }

+fn test_nat(udp: &UdpSocket, stun_server: &String) -> io::Result<HashSet<SocketAddr>> {
+    udp.connect(stun_server)?;
+    let tid = rand::thread_rng().next_u64() as u128;
+    let mut addr = HashSet::new();
+    let (mapped_addr1, changed_addr1) = test_nat_(&udp, true, true, tid)?;
+    if mapped_addr1.is_ipv4() {
+        addr.insert(mapped_addr1);
+    }
+    if let Some(changed_addr1) = changed_addr1 {
+        if udp.connect(changed_addr1).is_ok() {
+            match test_nat_(&udp, false, false, tid + 1) {
+                Ok((mapped_addr2, _)) => {
+                    if mapped_addr2.is_ipv4() {
+                        addr.insert(mapped_addr1);
+                    }
+                }
+                Err(e) => {
+                    log::warn!("stun {} error {:?} ", stun_server, e);
+                }
+            }
+        }
+    }
+    log::info!(
+        "stun {} mapped_addr {:?}  changed_addr {:?}",
+        stun_server,
+        addr,
+        changed_addr1,
+    );
+
+    Ok(addr)
+}
+
 fn test_nat_(
    udp: &UdpSocket,
    change_ip: bool,
    change_port: bool,
-) -> io::Result<(SocketAddr, SocketAddr)> {
+    tid: u128,
+) -> io::Result<(SocketAddr, Option<SocketAddr>)> {
    for _ in 0..2 {
        let mut buf = [0u8; 28];
        let mut msg = stun_format::MsgBuilder::from(buf.as_mut_slice());
-        msg.typ(stun_format::MsgType::BindingRequest).unwrap();
-        msg.tid(1).unwrap();
+        msg.typ(stun_format::MsgType::BindingRequest);
+        msg.tid(tid);
        msg.add_attr(Attr::ChangeRequest {
            change_ip,
            change_port,
-        })
-        .unwrap();
+        });
        udp.send(msg.as_bytes())?;
        let mut buf = [0; 10240];
        let (len, _addr) = match udp.recv_from(&mut buf) {
@@ -163,11 +157,11 @@ fn test_nat_(
                _ => {}
            }
            if changed_addr.is_some() && mapped_addr.is_some() {
-                return Ok((mapped_addr.unwrap(), changed_addr.unwrap()));
+                return Ok((mapped_addr.unwrap(), changed_addr));
            }
        }
        if let Some(addr) = mapped_addr {
-            return Ok((addr, changed_addr.unwrap_or(addr)));
+            return Ok((addr, changed_addr));
        }
    }
    Err(io::Error::new(io::ErrorKind::Other, "stun response err"))
@@ -183,3 +177,42 @@ fn stun_addr(addr: stun_format::SocketAddr) -> SocketAddr {
        }
    }
 }
+
+const TAG: u128 = 1827549368 << 64;
+
+pub fn send_stun_request() -> Vec<u8> {
+    let mut buf = [0u8; 28];
+    let mut msg = stun_format::MsgBuilder::from(buf.as_mut_slice());
+    msg.typ(stun_format::MsgType::BindingRequest);
+    let id = rand::thread_rng().next_u64() as u128;
+    msg.tid(id | TAG);
+    msg.add_attr(Attr::ChangeRequest {
+        change_ip: false,
+        change_port: false,
+    });
+    msg.as_bytes().to_vec()
+}
+
+pub fn recv_stun_response(buf: &[u8]) -> Option<SocketAddr> {
+    if buf[0] != 0x01 && buf[1] != 0x01 {
+        return None;
+    }
+    let msg = stun_format::Msg::from(buf);
+    if let Some(tid) = msg.tid() {
+        if tid & TAG != TAG {
+            return None;
+        }
+    }
+    for x in msg.attrs_iter() {
+        match x {
+            Attr::MappedAddress(addr) => {
+                return Some(stun_addr(addr));
+            }
+            Attr::XorMappedAddress(addr) => {
+                return Some(stun_addr(addr));
+            }
+            _ => {}
+        }
+    }
+    None
+}
@@ -0,0 +1,100 @@
+use std::net::SocketAddr;
+use std::str::FromStr;
+use std::thread;
+
+use anyhow::Context;
+
+use crate::util::StopManager;
+
+mod tcp_mapping;
+
+mod udp_mapping;
+
+pub fn convert(vec: Vec<String>) -> anyhow::Result<Vec<(bool, SocketAddr, String)>> {
+    let mut rs = Vec::with_capacity(vec.len());
+    for x in vec {
+        let string = x.trim().to_lowercase();
+        if let Some(udp_mapping) = string.strip_prefix("udp:") {
+            let mut split = udp_mapping.split("->");
+            let bind_addr = split.next().with_context(|| {
+                format!(
+                    "udp_mapping error {:?},eg: udp:127.0.0.1:80->10.26.0.10:8080",
+                    x
+                )
+            })?;
+            let bind_addr = SocketAddr::from_str(bind_addr)
+                .with_context(|| format!("udp_mapping error {}", bind_addr))?;
+            let dest = split.next().with_context(|| {
+                format!(
+                    "udp_mapping error {:?},eg: udp:127.0.0.1:80->10.26.0.10:8080",
+                    x
+                )
+            })?;
+            rs.push((false, bind_addr, dest.to_string()));
+            continue;
+        }
+        if let Some(tcp_mapping) = string.strip_prefix("tcp:") {
+            let mut split = tcp_mapping.split("->");
+            let bind_addr = split.next().with_context(|| {
+                format!(
+                    "tcp_mapping error {:?},eg: tcp:127.0.0.1:80->10.26.0.10:8080",
+                    x
+                )
+            })?;
+            let bind_addr = SocketAddr::from_str(bind_addr)
+                .with_context(|| format!("udp_mapping error {}", bind_addr))?;
+            let dest = split.next().with_context(|| {
+                format!(
+                    "tcp_mapping error {:?},eg: tcp:127.0.0.1:80->10.26.0.10:8080",
+                    x
+                )
+            })?;
+            rs.push((true, bind_addr, dest.to_string()));
+            continue;
+        }
+        Err(anyhow::anyhow!(
+            "port_mapping error {:?},eg: tcp:127.0.0.1:80->10.26.0.10:8080",
+            x
+        ))?;
+    }
+    Ok(rs)
+}
+pub fn start_port_mapping(
+    stop_manager: StopManager,
+    vec: Vec<(bool, SocketAddr, String)>,
+) -> anyhow::Result<()> {
+    if vec.is_empty() {
+        return Ok(());
+    }
+    let runtime = tokio::runtime::Builder::new_multi_thread()
+        .enable_all()
+        .thread_name("portMapping")
+        .build()?;
+    runtime.block_on(start_port_mapping0(vec))?;
+    let (sender, receiver) = tokio::sync::oneshot::channel::<()>();
+    let worker = stop_manager.add_listener("portMapping".into(), move || {
+        let _ = sender.send(());
+    })?;
+    thread::Builder::new()
+        .name("portMapping".into())
+        .spawn(move || {
+            runtime.block_on(async {
+                let _ = receiver.await;
+            });
+            runtime.shutdown_background();
+            drop(worker);
+        })?;
+
+    Ok(())
+}
+
+async fn start_port_mapping0(vec: Vec<(bool, SocketAddr, String)>) -> anyhow::Result<()> {
+    for (is_tcp, bind_addr, destination) in vec {
+        if is_tcp {
+            tcp_mapping::tcp_mapping(bind_addr, destination).await?;
+        } else {
+            udp_mapping::udp_mapping(bind_addr, destination).await?;
+        }
+    }
+    Ok(())
+}
@@ -0,0 +1,49 @@
+use anyhow::Context;
+use std::net::SocketAddr;
+use tokio::net::{TcpListener, TcpStream};
+
+pub async fn tcp_mapping(bind_addr: SocketAddr, destination: String) -> anyhow::Result<()> {
+    let tcp_listener = TcpListener::bind(bind_addr)
+        .await
+        .with_context(|| format!("TCP binding {:?} failed", bind_addr))?;
+    tokio::spawn(tcp_mapping_(bind_addr, tcp_listener, destination));
+    Ok(())
+}
+
+async fn tcp_mapping_(
+    bind_addr: SocketAddr,
+    tcp_listener: TcpListener,
+    destination: String,
+) -> anyhow::Result<()> {
+    loop {
+        let (tcp_stream, _) = tcp_listener.accept().await?;
+
+        let destination = destination.clone();
+        tokio::spawn(async move {
+            if let Err(e) = copy(tcp_stream, &destination).await {
+                log::warn!("tcp port mapping {}->{} {:?}", bind_addr, destination, e);
+            }
+        });
+    }
+}
+
+async fn copy(source_tcp: TcpStream, destination: &String) -> anyhow::Result<()> {
+    let dest_tcp = TcpStream::connect(destination)
+        .await
+        .with_context(|| format!("TCP connection target failed {:?}", destination))?;
+    let _ = source_tcp.set_nodelay(true);
+    let _ = dest_tcp.set_nodelay(true);
+
+    let destination = dest_tcp.peer_addr()?;
+    let (mut client_read, mut client_write) = source_tcp.into_split();
+    let (mut server_read, mut server_write) = dest_tcp.into_split();
+    tokio::spawn(async move {
+        if let Err(e) = tokio::io::copy(&mut client_read, &mut server_write).await {
+            log::warn!("client tcp proxy ->{:},{:?}", destination, e);
+        }
+    });
+    if let Err(e) = tokio::io::copy(&mut server_read, &mut client_write).await {
+        log::warn!("server tcp proxy ->{:?},{:?}", destination, e);
+    }
+    Ok(())
+}
@@ -0,0 +1,107 @@
+use anyhow::Context;
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use std::collections::HashMap;
+use std::net::SocketAddr;
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+use tokio::net::UdpSocket;
+
+pub async fn udp_mapping(bind_addr: SocketAddr, destination: String) -> anyhow::Result<()> {
+    let udp = UdpSocket::bind(bind_addr)
+        .await
+        .with_context(|| format!("port proxy UDP binding {:?} failed", bind_addr))?;
+    let udp = Arc::new(udp);
+
+    let inner_map: Arc<Mutex<HashMap<SocketAddr, (Arc<UdpSocket>, Arc<AtomicCell<Instant>>)>>> =
+        Arc::new(Mutex::new(HashMap::with_capacity(64)));
+
+    tokio::spawn(async move {
+        let mut buf = [0; 65536];
+        loop {
+            match udp.recv_from(&mut buf).await {
+                Ok((len, src_addr)) => {
+                    if let Err(e) =
+                        udp_mapping0(&buf[..len], src_addr, &inner_map, &udp, &destination).await
+                    {
+                        log::warn!("udp port mapping {}->{} {:?}", src_addr, destination, e);
+                    }
+                }
+                Err(e) => {
+                    log::warn!("port proxy UDP  {:?}", e);
+                }
+            }
+        }
+    });
+    Ok(())
+}
+
+async fn udp_mapping0(
+    buf: &[u8],
+    src_addr: SocketAddr,
+    inner_map: &Arc<Mutex<HashMap<SocketAddr, (Arc<UdpSocket>, Arc<AtomicCell<Instant>>)>>>,
+    udp_socket: &Arc<UdpSocket>,
+    destination: &String,
+) -> anyhow::Result<()> {
+    let option = inner_map.lock().get(&src_addr).cloned();
+    if let Some((udp, time)) = option {
+        time.store(Instant::now());
+        udp.send(buf).await?;
+    } else {
+        let dest_udp = UdpSocket::bind("0.0.0.0:0").await?;
+        dest_udp.connect(destination).await?;
+        dest_udp.send(buf).await?;
+        let destination_addr = dest_udp.peer_addr()?;
+        let udp_socket = udp_socket.clone();
+        let inner_map = inner_map.clone();
+        let dest_udp = Arc::new(dest_udp);
+        let time = Arc::new(AtomicCell::new(Instant::now()));
+        inner_map
+            .lock()
+            .insert(src_addr, (dest_udp.clone(), time.clone()));
+        tokio::spawn(async move {
+            let mut buf = [0u8; 65536];
+            loop {
+                match tokio::time::timeout(Duration::from_secs(600), dest_udp.recv(&mut buf)).await
+                {
+                    Ok(rs) => match rs {
+                        Ok(len) => match udp_socket.send_to(&buf[..len], src_addr).await {
+                            Ok(_) => {}
+                            Err(e) => {
+                                log::warn!(
+                                    "udp port mapping {}->{} {:?}",
+                                    src_addr,
+                                    destination_addr,
+                                    e
+                                );
+                                break;
+                            }
+                        },
+                        Err(e) => {
+                            log::warn!(
+                                "udp port mapping {}->{} {:?}",
+                                src_addr,
+                                destination_addr,
+                                e
+                            );
+                            break;
+                        }
+                    },
+                    Err(_) => {
+                        if time.load().elapsed() > Duration::from_secs(580) {
+                            //超时关闭
+                            log::warn!(
+                                "udp port mapping timeout {}->{}  ",
+                                src_addr,
+                                destination_addr
+                            );
+                            break;
+                        }
+                    }
+                }
+            }
+            inner_map.lock().remove(&src_addr);
+        });
+    }
+    Ok(())
+}
@@ -27,14 +27,15 @@ pub mod service_packet;

 #[derive(Eq, PartialEq, Copy, Clone, Debug)]
 pub enum Version {
-    V1,
+    V2,
    Unknown(u8),
 }

 impl From<u8> for Version {
    fn from(value: u8) -> Self {
        match value {
-            1 => Version::V1,
+            // 版本从2开始，用于和stun协议的binging响应区分开
+            2 => Version::V2,
            val => Version::Unknown(val),
        }
    }
@@ -43,7 +44,7 @@ impl From<u8> for Version {
 impl Into<u8> for Version {
    fn into(self) -> u8 {
        match self {
-            Version::V1 => 1,
+            Version::V2 => 2,
            Version::Unknown(val) => val,
        }
    }
@@ -207,8 +208,8 @@ impl<B: AsRef<[u8]> + AsMut<[u8]>> NetPacket<B> {
            self.buffer.as_mut()[0] = self.buffer.as_ref()[0] & 0xBF
        };
    }
-    pub fn set_version(&mut self, version: Version) {
-        let v: u8 = version.into();
+    pub fn set_default_version(&mut self) {
+        let v: u8 = Version::V2.into();
        self.buffer.as_mut()[0] = (self.buffer.as_ref()[0] & 0xF0) | (0x0F & v);
    }
    pub fn set_protocol(&mut self, protocol: Protocol) {
@@ -5,12 +5,12 @@ use tun::Device;

 #[cfg(any(target_os = "windows", target_os = "linux"))]
 const DEFAULT_TUN_NAME: &str = "vnt-tun";
-#[cfg(any(target_os = "windows", target_os = "linux"))]
+#[cfg(target_os = "windows")]
 const DEFAULT_TAP_NAME: &str = "vnt-tap";

 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 pub fn create_device(config: &crate::core::Config) -> io::Result<Arc<Device>> {
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    #[cfg(target_os = "windows")]
    let default_name: &str = if config.tap {
        DEFAULT_TAP_NAME
    } else {
@@ -21,11 +21,11 @@ pub fn create_device(config: &crate::core::Config) -> io::Result<Arc<Device>> {
        let device_name = config
            .device_name
            .clone()
-            .unwrap_or(default_name.to_string());
-        if &device_name == default_name {
-            delete_device(default_name);
+            .unwrap_or(DEFAULT_TUN_NAME.to_string());
+        if &device_name == DEFAULT_TUN_NAME {
+            delete_device(DEFAULT_TUN_NAME);
        }
-        Arc::new(Device::new(Some(device_name), config.tap)?)
+        Arc::new(Device::new(Some(device_name))?)
    };
    #[cfg(target_os = "macos")]
    let device = Arc::new(Device::new(config.device_name.clone())?);
@@ -6,7 +6,7 @@ use parking_lot::Mutex;

 use tun::Device;

-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::cipher::Cipher;
 use crate::external_route::ExternalRoute;
 use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
@@ -26,7 +26,7 @@ impl DeviceAdapter {
    #[cfg(target_os = "android")]
    pub fn new(tun_device_helper: TunDeviceHelper) -> Self {
        Self {
-            tun: Arc::new(Mutex::new(None)),
+            tun: Arc::new(AtomicCell::new(-1 as _)),
            tun_device_helper,
        }
    }
@@ -43,22 +43,19 @@ impl std::ops::Deref for DeviceAdapter {
 #[cfg(target_os = "android")]
 #[derive(Clone)]
 pub struct DeviceAdapter {
-    tun: Arc<Mutex<Option<Arc<Device>>>>,
+    tun: Arc<AtomicCell<std::os::fd::RawFd>>,
    tun_device_helper: TunDeviceHelper,
 }
 #[cfg(target_os = "android")]
 impl DeviceAdapter {
    pub fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        if let Some(device) = self.tun.lock().as_ref() {
-            use tun::device::IFace;
-            device.write(buf)
-        } else {
-            Err(io::Error::new(io::ErrorKind::Other, "not tun device"))
-        }
+        let fd = self.tun.load();
+        tun::Fd(fd).write(buf)
    }
-    pub fn start(&self, device: Arc<Device>) -> io::Result<()> {
-        self.tun_device_helper.start(device.clone())?;
-        self.tun.lock().replace(device);
+    pub fn start(&self, fd: std::os::fd::RawFd) -> io::Result<()> {
+        //安卓端fd是由外部释放的，所以这里这么搞免得加锁
+        self.tun_device_helper.start(Arc::new(Device::new(fd)?))?;
+        self.tun.store(fd);
        Ok(())
    }
 }
@@ -70,7 +67,7 @@ pub struct TunDeviceHelper {

 struct TunDeviceHelperInner {
    stop_manager: StopManager,
-    context: Context,
+    context: ChannelContext,
    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
    ip_route: ExternalRoute,
    #[cfg(feature = "ip_proxy")]
@@ -85,7 +82,7 @@ struct TunDeviceHelperInner {
 impl TunDeviceHelper {
    pub fn new(
        stop_manager: StopManager,
-        context: Context,
+        context: ChannelContext,
        current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
        ip_route: ExternalRoute,
        #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
@@ -1,4 +1,6 @@
-use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, UdpSocket};
+use std::cell::RefCell;
+use std::collections::HashMap;
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, ToSocketAddrs, UdpSocket};
 use std::str::FromStr;
 use std::time::Duration;
 use std::{io, thread};
@@ -6,9 +8,39 @@ use std::{io, thread};
 use anyhow::Context;
 use dns_parser::{Builder, Packet, QueryClass, QueryType, RData, ResponseCode};

+thread_local! {
+    static HISTORY: RefCell<HashMap<SocketAddr,usize>> = RefCell::new(HashMap::new());
+}
+
+/// 保留一个地址使用记录，使用过的地址后续不再选中，直到地址全使用过
+pub fn address_choose(addrs: Vec<SocketAddr>) -> anyhow::Result<SocketAddr> {
+    HISTORY.with(|history| {
+        let mut available = Vec::new();
+        for x in &addrs {
+            let num = history.borrow().get(x).map_or(0, |v| *v);
+            if num < 3 {
+                available.push(*x);
+            }
+        }
+        if available.is_empty() {
+            available = addrs;
+            history.borrow_mut().clear();
+        }
+        let addr = address_choose0(available)?;
+        history
+            .borrow_mut()
+            .entry(addr)
+            .and_modify(|v| {
+                *v += 1;
+            })
+            .or_insert(1);
+        Ok(addr)
+    })
+}
+
 /// 后续实现选择延迟最低的可用地址，需要服务端配合
 /// 现在是选择第一个地址，优先ipv6
-pub fn address_choose(addrs: Vec<SocketAddr>) -> anyhow::Result<SocketAddr> {
+fn address_choose0(addrs: Vec<SocketAddr>) -> anyhow::Result<SocketAddr> {
    let v4: Vec<SocketAddr> = addrs.iter().filter(|v| v.is_ipv4()).map(|v| *v).collect();
    let v6: Vec<SocketAddr> = addrs.iter().filter(|v| v.is_ipv6()).map(|v| *v).collect();
    let check_addr = |addrs: &Vec<SocketAddr>| -> anyhow::Result<SocketAddr> {
@@ -41,19 +73,50 @@ pub fn address_choose(addrs: Vec<SocketAddr>) -> anyhow::Result<SocketAddr> {
    }
 }

-pub fn dns_query_all(domain: &str, name_servers: Vec<String>) -> anyhow::Result<Vec<SocketAddr>> {
+pub fn dns_query_all(
+    domain: &str,
+    mut name_servers: Vec<String>,
+) -> anyhow::Result<Vec<SocketAddr>> {
    match SocketAddr::from_str(domain) {
        Ok(addr) => {
            return Ok(vec![addr]);
        }
        Err(_) => {
+            let txt_domain = domain
+                .to_lowercase()
+                .strip_prefix("txt:")
+                .map(|v| v.to_string());
            if name_servers.is_empty() {
-                Err(anyhow::anyhow!("name server is none"))?
+                if txt_domain.is_some() {
+                    name_servers.push("223.5.5.5:53".into());
+                    name_servers.push("114.114.114.114:53".into());
+                } else {
+                    return Ok(domain
+                        .to_socket_addrs()
+                        .with_context(|| format!("DNS query failed {:?}", domain))?
+                        .into_iter()
+                        .collect());
+                }
            }
+
            let mut err: Option<anyhow::Error> = None;
            for name_server in name_servers {
-                if let Some(domain) = domain.to_lowercase().strip_prefix("txt:") {
-                    return txt_dns(domain, name_server);
+                if let Some(domain) = txt_domain.as_ref() {
+                    match txt_dns(domain, name_server) {
+                        Ok(addr) => {
+                            if !addr.is_empty() {
+                                return Ok(addr);
+                            }
+                        }
+                        Err(e) => {
+                            if let Some(err) = &mut err {
+                                *err = anyhow::anyhow!("{} {}", err, e);
+                            } else {
+                                err.replace(anyhow::anyhow!("{}", e));
+                            }
+                        }
+                    }
+                    continue;
                }
                let end_index = domain
                    .rfind(":")
@@ -107,7 +170,7 @@ pub fn dns_query_all(domain: &str, name_servers: Vec<String>) -> anyhow::Result<
            if let Some(e) = err {
                Err(e)
            } else {
-                Err(anyhow::anyhow!("DNS query failed"))
+                Err(anyhow::anyhow!("DNS query failed {:?}", domain))
            }
        }
    }
@@ -1,6 +1,4 @@
 mod notify;
-mod result_convert;
-pub use result_convert::io_convert;
 mod scheduler;
 pub use notify::StopManager;
 pub use scheduler::Scheduler;
@@ -1,6 +1,7 @@
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::Arc;
 use std::thread::Thread;
+use std::time::Duration;
 use std::{io, thread};

 use parking_lot::Mutex;
@@ -31,6 +32,9 @@ impl StopManager {
    pub fn wait(&self) {
        self.inner.wait();
    }
+    pub fn wait_timeout(&self, dur: Duration) -> bool {
+        self.inner.wait_timeout(dur)
+    }
    pub fn is_stop(&self) -> bool {
        self.inner.state.load(Ordering::Acquire)
    }
@@ -103,6 +107,18 @@ impl StopManagerInner {
            thread::park()
        }
    }
+    fn wait_timeout(&self, dur: Duration) -> bool {
+        {
+            let mut guard = self.park_threads.lock();
+            guard.push(thread::current());
+            drop(guard);
+        }
+        if self.worker_num.load(Ordering::Acquire) == 0 {
+            return true;
+        }
+        thread::park_timeout(dur);
+        self.worker_num.load(Ordering::Acquire) == 0
+    }
    fn stop_call(&self) {
        if let Some(call) = self.stop_call.lock().take() {
            call();
@@ -1,10 +0,0 @@
-use std::fmt::Display;
-use std::io;
-
-#[inline]
-pub fn io_convert<T, R: Display, F: FnOnce(&io::Error) -> R>(
-    rs: io::Result<T>,
-    f: F,
-) -> io::Result<T> {
-    rs.map_err(|e| io::Error::new(e.kind(), format!("{},internal error:{:?}", f(&e), e)))
-}
@@ -13,6 +13,11 @@ impl Device {
        Ok(Self { fd: Fd::new(fd)? })
    }
 }
+impl Device {
+    pub fn as_tun_fd(&self) -> &Fd {
+        &self.fd
+    }
+}
 impl IFace for Device {
    fn version(&self) -> io::Result<String> {
        Ok(String::new())
@@ -26,7 +31,7 @@ impl IFace for Device {
        Err(io::Error::from(io::ErrorKind::Unsupported))
    }

-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> io::Result<()> {
+    fn set_ip(&self, _address: Ipv4Addr, _mask: Ipv4Addr) -> io::Result<()> {
        Err(io::Error::from(io::ErrorKind::Unsupported))
    }

@@ -34,15 +39,15 @@ impl IFace for Device {
        Err(io::Error::from(io::ErrorKind::Unsupported))
    }

-    fn set_mtu(&self, value: u32) -> io::Result<()> {
+    fn set_mtu(&self, _value: u32) -> io::Result<()> {
        Err(io::Error::from(io::ErrorKind::Unsupported))
    }

-    fn add_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr, metric: u16) -> io::Result<()> {
+    fn add_route(&self, _dest: Ipv4Addr, _netmask: Ipv4Addr, _metric: u16) -> io::Result<()> {
        Err(io::Error::from(io::ErrorKind::Unsupported))
    }

-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
+    fn delete_route(&self, _dest: Ipv4Addr, _netmask: Ipv4Addr) -> io::Result<()> {
        Err(io::Error::from(io::ErrorKind::Unsupported))
    }

@@ -3,7 +3,6 @@
 /// https://github.com/Tazdevil971/tap-windows
 /// https://github.com/nulldotblack/wintun
 pub mod device;
-mod packet;

 #[cfg(target_os = "linux")]
 mod linux;
@@ -29,3 +28,6 @@ mod windows;

 #[cfg(windows)]
 pub use windows::Device;
+
+#[cfg(windows)]
+mod packet;
@@ -1,29 +1,27 @@
+#![allow(dead_code)]
 use std::ffi::{CStr, CString};
 use std::net::Ipv4Addr;
 use std::os::fd::AsRawFd;
-use std::process::Command;
 use std::{io, mem, ptr};

 use libc::{
-    c_char, c_short, ifreq, AF_INET, IFF_MULTI_QUEUE, IFF_NO_PI, IFF_RUNNING, IFF_TAP, IFF_TUN,
+    c_char, c_short, ifreq, AF_INET, IFF_MULTI_QUEUE, IFF_NO_PI, IFF_RUNNING, IFF_TUN,
    IFF_UP, IFNAMSIZ, O_RDWR, SOCK_DGRAM,
 };

 use crate::device::IFace;
 use crate::linux::route;
 use crate::linux::sys::*;
-use crate::packet;
 use crate::unix::{exe_cmd, Fd, SockAddr};

 pub struct Device {
    name: String,
    ctl: Fd,
    tun: Fd,
-    mac: Option<[u8; 6]>,
 }

 impl Device {
-    pub fn new(name: Option<String>, tap: bool) -> io::Result<Self> {
+    pub fn new(name: Option<String>) -> io::Result<Self> {
        let device = unsafe {
            let dev = match name {
                Some(name) => {
@@ -50,7 +48,7 @@ impl Device {
                );
            }

-            let device_type: c_short = if tap { IFF_TAP } else { IFF_TUN } as c_short;
+            let device_type: c_short = IFF_TUN as c_short; //if tap { IFF_TAP } else { IFF_TUN } as c_short;

            let queues_num = 1;

@@ -73,29 +71,11 @@ impl Device {
            let name = CStr::from_ptr(req.ifr_name.as_ptr())
                .to_string_lossy()
                .to_string();
-            let mac = if tap {
-                let get_mac_cmd = format!("cat /sys/class/net/{}/address", name);
-                let mac_out = exe_cmd(&get_mac_cmd)?;
-                let mac_str = String::from_utf8(mac_out.stdout).unwrap();
-                let mut mac = [0; 6];
-                let mut split = mac_str.split(":");
-                for i in 0..6 {
-                    mac[i] = u8::from_str_radix(&split.next().unwrap()[..2], 16).unwrap();
-                }
-                Some(mac)
-            } else {
-                None
-            };
-            let set_txqueuelen  = format!("ifconfig {} txqueuelen 1000", name);
-            if let Err(e) = exe_cmd(&set_txqueuelen){
-                log::warn!("{:?}",e);
-            }
-            Device {
-                name,
-                tun,
-                ctl,
-                mac,
+            let set_txqueuelen = format!("ifconfig {} txqueuelen 1000", name);
+            if let Err(e) = exe_cmd(&set_txqueuelen) {
+                log::warn!("{:?}", e);
            }
+            Device { name, tun, ctl }
        };
        device.enabled(true)?;
        Ok(device)
@@ -234,6 +214,12 @@ impl Device {
    }
 }

+impl Device {
+    pub fn as_tun_fd(&self) -> &Fd {
+        &self.tun
+    }
+}
+
 impl IFace for Device {
    fn version(&self) -> io::Result<String> {
        Ok(String::new())
@@ -286,22 +272,10 @@ impl IFace for Device {
    }

    fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        if self.mac.is_some() {
-            packet::read_tap(
-                buf,
-                |eth_buf| self.tun.read(eth_buf),
-                |eth_buf| self.tun.write(eth_buf),
-            )
-        } else {
-            self.tun.read(buf)
-        }
+        self.tun.read(buf)
    }

    fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        if let Some(mac) = &self.mac {
-            packet::write_tap(buf, |eth_buf| self.tun.write(eth_buf), mac)
-        } else {
-            self.tun.write(buf)
-        }
+        self.tun.write(buf)
    }
 }
@@ -1,3 +1,4 @@
+#![allow(dead_code)]
 use std::ffi::{c_void, CStr};
 use std::net::Ipv4Addr;
 use std::os::fd::AsRawFd;
@@ -224,6 +225,11 @@ impl Device {
        }
    }
 }
+impl Device {
+    pub fn as_tun_fd(&self) -> &Fd {
+        &self.tun
+    }
+}

 impl IFace for Device {
    fn version(&self) -> io::Result<String> {
@@ -1,3 +1,4 @@
+#![allow(dead_code)]
 use std::{fmt, io};

 /// 地址解析协议，由IP地址找到MAC地址
@@ -21,7 +21,10 @@ impl<B: AsRef<[u8]>> EthernetPacket<B> {
        let packet = EthernetPacket::unchecked(buffer);
        //头部固定14位
        if packet.buffer.as_ref().len() < 14 {
-            Err(io::Error::new(io::ErrorKind::InvalidData,format!("len={}", packet.buffer.as_ref().len())))?;
+            Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                format!("len={}", packet.buffer.as_ref().len()),
+            ))?;
        }

        Ok(packet)
@@ -13,7 +13,7 @@ where
    let mut eth_buf = [0; 65536];
    loop {
        let len = read_fn(&mut eth_buf)?;
-        if len == 0{
+        if len == 0 {
            return Ok(len);
        }
        //处理arp包
@@ -1,3 +1,4 @@
+use libc::{fcntl, F_GETFL, F_SETFL, O_NONBLOCK};
 use std::io;
 use std::os::fd::{AsRawFd, IntoRawFd, RawFd};

@@ -10,6 +11,12 @@ impl Fd {
        }
        Ok(Fd(value))
    }
+    pub fn set_nonblock(&self) -> io::Result<()> {
+        match unsafe { fcntl(self.0, F_SETFL, fcntl(self.0, F_GETFL) | O_NONBLOCK) } {
+            0 => Ok(()),
+            _ => Err(io::Error::last_os_error()),
+        }
+    }
 }

 impl Fd {
@@ -51,6 +58,7 @@ impl IntoRawFd for Fd {
    }
 }

+#[cfg(not(target_os = "android"))]
 impl Drop for Fd {
    fn drop(&mut self) {
        unsafe {
@@ -1,6 +1,7 @@
 mod fd;

 pub use fd::Fd;
+#[cfg(any(target_os = "macos", target_os = "linux"))]
 use std::process::Output;
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 mod sockaddr;
@@ -1,6 +1,7 @@
+#![allow(dead_code)]
 use crate::windows::exe_cmd;
+use std::io;
 use std::net::Ipv4Addr;
-use std::{io, process};

 /// 设置网卡名称
 pub fn set_interface_name(old_name: &str, new_name: &str) -> io::Result<()> {
@@ -1,3 +1,4 @@
+#![allow(dead_code)]
 use std::io;
 use std::net::Ipv4Addr;
 use winapi::shared::ifdef::NET_LUID;
@@ -11,8 +12,6 @@ use winapi::um::winnt::{

 use crate::device::IFace;
 use crate::packet;
-use crate::packet::ethernet::protocol::Protocol;
-use crate::packet::{arp, ethernet};
 use crate::windows::{ctl_code, decode_utf16, encode_utf16, ffi, netsh, route};

 /* Present in 8.1 */
@@ -97,7 +96,7 @@ impl Device {
        let index = ffi::luid_to_index(&luid).map(|index| index as u32)?;
        // 设置网卡跃点
        if let Err(e) = netsh::set_interface_metric(index, 0) {
-            log::warn!("{:?}",e);
+            log::warn!("{:?}", e);
        }
        let device = Self {
            handle,
@@ -122,8 +121,6 @@ impl Device {
    }
 }

-const MAC: [u8; 6] = [0xf, 0xf, 0xf, 0xf, 0xe, 0x9];
-
 impl IFace for Device {
    fn version(&self) -> io::Result<String> {
        let mut version = [0u32; 3];
@@ -1,4 +1,5 @@
-use libloading::{Error, Library};
+#![allow(dead_code)]
+use libloading::Library;
 use std::io;
 use std::net::Ipv4Addr;

@@ -84,7 +85,7 @@ impl Device {
            //SAFETY: guid is a unique integer so transmuting either all zeroes or the user's preferred
            //guid to the winapi guid type is safe and will allow the windows kernel to see our GUID

-            let guid_struct: wintun_raw::GUID = unsafe { std::mem::transmute(guid) };
+            let guid_struct: wintun_raw::GUID = std::mem::transmute(guid);
            let guid_ptr = &guid_struct as *const wintun_raw::GUID;

            //SAFETY: the function is loaded from the wintun dll properly, we are providing valid
@@ -118,7 +119,7 @@ impl Device {
            let index = ffi::luid_to_index(&std::mem::transmute(luid)).map(|index| index as u32)?;
            // 设置网卡跃点
            if let Err(e) = netsh::set_interface_metric(index, 0) {
-                log::warn!("{:?}",e);
+                log::warn!("{:?}", e);
            }
            Ok(Self {
                luid: std::mem::transmute(luid),
@@ -1,3 +1,4 @@
+#![allow(dead_code)]
 use log::*;

 use crate::windows::tun::wintun_raw;
@@ -1,3 +1,5 @@
+#![allow(non_snake_case)]
+#![allow(non_camel_case_types)]
 /* automatically generated by rust-bindgen 0.59.1 */
 #[repr(C)]
 #[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
Author	SHA1	Message	Date
lbl8603	4dca4c4f22	Merge pull request #38 from lbl8603/1.2.x 1.2.x	2024-05-11 09:21:57 +08:00
lbl8603	0e4294415e	增加日志输出内容	2024-05-10 23:19:52 +08:00
lbl8603	9df324f402	增加输出端口映射和ip代理内容	2024-05-10 23:18:45 +08:00
lbl8603	3b1236cfd0	通过stun探测端口，解决使用ipv6或tcp服务时端口错误的问题	2024-05-10 23:18:24 +08:00
lbl8603	699262d79e	rustup set auto-self-update disable	2024-05-10 23:16:37 +08:00
lbl8603	f6cfa1b84c	调整安卓端tun逻辑	2024-05-09 22:51:27 +08:00
lbl8603	1338bcbbc5	消除代码警告	2024-05-09 21:25:55 +08:00
lbl8603	4215488cb6	调整中继模式的逻辑	2024-05-09 20:16:02 +08:00
lbl8603	ccd6e44c2b	使用异步tun	2024-05-09 20:14:01 +08:00
lbl8603	b12b0b95a0	去除linux上的tap	2024-05-09 20:13:44 +08:00
lbl8603	948f3d5d24	遍历txt记录值	2024-05-09 20:12:26 +08:00
lbl8603	cf4fc54dfd	端口映射列表为空时不启动	2024-05-09 20:11:43 +08:00
lbl8603	5a9e31bded	支持异步tun	2024-05-09 20:11:08 +08:00
lbl8603	b61c140c24	去除linux上tap的支持	2024-05-09 20:10:17 +08:00
lbl8603	035ae46ee5	过滤/etc/machine-id为空的情况	2024-05-09 20:07:46 +08:00
lbl8603	b57a38e81e	增加超时方法	2024-05-08 23:58:38 +08:00
lbl8603	be767ae300	增加提示	2024-05-08 23:58:03 +08:00
lbl8603	607c8c2e9f	增加端口映射功能	2024-05-08 21:31:21 +08:00
lbl8603	d3dce7a3cc	调整stun处理	2024-05-08 20:20:09 +08:00
lbl8603	ff2bbdd837	改回用tokio处理代理，简化代码	2024-05-08 20:19:33 +08:00
lbl8603	b771b6c074	增加set_ttl方法	2024-05-08 20:16:36 +08:00
lubeilin	ff389647c0	修改帮助描述	2024-05-06 21:00:12 +08:00
lubeilin	49bec2d6aa	使用anyhow替换部分处理	2024-05-06 20:02:40 +08:00
lbl8603	ee359dc0d8	调整子网路由逻辑	2024-05-01 15:30:31 +08:00
lbl8603	d4fc28dca3	收到PunchRequest时不添加路由	2024-05-01 15:21:25 +08:00
lbl8603	1130f69a82	修改默认rt	2024-05-01 14:50:00 +08:00
lbl8603	e73ed238cd	去除无用代码	2024-04-30 23:34:17 +08:00
lbl8603	c6c1d297af	去除多余代码	2024-04-30 23:28:45 +08:00
lbl8603	f78f8de15e	修改结构体名称	2024-04-30 23:25:40 +08:00
lbl8603	fcbc52dc2e	增加icmp代理日志	2024-04-30 23:24:12 +08:00
lbl8603	bbfa255dd3	优化环路检测逻辑	2024-04-29 23:23:28 +08:00
lbl8603	18fcee52db	兼容安卓icmp	2024-04-28 23:17:45 +08:00
lbl8603	d36d0b9491	增加编译目标	2024-04-28 23:17:33 +08:00
lbl8603	fb8d7ec5b8	调整解析地址选择	2024-04-25 23:34:44 +08:00
lbl8603	24341808ef	Merge remote-tracking branch 'origin/2024-04-19' into 2024-04-19	2024-04-25 23:17:55 +08:00
lbl8603	353809f91c	优化路由添加逻辑	2024-04-25 20:04:32 +08:00
lbl8603	d2b2dfbf1e	去除多余校验	2024-04-25 19:44:20 +08:00
lbl8603	e027cf9d98	提交Cargo.lock锁定依赖版本	2024-04-24 23:18:05 +08:00
lbl8603	484b1657e8	修改dns参数描述	2024-04-24 23:09:20 +08:00
lbl8603	7dc4161f2f	避免打洞环路	2024-04-24 23:04:01 +08:00
lbl8603	18eb4af016	修改默认版本设置	2024-04-24 23:03:50 +08:00
lbl8603	635ec315f7	增加udp代理日志	2024-04-24 23:02:34 +08:00
lbl8603	37eb9ec045	优化dns查询	2024-04-24 23:02:01 +08:00
lbl8603	7c799589df	调整stun逻辑	2024-04-24 23:01:40 +08:00