Merge pull request #171 from cfdworld/main

Update Cargo.toml for client to add support for tls1.2 when use wss

.github/workflows/rust.yml

@@ -7,135 +7,157 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-
+permissions:
+  contents: write
 defaults:
   run:
-    # necessary for windows
     shell: bash
 
 jobs:
-  #  test:
-  #    runs-on: ubuntu-latest
-  #    steps:
-  #      - uses: actions/checkout@v2
-  #      - name: Init submodules
-  #        uses: snickerbockers/submodules-init@v4
-  #      - name: Cargo cache
-  #        uses: actions/cache@v2
-  #        with:
-  #          path: |
-  #            ~/.cargo/registry
-  #            ./target
-  #          key: test-cargo-registry
-  #      - name: List
-  #        run: find ./
-  #      - name: Run tests
-  #        run: cargo test --verbose
-
   build:
     strategy:
       fail-fast: false
       matrix:
-        # a list of all the targets
-        # 选择使用openssl或者ring，并不是所有平台都支持
         include:
-          - TARGET: i686-unknown-linux-musl # test in an alpine container on a mac
+          - TARGET: i686-unknown-linux-musl
             OS: ubuntu-latest
-            FEATURES: default
-          - TARGET: x86_64-unknown-linux-musl # test in an alpine container on a mac
+            FEATURES: ring-cipher,openssl-vendored,wss
+          - TARGET: x86_64-unknown-linux-musl
             OS: ubuntu-latest
-            FEATURES: ring-cipher,openssl-vendored
-          - TARGET: aarch64-unknown-linux-musl # tested on aws t4g.nano in alpine container
+            FEATURES: ring-cipher,wss
+          - TARGET: aarch64-unknown-linux-musl
             OS: ubuntu-latest
-            FEATURES: ring-cipher,openssl-vendored
-          - TARGET: armv7-unknown-linux-musleabihf # raspberry pi 2-3-4, not tested
+            FEATURES: ring-cipher,wss
+          - TARGET: armv7-unknown-linux-musleabihf
             OS: ubuntu-latest
-            FEATURES: openssl-vendored
-          - TARGET: arm-unknown-linux-musleabihf # raspberry pi 0-1, not tested
+            FEATURES: ring-cipher,wss
+          - TARGET: armv7-unknown-linux-musleabi
             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
+            FEATURES: ring-cipher,wss
+          - TARGET: arm-unknown-linux-musleabihf
+            OS: ubuntu-latest
+            FEATURES: ring-cipher,wss
+          - TARGET: arm-unknown-linux-musleabi
+            OS: ubuntu-latest
+            FEATURES: ring-cipher,wss
+          - TARGET: x86_64-apple-darwin
             OS: macos-latest
-            FEATURES: ring-cipher,openssl-vendored
-          - TARGET: aarch64-apple-darwin # tested on a mac, is not properly signed so there are security warnings
+            FEATURES: ring-cipher,wss
+          - TARGET: aarch64-apple-darwin
             OS: macos-latest
-            FEATURES: ring-cipher,openssl-vendored
-          - TARGET: i686-pc-windows-msvc # tested on a windows machine
-            OS: windows-2019
-            FEATURES: ring-cipher,openssl-vendored
-          - TARGET: x86_64-pc-windows-msvc # tested on a windows machine
+            FEATURES: ring-cipher,wss
+          - TARGET: i686-pc-windows-msvc
             OS: windows-latest
-            FEATURES: ring-cipher,openssl-vendored
-          - TARGET: mipsel-unknown-linux-musl # openwrt
+            FEATURES: ring-cipher,wss
+          - TARGET: x86_64-pc-windows-msvc
+            OS: windows-latest
+            FEATURES: ring-cipher,wss
+          - TARGET: mipsel-unknown-linux-musl
             OS: ubuntu-latest
-            FEATURES: openssl-vendored,ring-cipher
-          - TARGET: mips-unknown-linux-musl # openwrt
+            FEATURES: ring-cipher,wss
+          - TARGET: mips-unknown-linux-musl
             OS: ubuntu-latest
-            FEATURES: openssl-vendored
-    # needs: test
+            FEATURES: ring-cipher,wss
+
     runs-on: ${{ matrix.OS }}
     env:
-      NAME: vnt-cli # change with the name of your project
+      NAME: vnt-cli
       TARGET: ${{ matrix.TARGET }}
       OS: ${{ matrix.OS }}
       FEATURES: ${{ matrix.FEATURES }}
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
       - name: Init submodules
-        uses: snickerbockers/submodules-init@v4
+        run: git submodule update --init --recursive --remote && git submodule status
+
       - name: Cargo cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/registry
             ./target
           key: build-cargo-registry-${{matrix.TARGET}}
+
       - name: Use strawberry perl
-        if: startsWith(matrix.os, 'windows')
+        if: startsWith(matrix.OS, 'windows')
         run: echo OPENSSL_SRC_PERL=C:/Strawberry/perl/bin/perl >> $GITHUB_ENV
+
       - name: List
         run: find ./
-      - name: Install and configure dependencies
+
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          profile: minimal
+          override: true
+
+      - name: Verify Rust version
         run: |
-          # dependencies are only needed on ubuntu as that's the only place where
-          # we make cross-compilation
-          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
-            case $TARGET in 
-              mipsel-unknown-linux-musl)
-                MUSL_URI=mipsel-linux-musl-cross
-                ;;
-              aarch64-unknown-linux-musl)
-                MUSL_URI=aarch64-linux-musl-cross
-                ;;
-              armv7-unknown-linux-musleabihf)
-                MUSL_URI=armv7l-linux-musleabihf-cross
-                ;;   
-              arm-unknown-linux-musleabihf)
-                MUSL_URI=arm-linux-musleabihf-cross
-                ;;        
-              mips-unknown-linux-musl)
-                MUSL_URI=mips-linux-musl-cross
-                ;;
-            esac
-          
-            if [[ $TARGET =~ ^mips.*$ ]]; then
-              # mips平台使用1.71.1版本
-              rustup install 1.71.1
-              rustup default 1.71.1  
-            fi
-          
-            if [  -n "$MUSL_URI" ]; then
-              mkdir -p ./musl_gcc 
-              wget -c https://musl.cc/$MUSL_URI.tgz -P ./musl_gcc/
-              tar zxf ./musl_gcc/$MUSL_URI.tgz -C ./musl_gcc/
-              sudo ln -s $(pwd)/musl_gcc/$MUSL_URI/bin/*gcc /usr/bin/
+          rustc --version
+          cargo --version
+
+      - name: Install dependencies on Ubuntu
+        if: startsWith(matrix.OS, 'ubuntu')
+        run: |
+          sudo apt-get update && sudo apt-get install -y clang llvm libc6-dev-i386 \
+            crossbuild-essential-arm64 crossbuild-essential-armhf musl-tools libboost-all-dev libc6-dev wget tar
+
+          # Install musl cross toolchains if needed
+          case $TARGET in
+            mipsel-unknown-linux-musl)
+              MUSL_URI=mipsel-linux-muslsf-cross
+              URL=mipsel-linux-muslsf
+              ;;
+            aarch64-unknown-linux-musl)
+              MUSL_URI=aarch64-linux-musl-cross
+              ;;
+            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-muslsf-cross
+              URL=mips-linux-muslsf
+              ;;
+            i686-unknown-linux-musl)
+              MUSL_URI=i686-linux-musl-cross
+              ;;
+          esac
+
+          if [ -n "$MUSL_URI" ]; then
+            mkdir -p /opt/musl_gcc
+            wget -c https://github.com/rustp2p/musl-cross/releases/download/0.0.1/$MUSL_URI.tgz -P /opt/musl_gcc/
+            tar zxf /opt/musl_gcc/$MUSL_URI.tgz -C /opt/musl_gcc/
+            sudo ln -s /opt/musl_gcc/$MUSL_URI/bin/*gcc /usr/bin/
+          fi
+
+          if [[ $TARGET =~ ^mips.*$ ]]; then
+            cd /opt/musl_gcc/${URL}-cross/lib/gcc/${URL}/11.2.1
+            cp libgcc_eh.a libunwind.a
+            rustup toolchain install nightly-x86_64-unknown-linux-gnu
+            rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
+            RUST_LIB_SRC=$HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/
+            if [[ -f $RUST_LIB_SRC/library/Cargo.lock && ! -f $RUST_LIB_SRC/Cargo.lock ]]; then 
+               cp -f $RUST_LIB_SRC/library/Cargo.lock $RUST_LIB_SRC/Cargo.lock
             fi
           fi
-          
-          
-          # some additional configuration for cross-compilation on linux
+
+           rustup -V
+
+
+      - name: Configure cargo for cross-compilation
+        run: |
           cat >>~/.cargo/config <<EOF
           [target.x86_64-unknown-linux-musl]
           rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]
@@ -145,15 +167,27 @@ 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"
-          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]
+          linker = "mipsel-linux-muslsf-gcc"
+          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","-C", "link-arg=-static",
+          "-C", "relocation-model=static","-C", "link-arg=-no-pie","--cfg", "compiler_builtins_no_debug",
+          "-L", "/opt/musl_gcc/mipsel-linux-muslsf-cross/mipsel-linux-muslsf/lib",
+          "-L", "/opt/musl_gcc/mipsel-linux-muslsf-cross/lib/gcc/mipsel-linux-muslsf/11.2.1"]
           [target.mips-unknown-linux-musl]
-          linker = "mips-linux-musl-gcc"
-          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]
+          linker = "mips-linux-muslsf-gcc"
+          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","-C", "link-arg=-static",
+          "-C", "relocation-model=static","-C", "link-arg=-no-pie","--cfg", "compiler_builtins_no_debug",
+          "-L", "/opt/musl_gcc/mips-linux-muslsf-cross/mips-linux-muslsf/lib",
+          "-L", "/opt/musl_gcc/mips-linux-muslsf-cross/lib/gcc/mips-linux-muslsf/11.2.1"]
           [target.x86_64-pc-windows-msvc]
           rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]    
           [target.i686-pc-windows-msvc]
@@ -163,54 +197,76 @@ jobs:
           [target.aarch64-apple-darwin]
           rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]     
           [target.i686-unknown-linux-musl]
-          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]    
+          linker = "i686-linux-musl-gcc"
+          rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols"]   
           EOF
+
       - name: Install rust target
+        if: ${{ ! endsWith(matrix.TARGET, 'freebsd') &&  ! startsWith(matrix.TARGET, 'mips') }}
         run: rustup target add $TARGET
-      - name: Run build
-        run: cargo build --package vnt-cli --release --verbose --target $TARGET --features $FEATURES
+
+      - name: Run build vn-link-cli
+        run: |
+          if [[ $TARGET =~ ^mips.*$ ]]; then
+            cargo +nightly build --package vn-link-cli --release --target $TARGET -Z build-std=std,panic_abort --features $FEATURES
+          else
+            cargo build --package vn-link-cli --release --target $TARGET --features $FEATURES
+          fi
+
+      - name: Run build vnt-cli
+        run: |
+          if [[ $TARGET =~ ^mips.*$ ]]; then
+            cargo +nightly build --package vnt-cli --release --target $TARGET -Z build-std=std,panic_abort --features $FEATURES
+          else
+            cargo build --package vnt-cli --release --target $TARGET --features $FEATURES
+          fi
       - name: List target
         run: find ./target
       - name: Compress
         run: |
           mkdir -p ./artifacts
-          # windows is the only OS using a different convention for executable file name
           if [[ $OS =~ ^windows.*$ ]]; then
-              EXEC=$NAME.exe
+              EXEC_VNT_CLI=vnt-cli.exe
+              EXEC_VN_LINK_CLI=vn-link-cli.exe
           else
-              EXEC=$NAME
+              EXEC_VNT_CLI=vnt-cli
+              EXEC_VN_LINK_CLI=vn-link-cli
           fi
           if [[ $GITHUB_REF_TYPE =~ ^tag$ ]]; then
             TAG=$GITHUB_REF_NAME
           else
             TAG=$GITHUB_SHA
           fi
-          mv ./target/$TARGET/release/$EXEC ./artifacts/$EXEC
-          tar -czf ./artifacts/$NAME-$TARGET-$TAG.tar.gz -C ./artifacts $EXEC
+          mv ./target/$TARGET/release/$EXEC_VNT_CLI ./artifacts/$EXEC_VNT_CLI
+          mv ./target/$TARGET/release/$EXEC_VN_LINK_CLI ./artifacts/$EXEC_VN_LINK_CLI
+          mv ./README ./artifacts/README.txt
+          cd ./artifacts
+          tar -czf vnt-$TARGET-$TAG.tar.gz *
+          mkdir upload_file
+          mv vnt-$TARGET-$TAG.tar.gz ./upload_file/
+
       - name: Archive artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: vnt-cli
-          path: |
-            ./artifacts
-  # deploys to github releases on tag
+          name: vnt-cli-${{ matrix.TARGET }}
+          path: ./artifacts/upload_file
+
   deploy:
     if: startsWith(github.ref, 'refs/tags/')
     needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          name: vnt-cli
           path: ./artifacts
       - name: List
         run: find ./artifacts
       - name: Release
         uses: svenstaro/upload-release-action@v2
         with:
-          repo_token: ${{ secrets.YOURTOKEN }}
-          file: ./artifacts/*.tar.gz
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ./artifacts/**/*.tar.gz
           tag: ${{ github.ref }}
           overwrite: true
-          file_glob: true
+          file_glob: true

.gitignore

@@ -0,0 +1,6 @@
+target/*
+vnt/src/proto/*
+common/src/generated_serial_number.rs
+
+# RustRover
+.idea

Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
-members = ["vnt","common","vnt-cli","vnt-jni"]
+members = ["vnt", "common", "vnt-cli", "vn-link", "vn-link-cli"]
 
 [profile.release]
 opt-level = 'z'
 debug = 0
 debug-assertions = false
-strip= "debuginfo"
+strip = "debuginfo"
 lto = true
 panic = 'abort'
 incremental = false

README

@@ -0,0 +1,14 @@
+一、程序说明
+    1. vnt-cli vnt的命令行程序
+    2. vn-link-cli  功能和vnt-cli基本一致，但是不依赖tun、不改变本地路由、不需要管理员/root权限
+
+二、使用说明
+    使用-k参数构建虚拟网络
+
+
+1. Program Description
+    a. vnt-cli: Command-line program for VNT.
+    b. vn-link-cli: Functions similarly to vnt-cli, but does not depend on TUN, does not change local routing, and does not require administrator/root permissions.
+
+2. Instructions for Use
+    Use the -k parameter to create a virtual network.

README.md

@@ -1,12 +1,12 @@
-# Vnt
+# VNT
 
-A virtual network tool (VPN)
+🚀An efficient VPN
 
-将不同网络下的多个设备虚拟到一个局域网下
+🚀一个简单、高效、能快速组建虚拟局域网的工具
 
-### vnt-cli参数详解 [参数说明](https://github.com/lbl8603/vnt/blob/main/vnt-cli/README.md)
+### vnt-cli参数详解 [参数说明](https://github.com/vnt-dev/vnt/blob/main/vnt-cli/README.md)
 
-### 快速使用：
+### 快速开始：
 
 1. 指定一个token，在多台设备上运行该程序，例如：
     ```shell
@@ -39,27 +39,26 @@ A virtual network tool (VPN)
     ```
 4. 最后可以用虚拟ip实现设备间相互访问
 
-      <img width="506" alt="ssh" src="https://raw.githubusercontent.com/lbl8603/vnt/dev/documents/img/ssh.jpg">
+      <img width="506" alt="ssh" src="https://raw.githubusercontent.com/vnt-dev/vnt/main/documents/img/ssh.jpg">
 5. 帮助，使用-h命令查看
 
-### 更多玩法
-
-1. 和远程桌面(如mstsc)搭配，超低延迟的体验
-2. 安装samba服务，共享磁盘
-3. 搭配公网服务器nginx反向代理，在公网访问内网文件或服务
-4. 点对网,访问内网其他机器、IP代理(结合启动参数'-i'和'-o')
-
 ### 使用须知
 
 - token的作用是标识一个虚拟局域网，当使用公共服务器时，建议使用一个唯一值当token(比如uuid)，否则有可能连接到其他人创建的虚拟局域网中
 - 默认使用公共服务器做注册和中继，目前的配置是2核4G 4Mbps，有需要再扩展~
-- 需要root/管理员权限
 - vnt-cli需要使用命令行运行
 - Mac和Linux下需要加可执行权限(例如:chmod +x ./vnt-cli)
-- 可以自己搭注册和中继服务器([server](https://github.com/lbl8603/vnts))
-- vnt使用stun服务器探测网络NAT类型，默认使用谷歌和腾讯的stun服务器，也可自己搭建(-e参数指定)
+- 可以自己搭中继服务器([server](https://github.com/vnt-dev/vnts))
 
-### 编译
+### 直接使用
+
+[**下载release文件**](https://github.com/vnt-dev/vnt/releases)
+
+[**帮助文档**](https://rustvnt.com)
+
+### 自行编译
+
+<details> <summary>点击展开</summary>
 
 前提条件:安装rust编译环境([install rust](https://www.rust-lang.org/zh-CN/tools/install))
 
@@ -73,146 +72,68 @@ cargo build -p vnt-cli --no-default-features
 
 features说明
 
-| feature          | 说明                   | 是否默认 |
-|------------------|----------------------|------|
-| openssl          | 使用openssl中的aes_ecb算法 | 否    |
-| openssl-vendored | 从源码编译openssl         | 否    |
-| ring-cipher      | 使用ring中的aes_gcm算法    | 否    |
-| aes_cbc          | 支持aes_cbc加密          | 是    |
-| aes_ecb          | 支持aes_ecb加密          | 是    |
-| aes_gcm          | 支持aes_gcm加密          | 是    |
-| sm4_cbc          | 支持sm4_cbc加密          | 是    |
-| server_encrypt   | 支持服务端加密              | 是    |
-| ip_proxy         | 内置ip代理               | 是    |
+| feature           | 说明                             | 是否默认 |
+|-------------------|--------------------------------|------|
+| openssl           | 使用openssl中的加密算法                | 否    |
+| openssl-vendored  | 从源码编译openssl                   | 否    |
+| ring-cipher       | 使用ring中的加密算法                   | 否    |
+| aes_cbc           | 支持aes_cbc加密                    | 是    |
+| aes_ecb           | 支持aes_ecb加密                    | 是    |
+| aes_gcm           | 支持aes_gcm加密                    | 是    |
+| sm4_cbc           | 支持sm4_cbc加密                    | 是    |
+| chacha20_poly1305 | 支持chacha20和chacha20_poly1305加密 | 是    |
+| server_encrypt    | 支持服务端加密                        | 是    |
+| ip_proxy          | 内置ip代理                         | 是    |
+| port_mapping      | 端口映射                           | 是    |
+| log               | 日志                             | 是    |
+| command           | list、route等命令                  | 是    |
+| file_config       | yaml配置文件                       | 是    |
+| lz4               | lz4压缩                          | 是    |
+| zstd              | zstd压缩                         | 否    |
+| upnp              | upnp协议                         | 否    |
+| ws                | ws协议                           | 是    |
+| wss               | wss协议                          | 是    |
 
-### ip转发/代理
-如果编译时去除了内置的ip代理(或使用--no-proxy关闭了代理)，则可以使用网卡NAT转发来实现点对网，
-一般来说使用网卡NAT转发会比内置的ip代理性能更好
-<details> <summary>NAT配置可参考如下示例,点击展开</summary>
-
-### 在出口一端做如下配置
-注意原有的-i(入口)和-o(出口)的参数不能少
-
-### windows
-参考 https://learn.microsoft.com/zh-cn/virtualization/hyper-v-on-windows/user-guide/setup-nat-network
-```shell
-#设置nat,名字可以自己取，网段是vnt的网段
-New-NetNat -Name vntnat -InternalIPInterfaceAddressPrefix 10.26.0.0/24
-#查看设置
-Get-NetNat
-```
-### linux
-```shell
-# 开启ip转发
-sudo sysctl -w net.ipv4.ip_forward=1
-# 开启nat转发  表示来源10.26.0.0/24的数据通过nat映射后再从vnt-tun以外的其他网卡发出去
-sudo iptables -t nat -A POSTROUTING ! -o vnt-tun -s 10.26.0.0/24 -j MASQUERADE
-# 或者这样  表示来源10.26.0.0/24的数据通过nat映射后再从eth0网卡发出去
-sudo iptables -t nat -A POSTROUTING  -o eth0 -s 10.26.0.0/24 -j MASQUERADE
-# 查看设置
-iptables -vnL -t nat
-```
-
-### Arch Linux
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/vnt.svg)](https://repology.org/project/vnt/versions)
-
-- 通过 AUR 安装 [vnt-git](https://aur.archlinux.org/packages/vnt-git)
-
-```bash
-yay -Syu vnt
-```
-
-- 通过 `systemd` 设置开机自启及配置
-
-```bash
-sudo systemctl enable --now vnt-cli@
-sudo systemctl status vnt-cli@
-```
-
-- 启用内置 `IPv4` 转发规则
-
-```bash
-sudo sysctl --system
-```
-
-- 通过内置防火墙文件配置防火墙转发规则
-
-```bash
-sudo cat /etc/vnt/iptables-vnt.rules >> /etc/iptables/iptables.rules
-sudo iptables-restore iptables.rules
-```
-
-### macos
-```shell
-# 开启ip转发
-sudo sysctl -w net.ipv4.ip_forward=1
-# 配置NAT转发规则
-# 在/etc/pf.conf文件中添加以下规则,en0是出口网卡，10.26.0.0/24是来源网段
-nat on en0 from 10.26.0.0/24 to any -> (en0)
-# 加载规则
-sudo pfctl -f /etc/pf.conf -e
-```
 </details>
 
 ### 支持平台
 
 - Mac
 - Linux
-    - Arch Linux `yay -Syu vnt`
 - Windows
     - 默认使用tun网卡 依赖wintun.dll([win-tun](https://www.wintun.net/))(将dll放到同目录下，建议使用版本0.14.1)
-    - 使用tap网卡 依赖tap-windows([win-tap](https://build.openvpn.net/downloads/releases/))(建议使用版本9.24.7)
+    - 可选择使用tap网卡 依赖tap-windows([win-tap](https://build.openvpn.net/downloads/releases/))(建议使用版本9.24.7)
 - Android
-    - [VntApp](https://github.com/lbl8603/VntApp)
+
+### GUI
+
+支持安卓和Windows [下载](https://github.com/vnt-dev/VntApp/releases/)
 
 ### 特性
 
 - IP层数据转发
-    - tun虚拟网卡
-    - tap虚拟网卡
 - NAT穿透
     - 点对点穿透
     - 服务端中继转发
     - 客户端中继转发
-- IP代理
+- IP代理(点对点、点对网)
 - p2p组播/广播
-- 客户端数据加密
-- 服务端数据加密
+- 客户端数据加密(`aes-gcm`、`chacha20-poly1305`等多种加密算法)
+- 服务端数据加密(`rsa` + `aes-gcm`)
+- 多通道UDP应对QOS
+- 支持TCP、UDP、WebSocket等多种协议
+- 支持数据压缩
 
-### 结构
+### 更多玩法
 
-<details> <summary>展开</summary>
-
-<pre>
-    
-   0                                            15                                              31
-   0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |e |s |unused| 版本(4)  |      协议(8)        |     上层协议(8)        |初始ttl(4)|生存时间(4)  |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |                                        源ip地址(32)                                         |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |                                        目的ip地址(32)                                       |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |                                          数据体(n)                                          |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |                                                                                             |
-  |                                          指纹(96)                                           |
-  |                                                                                             |
-  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  注：
-  1. e为是否加密标志，s为服务端通信包标志，unused占两位未使用；
-  2. 开启加密时，数据体为加密后的密文(加密方式取决于密码长度和加密模式)，
-     且会存在指纹，指纹使用sha256生成，用于对数据包完整性和真实性的校验
-</pre>
-
-
-</details>
+1. 和远程桌面(如mstsc)搭配，超低延迟的体验
+2. 安装samba服务，共享磁盘
+3. 点对网,访问内网其他机器、IP代理(结合启动参数'-i'和'-o')
 
 ### Todo
 
-- 桌面UI(测试中)
+- ~~桌面UI(已支持)~~
+- 使用FEC、ARQ等方式提升弱网环境的稳定性
 
 ### 常见问题
 
@@ -255,24 +176,42 @@ vnt默认使用10.26.0.0/24网段，和本地网络适配器的ip冲突
 2. 如果p2p后效果很差，可以选择禁用p2p（vnt-cli增加--use-channel relay 参数）
 
 #### 问题4：重启后虚拟IP发生变化，或指定了IP不能启动
+
 ##### 可能原因：
+
 设备重启后程序自动获取的id值改变，导致注册时重新分配了新的IP，或是IP冲突
+
 ##### 解决方法：
+
 1. 命令行启动增加-d参数（使用配置文件启动则在配置文件中增加device_id参数），要保证每个设备的值都不一样，取值可以任意64位以内字符串
+
 </details>
 
 ### 交流群
 
-QQ: 1034868233
+对VNT有任何问题均可以加群联系作者
+
+QQ群1: 1034868233(满人)
+
+QQ群2: 950473757
+
+QQ群3: 1060550456
+
+### 赞助
+
+如果VNT对你有帮助，欢迎打赏作者
+
+ <img width="300" alt="" src="https://github.com/vnt-dev/vnt/assets/49143209/0d3a7311-43fc-4ed7-9507-863b5d69b6b2">
 
 ### 其他
 
 可使用社区小伙伴搭建的中继服务器
 
 1. -s vnt.8443.eu.org:29871
+2. -s vnt.wherewego.top:29872
 
 ### 参与贡献
 
-<a href="https://github.com/lbl8603/vnt/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=lbl8603/vnt" />
+<a href="https://github.com/vnt-dev/vnt/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=vnt-dev/vnt" />
 </a>

common/Cargo.toml

@@ -1,8 +1,46 @@
 [package]
 name = "common"
-version = "1.2.9"
+version = "1.2.16"
 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 }
+anyhow = "1.0.82"
+console = "0.15.2"
+log = "0.4.17"
+log4rs = { version = "1.3.0", optional = true }
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.9.32"
+getopts = "0.2.21"
+gethostname = "0.4.3"
+uuid = { version = "1.8.0", features = ["v4"] }
+sys-locale = "0.3.1"
+
+[features]
+default = []
+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"]
+chacha20_poly1305 = ["vnt/chacha20_poly1305"]
+server_encrypt = ["vnt/server_encrypt"]
+ip_proxy = ["vnt/ip_proxy"]
+port_mapping = ["vnt/port_mapping"]
+lz4 = ["vnt/lz4_compress"]
+zstd = ["vnt/zstd_compress"]
+upnp = ["vnt/upnp"]
+ws = ["vnt/ws"]
+wss = ["vnt/wss"]
+command = []
+file_config = []
+log = ["log4rs"]
+integrated_tun = ["vnt/integrated_tun"]
+
+[build-dependencies]
+rand = "0.8.5"
+chrono = "0.4.23"

common/build.rs

@@ -0,0 +1,16 @@
+use rand::Rng;
+use std::fs::File;
+use std::io::Write;
+
+fn main() {
+    let now_time = chrono::Local::now();
+    let serial_number = format!(
+        "{}-{}",
+        &now_time.format("%y%m%d%H%M").to_string(),
+        rand::thread_rng().gen_range(100..1000)
+    );
+    let generated_code = format!(r#"pub const SERIAL_NUMBER: &str = "{}";"#, serial_number);
+    let dest_path = "src/generated_serial_number.rs";
+    let mut file = File::create(&dest_path).unwrap();
+    file.write_all(generated_code.as_bytes()).unwrap();
+}

common/src/args_parse.rs

@@ -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));
@@ -68,10 +68,10 @@ pub fn out_ips_parse(ips: &Vec<String>) -> Result<Vec<(u32, u32)>, String> {
 
 pub fn to_ip(mask: &str) -> Result<u32, String> {
     if let Ok(m) = mask.parse::<u32>() {
-        if m >= 32 {
+        if m > 32 {
             return Err("not netmask".to_string());
         }
-        let mut mask = 0 as u32;
+        let mut mask = 0u32;
         for i in 0..m {
             mask = mask | (1 << (31 - i));
         }

common/src/callback.rs

@@ -1,9 +1,7 @@
 use std::process;
 
 use console::style;
-
-use vnt::handle::callback::{ConnectInfo, ErrorType};
-use vnt::{DeviceInfo, ErrorInfo, HandshakeInfo, RegisterInfo, VntCallback};
+use vnt::{ConnectInfo, ErrorInfo, ErrorType, HandshakeInfo, RegisterInfo, VntCallback};
 
 #[derive(Clone)]
 pub struct VntHandler {}
@@ -12,7 +10,8 @@ impl VntCallback for VntHandler {
     fn success(&self) {
         println!(" {} ", style("====== Connect Successfully ======").green())
     }
-    fn create_tun(&self, info: DeviceInfo) {
+    #[cfg(feature = "integrated_tun")]
+    fn create_tun(&self, info: vnt::DeviceInfo) {
         println!("create_tun {}", info)
     }
 
@@ -38,7 +37,8 @@ impl VntCallback for VntHandler {
             | ErrorType::AddressExhausted
             | ErrorType::IpAlreadyExists
             | ErrorType::InvalidIp
-            | ErrorType::LocalIpExists => {
+            | ErrorType::LocalIpExists
+            | ErrorType::FailedToCrateDevice => {
                 self.stop();
             }
             _ => {}

common/src/cli.rs

@@ -0,0 +1,620 @@
+use crate::args_parse::{ips_parse, out_ips_parse};
+#[cfg(feature = "command")]
+use crate::command;
+use crate::{config, generated_serial_number};
+use anyhow::anyhow;
+use console::style;
+use getopts::Options;
+use std::collections::HashMap;
+use std::io;
+use std::net::Ipv4Addr;
+use std::path::PathBuf;
+use std::str::FromStr;
+use sys_locale::get_locale;
+use vnt::channel::punch::PunchModel;
+use vnt::channel::UseChannelType;
+use vnt::cipher::CipherModel;
+use vnt::compression::Compressor;
+use vnt::core::Config;
+
+pub fn app_home() -> io::Result<PathBuf> {
+    let root_path = match std::env::current_exe() {
+        Ok(path) => {
+            if let Some(v) = path.as_path().parent() {
+                v.to_path_buf()
+            } else {
+                log::warn!("current_exe parent none:{:?}", path);
+                PathBuf::new()
+            }
+        }
+        Err(e) => {
+            log::warn!("current_exe err:{:?}", e);
+            PathBuf::new()
+        }
+    };
+    let path = root_path.join("env");
+    if !path.exists() {
+        std::fs::create_dir_all(&path)?;
+    }
+    Ok(path)
+}
+
+pub fn parse_args_config() -> anyhow::Result<Option<(Config, Vec<String>, bool)>> {
+    #[cfg(feature = "log")]
+    let _ = log4rs::init_file("log4rs.yaml", Default::default());
+    let args: Vec<String> = std::env::args().collect();
+    let program = args[0].clone();
+    let mut opts = Options::new();
+    opts.optopt("k", "", "组网标识", "<token>");
+    opts.optopt("n", "", "设备名称", "<name>");
+    opts.optopt("d", "", "设备标识", "<id>");
+    opts.optflag("c", "", "关闭交互式命令");
+    opts.optopt("s", "", "注册和中继服务器地址", "<server>");
+    opts.optmulti("e", "", "stun服务器", "<stun-server>");
+    opts.optflag("a", "", "使用tap模式");
+    opts.optopt("", "nic", "虚拟网卡名称,windows下使用tap则必填", "<tun0>");
+    opts.optmulti("i", "", "配置点对网(IP代理)入站时使用", "<in-ip>");
+    opts.optmulti("o", "", "配置点对网出站时使用", "<out-ip>");
+    opts.optopt("w", "", "客户端加密", "<password>");
+    opts.optflag("W", "", "服务端加密");
+    opts.optopt("u", "", "自定义mtu(默认为1430)", "<mtu>");
+    opts.optopt("", "ip", "指定虚拟ip", "<ip>");
+    opts.optflag("", "relay", "仅使用服务器转发");
+    opts.optopt("", "par", "任务并行度(必须为正整数)", "<parallel>");
+    opts.optopt("", "model", "加密模式", "<model>");
+    opts.optflag("", "finger", "指纹校验");
+    opts.optopt("", "punch", "取值ipv4/ipv6", "<punch>");
+    opts.optopt("", "ports", "监听的端口", "<port,port>");
+    opts.optflag("", "cmd", "开启窗口输入");
+    opts.optflag("", "no-proxy", "关闭内置代理");
+    opts.optflag("", "first-latency", "优先延迟");
+    opts.optopt("", "use-channel", "使用通道 relay/p2p", "<use-channel>");
+    opts.optopt("", "packet-loss", "丢包率", "<packet-loss>");
+    opts.optopt("", "packet-delay", "延迟", "<packet-delay>");
+    opts.optmulti("", "dns", "dns", "<dns>");
+    opts.optmulti("", "mapping", "mapping", "<mapping>");
+    opts.optmulti("", "vnt-mapping", "vnt-mapping", "<mapping>");
+    opts.optopt("f", "", "配置文件", "<conf>");
+    opts.optopt("", "compressor", "压缩算法", "<lz4>");
+    opts.optopt("", "local-dev", "指定本地ipv4网卡名称", "<NAME>");
+    opts.optflag("", "disable-stats", "关闭流量统计");
+    opts.optflag("", "allow-wg", "允许接入WireGuard");
+    //"后台运行时,查看其他设备列表"
+    opts.optflag("", "add", "后台运行时,添加地址");
+    opts.optflag("", "list", "后台运行时,查看其他设备列表");
+    opts.optflag("", "all", "后台运行时,查看其他设备完整信息");
+    opts.optflag("", "info", "后台运行时,查看当前设备信息");
+    opts.optflag("", "route", "后台运行时,查看数据转发路径");
+    opts.optflag("", "chart_a", "后台运行时,查看流量统计");
+    opts.optopt("", "chart_b", "后台运行时,查看流量统计", "<IP>");
+    opts.optflag("", "stop", "停止后台运行");
+    opts.optflag("h", "help", "帮助");
+    let matches = match opts.parse(&args[1..]) {
+        Ok(m) => m,
+        Err(f) => {
+            print_usage(&program, opts);
+            return Err(anyhow::anyhow!("{}", f.to_string()));
+        }
+    };
+    if matches.opt_present("h") || args.len() == 1 {
+        print_usage(&program, opts);
+        return Ok(None);
+    }
+
+    #[cfg(feature = "command")]
+    if matches.opt_present("list") {
+        command::command(command::CommandEnum::List);
+        return Ok(None);
+    } else if matches.opt_present("info") {
+        command::command(command::CommandEnum::Info);
+        return Ok(None);
+    } else if matches.opt_present("stop") {
+        command::command(command::CommandEnum::Stop);
+        return Ok(None);
+    } else if matches.opt_present("route") {
+        command::command(command::CommandEnum::Route);
+        return Ok(None);
+    } else if matches.opt_present("all") {
+        command::command(command::CommandEnum::All);
+        return Ok(None);
+    }
+    #[cfg(feature = "command")]
+    if matches.opt_present("chart_a") {
+        command::command(command::CommandEnum::ChartA);
+        return Ok(None);
+    }
+    #[cfg(feature = "command")]
+    if let Some(v) = matches.opt_str("chart_b") {
+        command::command(command::CommandEnum::ChartB(v));
+        return Ok(None);
+    }
+    let conf = matches.opt_str("f");
+    let (config, vnt_link_config, cmd) = if conf.is_some() {
+        match config::read_config(&conf.unwrap()) {
+            Ok(c) => c,
+            Err(e) => {
+                return Err(anyhow::anyhow!("conf err {}", e));
+            }
+        }
+    } else {
+        if !matches.opt_present("k") {
+            print_usage(&program, opts);
+            return Err(anyhow::anyhow!("parameter -k not found ."));
+        }
+        #[cfg(feature = "integrated_tun")]
+        let device_name = matches.opt_str("nic");
+        let token: String = matches.opt_get("k").unwrap().unwrap();
+        let device_id = matches.opt_get_default("d", String::new()).unwrap();
+        let device_id = if device_id.is_empty() {
+            config::get_device_id()
+        } else {
+            device_id
+        };
+        if device_id.is_empty() {
+            print_usage(&program, opts);
+            return Err(anyhow::anyhow!("parameter -d not found ."));
+        }
+        let name = matches
+            .opt_get_default(
+                "n",
+                gethostname::gethostname()
+                    .to_str()
+                    .unwrap_or("UnknownName")
+                    .to_string(),
+            )
+            .unwrap();
+        let server_address_str = matches
+            .opt_get_default("s", "vnt.wherewego.top:29872".to_string())
+            .unwrap();
+
+        let mut stun_server = matches.opt_strs("e");
+        if stun_server.is_empty() {
+            for x in config::PUB_STUN {
+                stun_server.push(x.to_string());
+            }
+        }
+        let dns = matches.opt_strs("dns");
+        let in_ip = matches.opt_strs("i");
+        let in_ip = match ips_parse(&in_ip) {
+            Ok(in_ip) => in_ip,
+            Err(e) => {
+                print_usage(&program, opts);
+                println!();
+                println!("-i: {:?} {}", in_ip, e);
+                return Err(anyhow::anyhow!("example: -i 192.168.0.0/24,10.26.0.3"));
+            }
+        };
+        let out_ip = matches.opt_strs("o");
+        let out_ip = match out_ips_parse(&out_ip) {
+            Ok(out_ip) => out_ip,
+            Err(e) => {
+                print_usage(&program, opts);
+                println!();
+                println!("-o: {:?} {}", out_ip, e);
+                return Err(anyhow::anyhow!("example: -o 0.0.0.0/0"));
+            }
+        };
+        let password: Option<String> = matches.opt_get("w").unwrap();
+        let server_encrypt = matches.opt_present("W");
+        #[cfg(not(feature = "server_encrypt"))]
+        {
+            if server_encrypt {
+                println!("Server encryption not supported");
+                return Err(anyhow::anyhow!("Server encryption not supported"));
+            }
+        }
+        let mtu: Option<String> = matches.opt_get("u").unwrap();
+        let mtu = if let Some(mtu) = mtu {
+            match u32::from_str(&mtu) {
+                Ok(mtu) => Some(mtu),
+                Err(e) => {
+                    print_usage(&program, opts);
+                    println!();
+                    println!("'-u {}' {}", mtu, e);
+                    return Err(anyhow::anyhow!("'-u {}' {}", mtu, e));
+                }
+            }
+        } else {
+            None
+        };
+        let virtual_ip: Option<String> = matches.opt_get("ip").unwrap();
+        let virtual_ip =
+            virtual_ip.map(|v| Ipv4Addr::from_str(&v).expect(&format!("'--ip {}' error", v)));
+        if let Some(virtual_ip) = virtual_ip {
+            if virtual_ip.is_unspecified() || virtual_ip.is_broadcast() || virtual_ip.is_multicast()
+            {
+                return Err(anyhow::anyhow!("'--ip {}' invalid", virtual_ip));
+            }
+        }
+        let relay = matches.opt_present("relay");
+
+        let cipher_model = match matches.opt_get::<CipherModel>("model") {
+            Ok(model) => {
+                #[cfg(not(any(feature = "aes_gcm", feature = "server_encrypt")))]
+                {
+                    if password.is_some() && model.is_none() {
+                        return Err(anyhow::anyhow!("'--model ' undefined"));
+                    }
+                    model.unwrap_or(CipherModel::None)
+                }
+                #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
+                model.unwrap_or(CipherModel::AesGcm)
+            }
+            Err(e) => {
+                return Err(anyhow::anyhow!("'--model ' invalid,{}", e));
+            }
+        };
+
+        let finger = matches.opt_present("finger");
+        let punch_model = matches
+            .opt_get::<PunchModel>("punch")
+            .unwrap()
+            .unwrap_or(PunchModel::All);
+        let use_channel_type = matches
+            .opt_get::<UseChannelType>("use-channel")
+            .unwrap()
+            .unwrap_or_else(|| {
+                if relay {
+                    UseChannelType::Relay
+                } else {
+                    UseChannelType::All
+                }
+            });
+
+        let ports = matches
+            .opt_get::<String>("ports")
+            .unwrap_or(None)
+            .map(|v| v.split(",").map(|x| x.parse().unwrap_or(0)).collect());
+
+        let cmd = matches.opt_present("cmd");
+        #[cfg(feature = "ip_proxy")]
+        #[cfg(feature = "integrated_tun")]
+        let no_proxy = matches.opt_present("no-proxy");
+        let first_latency = matches.opt_present("first-latency");
+        let packet_loss = matches
+            .opt_get::<f64>("packet-loss")
+            .expect("--packet-loss");
+        let packet_delay = matches
+            .opt_get::<u32>("packet-delay")
+            .expect("--packet-delay")
+            .unwrap_or(0);
+        #[cfg(feature = "port_mapping")]
+        let port_mapping_list = matches.opt_strs("mapping");
+        let vnt_mapping_list = matches.opt_strs("vnt-mapping");
+        let local_dev: Option<String> = matches.opt_get("local-dev").unwrap();
+
+        let disable_stats = matches.opt_present("disable-stats");
+        let allow_wire_guard = matches.opt_present("allow-wg");
+        let compressor = if let Some(compressor) = matches.opt_str("compressor").as_ref() {
+            Compressor::from_str(compressor)
+                .map_err(|e| anyhow!("{}", e))
+                .unwrap()
+        } else {
+            Compressor::None
+        };
+        let config = Config::new(
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(target_os = "windows")]
+            false,
+            token,
+            device_id,
+            name,
+            server_address_str,
+            dns,
+            stun_server,
+            in_ip,
+            out_ip,
+            password,
+            mtu,
+            virtual_ip,
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(feature = "ip_proxy")]
+            no_proxy,
+            server_encrypt,
+            cipher_model,
+            finger,
+            punch_model,
+            ports,
+            first_latency,
+            #[cfg(feature = "integrated_tun")]
+            device_name,
+            use_channel_type,
+            packet_loss,
+            packet_delay,
+            #[cfg(feature = "port_mapping")]
+            port_mapping_list,
+            compressor,
+            !disable_stats,
+            allow_wire_guard,
+            local_dev,
+        )?;
+        (config, vnt_mapping_list, cmd)
+    };
+    println!("version {}", vnt::VNT_VERSION);
+    println!("Serial:{}", generated_serial_number::SERIAL_NUMBER);
+    log::info!(
+        "version:{},Serial:{}",
+        vnt::VNT_VERSION,
+        generated_serial_number::SERIAL_NUMBER
+    );
+    Ok(Some((config, vnt_link_config, cmd)))
+}
+
+fn get_description(key: &str, language: &str) -> String {
+    // 设置一个全局的映射来存储中英文对照
+    let descriptions: HashMap<&str, (&str, &str)> = [
+        ("-k <token>", ("使用相同的token,就能组建一个局域网络", "Use the same token to form a local network")),
+        ("-n <name>", ("给设备一个名字,便于区分不同设备,默认使用系统版本", "Give the device a name to distinguish it, defaults to system version")),
+        ("-d <id>", ("设备唯一标识符,不使用--ip参数时,服务端凭此参数分配虚拟ip,注意不能重复", "Device unique identifier, used by the server to allocate virtual IP when --ip parameter is not used, must be unique")),
+        ("-s <server>", ("注册和中继服务器地址,协议支持使用tcp://和ws://和wss://,默认为udp://", "Registration and relay server address, protocols support using tcp://, ws://, and wss://, default is udp://")),
+        ("-e <stun-server>", ("stun服务器,用于探测NAT类型,可使用多个地址,如-e stun.miwifi.com -e turn.cloudflare.com", "STUN server for detecting NAT type, can specify multiple addresses, e.g., -e stun.miwifi.com -e turn.cloudflare.com")),
+        ("-i <in-ip>", ("配置点对网(IP代理)时使用,-i 192.168.0.0/24,10.26.0.3表示允许接收网段192.168.0.0/24的数据并转发到10.26.0.3,可指定多个网段", "Used when configuring point-to-point network (IP proxy), -i 192.168.0.0/24,10.26.0.3 allows receiving data from subnet 192.168.0.0/24 and forwarding to 10.26.0.3, specify multiple subnets")),
+        ("-o <out-ip>", ("配置点对网时使用,-o 192.168.0.0/24表示允许将数据转发到192.168.0.0/24,可指定多个网段", "Used when configuring point-to-point network, -o 192.168.0.0/24 allows forwarding data to 192.168.0.0/24, specify multiple subnets")),
+        ("-w <password>", ("使用该密码生成的密钥对客户端数据进行加密,并且服务端无法解密,使用相同密码的客户端才能通信", "Encrypt client data with keys generated by this password, server cannot decrypt, clients must use the same password to communicate")),
+        ("-W", ("加密当前客户端和服务端通信的数据,请留意服务端指纹是否正确", "Encrypt the data currently being communicated between the client and server, please pay attention to whether the server fingerprint is correct")),
+        ("-u <mtu>", ("自定义mtu(默认为1420)", "Customize MTU (default is 1420)")),
+        ("-f <conf_file>", ("读取配置文件中的配置", "Read configuration from file")),
+        ("--ip <ip>", ("指定虚拟ip,指定的ip不能和其他设备重复,必须有效并且在服务端所属网段下,默认情况由服务端分配", "Specify virtual IP, must be unique and valid within server subnet, by default allocated by server")),
+        ("--model <model>", ("加密模式(默认aes_gcm),可选值", "Encryption mode (default aes_gcm), options ")),
+        ("--finger", ("增加数据指纹校验,可增加安全性,如果服务端开启指纹校验,则客户端也必须开启", "Add data fingerprint verification for increased security, client must enable if server does")),
+        ("--punch <punch>", ("取值ipv4/ipv6/ipv4-tcp/ipv4-udp/ipv6-tcp/ipv6-udp/all,ipv4表示仅使用ipv4打洞", "Values ipv4/ipv6/ipv4-tcp/ipv4-udp/ipv6-tcp/ipv6-udp/all, ipv4 for IPv4 hole punching only")),
+        ("--ports <port,port>", ("取值0~65535,指定本地监听的一组端口,默认监听两个随机端口,使用过多端口会增加网络负担", "Values 0~65535, specify a group of local listening ports, defaults to two random ports, using many ports increases network load")),
+        ("--cmd", ("开启交互式命令,使用此参数开启控制台输入", "Enable interactive command mode, use this parameter to enable console input")),
+        ("--no-proxy", ("关闭内置代理,如需点对网则需要配置网卡NAT转发", "Disable built-in proxy, configure network card NAT forwarding for point-to-point networking")),
+        ("--first-latency", ("优先低延迟的通道,默认情况优先使用p2p通道", "Prioritize low-latency channels, defaults to prioritizing p2p channel")),
+        ("--use-channel <p2p>", ("使用通道 relay/p2p/all,默认两者都使用", "Use channel relay/p2p/all, defaults to using both")),
+        ("--nic <tun0>", ("指定虚拟网卡名称", "Specify virtual network card name")),
+        ("--packet-loss <0>", ("模拟丢包,取值0~1之间的小数,程序会按设定的概率主动丢包,可用于模拟弱网", "Simulate packet loss, value between 0 and 1, program actively drops packets based on set probability, useful for simulating weak networks")),
+        ("--packet-delay <0>", ("模拟延迟,正整数,单位毫秒,程序将根据设定值延迟发送数据包,可用于模拟弱网", "Simulate latency, integer, in milliseconds (ms). The program will delay sending packets according to the set value and can be used to simulate weak networks")),
+        ("--dns <host:port>", ("DNS服务器地址,可使用多个dns,不指定时使用系统解析", "DNS server address, can specify multiple DNS servers, defaults to system resolution if not specified")),
+        ("--mapping <mapping>", ("端口映射,例如 --mapping udp:0.0.0.0:80-domain:80 映射目标是本地路由能访问的设备", "Port mapping, e.g., --mapping udp:0.0.0.0:80-domain:80 maps to a device accessible by local routing")),
+        ("--compressor-all <lz4>", ("启用压缩,可选值lz4/zstd<,level>,level为压缩级别,例如 --compressor lz4 或--compressor zstd,10", "Enable compression, options lz4/zstd<,level>, level is compression level, e.g., --compressor lz4 or --compressor zstd,10")),
+        ("--compressor-lz4 <lz4>", ("启用压缩,可选值lz4,例如 --compressor lz4", "Enable compression, option lz4, e.g., --compressor lz4")),
+        ("--compressor-zstd <zstd>", ("启用压缩,可选值zstd<,level>,level为压缩级别,例如 --compressor zstd,10", "Enable compression, options zstd<,level>, level is compression level, e.g., --compressor zstd,10")),
+        ("--vnt-mapping <x>", ("vnt地址映射,例如 --vnt-mapping tcp:80-10.26.0.10:80 映射目标是vnt网络或其子网中的设备", "VNT address mapping, e.g., --vnt-mapping tcp:80-10.26.0.10:80 maps to a device in VNT network or its subnet")),
+        ("--local-dev", ("本地出口网卡的名称", "name of local export network card")),
+        ("--disable-stats", ("关闭流量统计", "Disable traffic statistics")),
+        ("--allow-wg", ("允许接入WireGuard客户端", "Allow access to WireGuard client")),
+        ("--list", ("后台运行时,查看其他设备列表", "View list of other devices when running in background")),
+        ("--all", ("后台运行时,查看其他设备完整信息", "View complete information of other devices when running in background")),
+        ("--info", ("后台运行时,查看当前设备信息", "View information of current device when running in background")),
+        ("--route", ("后台运行时,查看数据转发路径", "View data forwarding path when running in background")),
+        ("--chart_a", ("后台运行时,查看所有IP的流量统计", "View traffic statistics of all IPs when running in background")),
+        ("--chart_b <IP>", ("后台运行时,查看单个IP的历史流量", "View historical traffic of a single IP when running in background")),
+        ("--stop", ("停止后台运行", "Stop running in background"))
+        // ... 其他选项
+    ]
+    .iter()
+    .cloned()
+    .collect();
+
+    if let Some(&(zh, en)) = descriptions.get(key) {
+        if language.starts_with("zh") {
+            return zh.to_string(); // 返回 String 类型
+        }
+        // 默认返回英文
+        return en.to_string(); // 返回 String 类型
+    }
+    // 如果没有找到对应的键，则返回空字符串
+    String::new()
+}
+
+fn print_usage(program: &str, _opts: Options) {
+    // 获取系统语言  Locale::user_default().unwrap_or_else(|_| Locale::default());
+    let language = get_locale().unwrap_or_else(|| String::from("en-US"));
+    println!("Usage: {} [options]", program);
+    println!("version:{}", vnt::VNT_VERSION);
+    println!("Serial:{}", generated_serial_number::SERIAL_NUMBER);
+    println!("Options:");
+    println!(
+        "  -k <token>          {}",
+        green(get_description("-k <token>", &language).to_string())
+    );
+    println!(
+        "  -n <name>           {}",
+        get_description("-n <name>", &language)
+    );
+    println!(
+        "  -d <id>             {}",
+        get_description("-d <id>", &language)
+    );
+    println!(
+        "  -s <server>         {}",
+        get_description("-s <server>", &language)
+    );
+    println!(
+        "  -e <stun-server>    {}",
+        get_description("-e <stun-server>", &language)
+    );
+
+    println!(
+        "  -i <in-ip>          {}",
+        get_description("-i <in-ip>", &language)
+    );
+    println!(
+        "  -o <out-ip>         {}",
+        get_description("-o <out-ip>", &language)
+    );
+    println!(
+        "  -w <password>       {}",
+        get_description("-w <password>", &language)
+    );
+    #[cfg(feature = "server_encrypt")]
+    println!("  -W                  {}", get_description("-W", &language));
+    println!(
+        "  -u <mtu>            {}",
+        get_description("-u <mtu>", &language)
+    );
+    #[cfg(feature = "file_config")]
+    println!(
+        "  -f <conf_file>      {}",
+        get_description("-f <conf_file>", &language)
+    );
+
+    println!(
+        "  --ip <ip>           {}",
+        get_description("--ip <ip>", &language)
+    );
+    let mut enums = String::new();
+    #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
+    enums.push_str("/aes_gcm");
+    #[cfg(feature = "chacha20_poly1305")]
+    enums.push_str("/chacha20_poly1305/chacha20");
+    #[cfg(feature = "aes_cbc")]
+    enums.push_str("/aes_cbc");
+    #[cfg(feature = "aes_ecb")]
+    enums.push_str("/aes_ecb");
+    #[cfg(feature = "sm4_cbc")]
+    enums.push_str("/sm4_cbc");
+    enums.push_str("/xor");
+    println!(
+        "  --model <model>     {}{}",
+        get_description("--model <model>", &language),
+        &enums[1..]
+    );
+    #[cfg(any(
+        feature = "aes_gcm",
+        feature = "chacha20_poly1305",
+        feature = "server_encrypt",
+        feature = "aes_cbc",
+        feature = "aes_ecb",
+        feature = "sm4_cbc"
+    ))]
+    println!(
+        "  --finger            {}",
+        get_description("--finger", &language)
+    );
+    println!(
+        "  --punch <punch>     {}",
+        get_description("--punch <punch>", &language)
+    );
+    println!(
+        "  --ports <port,port> {}",
+        get_description("--ports <port,port>", &language)
+    );
+    #[cfg(feature = "command")]
+    println!(
+        "  --cmd               {}",
+        get_description("--cmd", &language)
+    );
+    #[cfg(feature = "ip_proxy")]
+    #[cfg(feature = "integrated_tun")]
+    println!(
+        "  --no-proxy          {}",
+        get_description("--no-proxy", &language)
+    );
+    println!(
+        "  --first-latency     {}",
+        get_description("--first-latency", &language)
+    );
+    println!(
+        "  --use-channel <p2p> {}",
+        get_description("--use-channel <p2p>", &language)
+    );
+    #[cfg(feature = "integrated_tun")]
+    println!(
+        "  --nic <tun0>        {}",
+        get_description("--nic <tun0>", &language)
+    );
+    println!(
+        "  --packet-loss <0>   {}",
+        get_description("--packet-loss <0>", &language)
+    );
+    println!(
+        "  --packet-delay <0>  {}",
+        get_description("--packet-delay <0>", &language)
+    );
+    println!(
+        "  --dns <host:port>   {}",
+        get_description("--dns <host:port>", &language)
+    );
+
+    #[cfg(feature = "port_mapping")]
+    println!(
+        "  --mapping <mapping> {}",
+        get_description("--mapping <mapping>", &language)
+    );
+
+    #[cfg(all(feature = "lz4", feature = "zstd"))]
+    println!(
+        "  --compressor <lz4>  {}",
+        get_description("--compressor-all <lz4>", &language)
+    );
+    #[cfg(feature = "lz4")]
+    #[cfg(not(feature = "zstd"))]
+    println!(
+        "  --compressor <lz4>  {}",
+        get_description("--compressor-lz4 <lz4>", &language)
+    );
+    #[cfg(feature = "zstd")]
+    #[cfg(not(feature = "lz4"))]
+    println!(
+        "  --compressor <zstd> {}",
+        get_description("--compressor-zstd <zstd>", &language)
+    );
+
+    #[cfg(not(feature = "integrated_tun"))]
+    println!(
+        "  --vnt-mapping <x>   {}",
+        green(get_description("--vnt-mapping <x>", &language).to_string())
+    );
+    println!(
+        "  --local-dev <NAME>  {}",
+        get_description("--local-dev", &language)
+    );
+    println!(
+        "  --disable-stats     {}",
+        get_description("--disable-stats", &language)
+    );
+    println!(
+        "  --allow-wg          {}",
+        get_description("--allow-wg", &language)
+    );
+    println!();
+    #[cfg(feature = "command")]
+    {
+        // #[cfg(not(feature = "integrated_tun"))]
+        // println!(
+        //     "  --add               {}",
+        //     yellow("后台运行时,添加VNT地址映射 用法同'--vnt-mapping'".to_string())
+        // );
+        println!(
+            "  --list              {}",
+            yellow(get_description("--list", &language).to_string())
+        );
+        println!(
+            "  --all               {}",
+            yellow(get_description("--all", &language).to_string())
+        );
+        println!(
+            "  --info              {}",
+            yellow(get_description("--info", &language).to_string())
+        );
+        println!(
+            "  --route             {}",
+            yellow(get_description("--route", &language).to_string())
+        );
+        println!(
+            "  --chart_a           {}",
+            yellow(get_description("--chart_a", &language).to_string())
+        );
+        println!(
+            "  --chart_b <IP>      {}",
+            yellow(get_description("--chart_b <IP>", &language).to_string())
+        );
+        println!(
+            "  --stop              {}",
+            yellow(get_description("--stop", &language).to_string())
+        );
+    }
+    println!("  -h, --help          display help information(显示帮助信息)");
+}
+
+fn green(str: String) -> impl std::fmt::Display {
+    style(str).green()
+}
+
+#[cfg(feature = "command")]
+fn yellow(str: String) -> impl std::fmt::Display {
+    style(str).yellow()
+}

common/src/command/client.rs

@@ -4,10 +4,10 @@ use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4, UdpSocket};
 use std::str::FromStr;
 use std::time::Duration;
 
-use crate::command::entity::{DeviceItem, Info, RouteItem};
+use crate::command::entity::{ChartA, ChartB, DeviceItem, Info, RouteItem};
 
 pub struct CommandClient {
-    buf: [u8; 10240],
+    buf: Vec<u8>,
     udp: UdpSocket,
 }
 
@@ -25,12 +25,12 @@ impl CommandClient {
         )))?;
         Ok(Self {
             udp,
-            buf: [0; 10240],
+            buf: vec![0; 65536 * 8],
         })
     }
 }
 fn read_command_port() -> io::Result<u16> {
-    let path_buf = crate::app_home()?.join("command-port");
+    let path_buf = crate::cli::app_home()?.join("command-port");
     let port = std::fs::read_to_string(path_buf)?;
     match u16::from_str(&port) {
         Ok(port) => Ok(port),
@@ -53,14 +53,33 @@ impl CommandClient {
     pub fn info(&mut self) -> io::Result<Info> {
         self.send_cmd(b"info")
     }
+    pub fn chart_a(&mut self) -> io::Result<ChartA> {
+        self.send_cmd(b"chart_a")
+    }
+    pub fn chart_b(&mut self, input: &str) -> io::Result<ChartB> {
+        let cmd = if input.is_empty() {
+            "chart_b".to_string()
+        } else {
+            format!("chart_b:{}", input)
+        };
+        self.send_cmd(cmd.as_bytes())
+    }
     fn send_cmd<'a, V: Deserialize<'a>>(&'a mut self, cmd: &[u8]) -> io::Result<V> {
         self.udp.send(cmd)?;
         let len = self.udp.recv(&mut self.buf)?;
         match serde_yaml::from_slice::<V>(&self.buf[..len]) {
             Ok(val) => Ok(val),
             Err(e) => {
-                log::error!("{:?},{:?}", &self.buf[..len], e);
-                Err(io::Error::new(io::ErrorKind::Other, "data error"))
+                log::error!(
+                    "send_cmd {:?} {:?},{:?}",
+                    std::str::from_utf8(cmd),
+                    std::str::from_utf8(&self.buf[..len]),
+                    e
+                );
+                Err(io::Error::new(
+                    io::ErrorKind::Other,
+                    format!("data error {:?} buf_len={}", e, len),
+                ))
             }
         }
     }

common/src/command/entity.rs

@@ -1,4 +1,7 @@
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+use std::net::{Ipv4Addr, SocketAddr};
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Info {
     pub name: String,
@@ -11,8 +14,11 @@ pub struct Info {
     pub public_ips: String,
     pub local_addr: String,
     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)>,
+    pub udp_listen_addr: Vec<String>,
+    pub tcp_listen_addr: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -36,5 +42,27 @@ pub struct DeviceItem {
     pub rt: String,
     pub status: String,
     pub client_secret: bool,
+    pub client_secret_hash: Vec<u8>,
     pub current_client_secret: bool,
+    pub current_client_secret_hash: Vec<u8>,
+    pub wire_guard: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default)]
+pub struct ChartA {
+    pub disable_stats: bool,
+    pub up_total: u64,
+    pub down_total: u64,
+    pub up_map: HashMap<Ipv4Addr, u64>,
+    pub down_map: HashMap<Ipv4Addr, u64>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default)]
+pub struct ChartB {
+    pub disable_stats: bool,
+    pub ip: Option<Ipv4Addr>,
+    pub up_total: u64,
+    pub up_list: Vec<usize>,
+    pub down_total: u64,
+    pub down_list: Vec<usize>,
 }

common/src/command/mod.rs

@@ -1,7 +1,10 @@
+use std::collections::HashSet;
 use std::io;
+use std::net::Ipv4Addr;
+use vnt::channel::ConnectProtocol;
 use vnt::core::Vnt;
 
-use crate::command::entity::{DeviceItem, Info, RouteItem};
+use crate::command::entity::{ChartA, ChartB, DeviceItem, Info, RouteItem};
 use crate::console_out;
 
 pub mod client;
@@ -13,9 +16,56 @@ pub enum CommandEnum {
     List,
     All,
     Info,
+    ChartA,
+    ChartB(String),
     Stop,
 }
 
+pub fn command_str(cmd: &str, vnt: &Vnt) -> bool {
+    if cmd.is_empty() {
+        return false;
+    }
+    let cmd = cmd.to_lowercase();
+    let cmd = cmd.trim();
+    match cmd {
+        "list" => {
+            let list = command_list(&vnt);
+            console_out::console_device_list(list);
+        }
+        "info" => {
+            let info = command_info(&vnt);
+            console_out::console_info(info);
+        }
+        "route" => {
+            let route = command_route(&vnt);
+            console_out::console_route_table(route);
+        }
+        "all" => {
+            let list = command_list(&vnt);
+            console_out::console_device_list_all(list);
+        }
+        "chart_a" => {
+            let chart = command_chart_a(&vnt);
+            console_out::console_chart_a(chart);
+        }
+        "stop" => {
+            let _ = vnt.stop();
+            return false;
+        }
+        _ => {}
+    }
+    if let Some(ip) = cmd.strip_prefix("chart_b") {
+        let chart = if ip.is_empty() {
+            command_chart_b(&vnt, &vnt.current_device().virtual_gateway.to_string())
+        } else {
+            command_chart_b(&vnt, &ip[1..])
+        };
+        console_out::console_chart_b(chart);
+    }
+    println!();
+    return true;
+}
+
 pub fn command(cmd: CommandEnum) {
     if let Err(e) = command_(cmd) {
         println!("cmd: {:?}", e);
@@ -41,6 +91,14 @@ fn command_(cmd: CommandEnum) -> io::Result<()> {
             let info = command_client.info()?;
             console_out::console_info(info);
         }
+        CommandEnum::ChartA => {
+            let chart = command_client.chart_a()?;
+            console_out::console_chart_a(chart);
+        }
+        CommandEnum::ChartB(input) => {
+            let chart = command_client.chart_b(&input)?;
+            console_out::console_chart_b(chart);
+        }
         CommandEnum::Stop => {
             command_client.stop()?;
         }
@@ -50,6 +108,7 @@ fn command_(cmd: CommandEnum) -> io::Result<()> {
 
 pub fn command_route(vnt: &Vnt) -> Vec<RouteItem> {
     let route_table = vnt.route_table();
+    let server_addr = vnt.config().server_address_str.clone();
     let mut route_list = Vec::with_capacity(route_table.len());
     for (destination, routes) in route_table {
         for route in routes {
@@ -62,11 +121,14 @@ pub fn command_route(vnt: &Vnt) -> Vec<RouteItem> {
             } else {
                 route.rt.to_string()
             };
-            let interface = if route.is_tcp {
-                format!("tcp@{}", route.addr)
-            } else {
-                route.addr.to_string()
+            let interface = match route.protocol {
+                ConnectProtocol::UDP => route.addr.to_string(),
+                ConnectProtocol::TCP => {
+                    format!("tcp@{}", route.addr)
+                }
+                ConnectProtocol::WS | ConnectProtocol::WSS => server_addr.clone(),
             };
+
             let item = RouteItem {
                 destination: destination.to_string(),
                 next_hop,
@@ -85,6 +147,7 @@ pub fn command_list(vnt: &Vnt) -> Vec<DeviceItem> {
     let device_list = vnt.device_list();
     let mut list = Vec::new();
     let current_client_secret = vnt.client_encrypt();
+    let client_encrypt_hash = vnt.client_encrypt_hash().unwrap_or(&[]);
     for peer in device_list {
         let name = peer.name;
         let virtual_ip = peer.virtual_ip.to_string();
@@ -113,7 +176,7 @@ pub fn command_list(vnt: &Vnt) -> Vec<DeviceItem> {
             };
         let (nat_traversal_type, rt) = if let Some(route) = vnt.route(&peer.virtual_ip) {
             let nat_traversal_type = if route.metric == 1 {
-                if route.is_tcp {
+                if route.protocol.is_base_tcp() {
                     "tcp-p2p"
                 } else {
                     "p2p"
@@ -153,7 +216,10 @@ pub fn command_list(vnt: &Vnt) -> Vec<DeviceItem> {
             rt,
             status,
             client_secret,
+            client_secret_hash: peer.client_secret_hash,
             current_client_secret,
+            current_client_secret_hash: client_encrypt_hash.to_vec(),
+            wire_guard: peer.wireguard,
         };
         list.push(item);
     }
@@ -161,6 +227,7 @@ pub fn command_list(vnt: &Vnt) -> Vec<DeviceItem> {
 }
 
 pub fn command_info(vnt: &Vnt) -> Info {
+    let config = vnt.config();
     let current_device = vnt.current_device();
     let nat_info = vnt.nat_info();
     let name = vnt.name().to_string();
@@ -168,7 +235,11 @@ pub fn command_info(vnt: &Vnt) -> Info {
     let virtual_gateway = current_device.virtual_gateway().to_string();
     let virtual_netmask = current_device.virtual_netmask.to_string();
     let connect_status = format!("{:?}", vnt.connection_status());
-    let relay_server = current_device.connect_server.to_string();
+    let relay_server = if current_device.connect_server.port() == 0 {
+        config.server_address_str.clone()
+    } else {
+        current_device.connect_server.to_string()
+    };
     let nat_type = format!("{:?}", nat_info.nat_type);
     let public_ips: Vec<String> = nat_info.public_ips.iter().map(|v| v.to_string()).collect();
     let public_ips = public_ips.join(",");
@@ -180,8 +251,18 @@ pub fn command_info(vnt: &Vnt) -> Info {
         .ipv6()
         .map(|v| v.to_string())
         .unwrap_or("None".to_string());
-    let up = vnt.up_stream();
-    let down = vnt.down_stream();
+    #[cfg(feature = "port_mapping")]
+    let port_mapping_list = vnt.config().port_mapping_list.clone();
+    #[cfg(not(feature = "port_mapping"))]
+    let port_mapping_list = vec![];
+    let in_ips = vnt.config().in_ips.clone();
+    let out_ips = vnt.config().out_ips.clone();
+    let udp_listen_addr = nat_info
+        .udp_ports
+        .iter()
+        .map(|port| format!("0.0.0.0:{}", port))
+        .collect();
+    let tcp_listen_addr = format!("0.0.0.0:{}", nat_info.tcp_port);
     Info {
         name,
         virtual_ip,
@@ -193,7 +274,80 @@ pub fn command_info(vnt: &Vnt) -> Info {
         public_ips,
         local_addr,
         ipv6_addr,
-        up,
-        down,
+        port_mapping_list,
+        in_ips,
+        out_ips,
+        udp_listen_addr,
+        tcp_listen_addr,
     }
 }
+
+pub fn command_chart_a(vnt: &Vnt) -> ChartA {
+    let disable_stats = !vnt.config().enable_traffic;
+    if disable_stats {
+        let mut chart = ChartA::default();
+        chart.disable_stats = true;
+        return chart;
+    }
+    let (up_total, up_map) = vnt.up_stream_all().unwrap_or_default();
+    let (down_total, down_map) = vnt.down_stream_all().unwrap_or_default();
+    ChartA {
+        disable_stats,
+        up_total,
+        down_total,
+        up_map,
+        down_map,
+    }
+}
+
+pub fn command_chart_b(vnt: &Vnt, input_str: &str) -> ChartB {
+    let disable_stats = !vnt.config().enable_traffic;
+    if disable_stats {
+        let mut chart = ChartB::default();
+        chart.disable_stats = true;
+        return chart;
+    }
+    let (_, up_map) = vnt.up_stream_history().unwrap_or_default();
+    let (_, down_map) = vnt.down_stream_history().unwrap_or_default();
+    let up_keys: HashSet<_> = up_map.keys().cloned().collect();
+    let down_keys: HashSet<_> = down_map.keys().cloned().collect();
+    let mut keys: Vec<Ipv4Addr> = up_keys.union(&down_keys).cloned().collect();
+    keys.sort();
+    if let Some(ip) = find_matching_ipv4_address(input_str, &keys) {
+        let (up_total, up_list) = up_map.get(&ip).cloned().unwrap_or_default();
+        let (down_total, down_list) = down_map.get(&ip).cloned().unwrap_or_default();
+        ChartB {
+            disable_stats,
+            ip: Some(ip),
+            up_total,
+            up_list,
+            down_total,
+            down_list,
+        }
+    } else {
+        ChartB::default()
+    }
+}
+
+fn match_from_end(input_str: &str, ip: &str) -> bool {
+    let mut input_chars = input_str.chars().rev();
+    let mut ip_chars = ip.chars().rev();
+
+    while let (Some(ic), Some(pc)) = (input_chars.next(), ip_chars.next()) {
+        if ic != pc {
+            return false;
+        }
+    }
+
+    input_chars.next().is_none() // Ensure all input characters matched
+}
+
+fn find_matching_ipv4_address(input_str: &str, ip_addresses: &[Ipv4Addr]) -> Option<Ipv4Addr> {
+    for &ip in ip_addresses {
+        let ip_str = ip.to_string();
+        if match_from_end(input_str, &ip_str) {
+            return Some(ip);
+        }
+    }
+    None
+}

common/src/command/server.rs

@@ -1,7 +1,7 @@
+use crate::command::command_chart_b;
 use std::io;
 use std::io::Write;
 use std::net::UdpSocket;
-
 use vnt::core::Vnt;
 
 pub struct CommandServer {}
@@ -48,7 +48,7 @@ impl CommandServer {
     }
 }
 fn save_port(port: u16) -> io::Result<()> {
-    let path_buf = crate::app_home()?.join("command-port");
+    let path_buf = crate::cli::app_home()?.join("command-port");
     let mut file = std::fs::File::create(path_buf)?;
     file.write_all(port.to_string().as_bytes())?;
     file.sync_all()
@@ -63,15 +63,26 @@ fn command(cmd: &str, vnt: &Vnt) -> io::Result<String> {
             .unwrap_or_else(|e| format!("error {:?}", e)),
         "info" => serde_yaml::to_string(&crate::command::command_info(vnt))
             .unwrap_or_else(|e| format!("error {:?}", e)),
+        "chart_a" => serde_yaml::to_string(&crate::command::command_chart_a(vnt))
+            .unwrap_or_else(|e| format!("error {:?}", e)),
         "stop" => {
             vnt.stop();
             "stopped".to_string()
         }
         _ => {
-            format!(
-                "command '{}' not found.  Try to enter: 'route'/'list'/'stop' \n",
-                cmd
-            )
+            if let Some(ip) = cmd.strip_prefix("chart_b") {
+                let chart = if ip.is_empty() {
+                    command_chart_b(&vnt, &vnt.current_device().virtual_gateway.to_string())
+                } else {
+                    command_chart_b(&vnt, &ip[1..])
+                };
+                serde_yaml::to_string(&chart).unwrap_or_else(|e| format!("error {:?}", e))
+            } else {
+                format!(
+                    "command '{}' not found.  Try to enter: 'route'/'list'/'stop' \n",
+                    cmd
+                )
+            }
         }
     };
     Ok(out_str)

common/src/config/file_config.rs

@@ -0,0 +1,190 @@
+use anyhow::anyhow;
+use std::net::Ipv4Addr;
+use std::str::FromStr;
+
+use crate::config::get_device_id;
+use crate::{args_parse, config};
+use serde::{Deserialize, Serialize};
+use vnt::channel::punch::PunchModel;
+use vnt::channel::UseChannelType;
+use vnt::cipher::CipherModel;
+use vnt::compression::Compressor;
+use vnt::core::Config;
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(default)]
+pub struct FileConfig {
+    #[cfg(target_os = "windows")]
+    pub tap: bool,
+    pub token: String,
+    pub device_id: String,
+    pub name: String,
+    pub server_address: String,
+    pub stun_server: Vec<String>,
+    pub dns: Vec<String>,
+    pub in_ips: Vec<String>,
+    pub out_ips: Vec<String>,
+    pub password: Option<String>,
+    pub mtu: Option<u32>,
+    pub tcp: bool,
+    pub ip: Option<String>,
+    pub use_channel: String,
+    #[cfg(feature = "ip_proxy")]
+    pub no_proxy: bool,
+    pub server_encrypt: bool,
+    pub cipher_model: Option<String>,
+    pub finger: bool,
+    pub punch_model: String,
+    pub ports: Option<Vec<u16>>,
+    pub cmd: bool,
+    pub first_latency: bool,
+    pub device_name: Option<String>,
+    pub packet_loss: Option<f64>,
+    pub packet_delay: u32,
+    #[cfg(feature = "port_mapping")]
+    pub mapping: Vec<String>,
+    pub compressor: Option<String>,
+    pub vnt_mapping: Vec<String>,
+    pub disable_stats: bool,
+    // 允许传递wg流量
+    pub allow_wire_guard: bool,
+    pub local_dev: Option<String>,
+}
+
+impl Default for FileConfig {
+    fn default() -> Self {
+        let mut stun_server = Vec::new();
+        for x in config::PUB_STUN {
+            stun_server.push(x.to_string());
+        }
+        Self {
+            #[cfg(target_os = "windows")]
+            tap: false,
+            token: "".to_string(),
+            device_id: get_device_id(),
+            name: gethostname::gethostname()
+                .to_str()
+                .unwrap_or("UnknownName")
+                .to_string(),
+            server_address: "nat1.wherewego.top:29872".to_string(),
+            stun_server,
+            dns: vec![],
+            in_ips: vec![],
+            out_ips: vec![],
+            password: None,
+            mtu: None,
+            tcp: false,
+            ip: None,
+            use_channel: "all".to_string(),
+            #[cfg(feature = "ip_proxy")]
+            no_proxy: false,
+            server_encrypt: false,
+            cipher_model: None,
+            finger: false,
+            punch_model: "all".to_string(),
+            ports: None,
+            cmd: false,
+            first_latency: false,
+            device_name: None,
+            packet_loss: None,
+            packet_delay: 0,
+            #[cfg(feature = "port_mapping")]
+            mapping: vec![],
+            compressor: None,
+            vnt_mapping: vec![],
+            disable_stats: false,
+            allow_wire_guard: false,
+            local_dev: None,
+        }
+    }
+}
+
+pub fn read_config(file_path: &str) -> anyhow::Result<(Config, Vec<String>, bool)> {
+    let conf = std::fs::read_to_string(file_path)?;
+    let file_conf = match serde_yaml::from_str::<FileConfig>(&conf) {
+        Ok(val) => val,
+        Err(e) => {
+            log::error!("serde_yaml::from_str {:?}", e);
+            return Err(anyhow!("serde_yaml::from_str {:?}", e));
+        }
+    };
+    if file_conf.token.is_empty() {
+        return Err(anyhow!("token is_empty"));
+    }
+
+    let in_ips = match args_parse::ips_parse(&file_conf.in_ips) {
+        Ok(in_ips) => in_ips,
+        Err(e) => {
+            return Err(anyhow!("in_ips {:?} error:{}", &file_conf.in_ips, e));
+        }
+    };
+    let out_ips = match args_parse::out_ips_parse(&file_conf.out_ips) {
+        Ok(out_ips) => out_ips,
+        Err(e) => {
+            return Err(anyhow!("out_ips {:?} error:{}", &file_conf.out_ips, e));
+        }
+    };
+    let virtual_ip = match file_conf.ip.clone().map(|v| Ipv4Addr::from_str(&v)) {
+        None => None,
+        Some(r) => Some(r.map_err(|e| anyhow!("ip {:?} error:{}", &file_conf.ip, e))?),
+    };
+    let cipher_model = if let Some(v) = file_conf.cipher_model {
+        CipherModel::from_str(&v).map_err(|e| anyhow!("{}", e))?
+    } else {
+        #[cfg(not(any(feature = "aes_gcm", feature = "server_encrypt")))]
+        if file_conf.password.is_some() {
+            Err(anyhow!("cipher_model undefined"))?
+        } else {
+            CipherModel::None
+        }
+        #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
+        CipherModel::AesGcm
+    };
+
+    let punch_model = PunchModel::from_str(&file_conf.punch_model).map_err(|e| anyhow!("{}", e))?;
+    let use_channel_type =
+        UseChannelType::from_str(&file_conf.use_channel).map_err(|e| anyhow!("{}", e))?;
+    let compressor = if let Some(compressor) = file_conf.compressor.as_ref() {
+        Compressor::from_str(compressor).map_err(|e| anyhow!("{}", e))?
+    } else {
+        Compressor::None
+    };
+    let config = Config::new(
+        #[cfg(target_os = "windows")]
+        #[cfg(feature = "integrated_tun")]
+        file_conf.tap,
+        file_conf.token,
+        file_conf.device_id,
+        file_conf.name,
+        file_conf.server_address,
+        file_conf.dns,
+        file_conf.stun_server,
+        in_ips,
+        out_ips,
+        file_conf.password,
+        file_conf.mtu,
+        virtual_ip,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(feature = "ip_proxy")]
+        file_conf.no_proxy,
+        file_conf.server_encrypt,
+        cipher_model,
+        file_conf.finger,
+        punch_model,
+        file_conf.ports,
+        file_conf.first_latency,
+        #[cfg(feature = "integrated_tun")]
+        file_conf.device_name,
+        use_channel_type,
+        file_conf.packet_loss,
+        file_conf.packet_delay,
+        #[cfg(feature = "port_mapping")]
+        file_conf.mapping,
+        compressor,
+        !file_conf.disable_stats,
+        file_conf.allow_wire_guard,
+        file_conf.local_dev,
+    )?;
+
+    Ok((config, file_conf.vnt_mapping, file_conf.cmd))
+}

common/src/config/mod.rs

@@ -0,0 +1,38 @@
+pub const PUB_STUN: [&'static str; 4] = [
+    "stun.miwifi.com",
+    "stun.chat.bilibili.com",
+    "stun.hitv.com",
+    "stun.cdnbye.com",
+];
+#[cfg(feature = "file_config")]
+mod file_config;
+
+use crate::identifier;
+#[cfg(feature = "file_config")]
+pub use file_config::read_config;
+
+#[cfg(not(feature = "file_config"))]
+pub fn read_config(_file_path: &str) -> anyhow::Result<(vnt::core::Config, Vec<String>, bool)> {
+    unimplemented!()
+}
+
+pub fn get_device_id() -> String {
+    if let Some(id) = identifier::get_unique_identifier() {
+        id
+    } else {
+        let path_buf = match crate::cli::app_home() {
+            Ok(path_buf) => path_buf.join("device-id"),
+            Err(e) => {
+                log::warn!("{:?}", e);
+                return String::new();
+            }
+        };
+        if let Ok(id) = std::fs::read_to_string(path_buf.as_path()) {
+            id
+        } else {
+            let id = uuid::Uuid::new_v4().to_string();
+            let _ = std::fs::write(path_buf, &id);
+            id
+        }
+    }
+}

common/src/console_out/mod.rs

@@ -1,6 +1,8 @@
 use console::{style, Style};
+use std::collections::HashSet;
+use std::net::Ipv4Addr;
 
-use crate::command::entity::{DeviceItem, Info, RouteItem};
+use crate::command::entity::{ChartA, ChartB, DeviceItem, Info, RouteItem};
 
 pub mod table;
 
@@ -9,18 +11,59 @@ 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!(
+        "Udp listen: {}",
+        style(status.udp_listen_addr.join(", ")).green()
+    );
+    println!("Tcp listen: {}", style(status.tcp_listen_addr).green());
     println!("Public ips: {}", style(status.public_ips).green());
     println!("Local addr: {}", style(status.local_addr).green());
     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 {
     let gigabytes = num / (1024 * 1024 * 1024);
     let remaining_bytes = num % (1024 * 1024 * 1024);
@@ -89,20 +132,30 @@ pub fn console_device_list(mut list: Vec<DeviceItem>) {
         ("Rt".to_string(), Style::new()),
     ]);
     for item in list {
+        let name = if item.wire_guard {
+            format!("{}(wg)", item.name)
+        } else {
+            item.name
+        };
         if &item.status == "Online" {
-            if item.client_secret != item.current_client_secret {
+            if !item.wire_guard
+                && (item.client_secret != item.current_client_secret
+                    || (!item.current_client_secret_hash.is_empty()
+                        && !item.client_secret_hash.is_empty()
+                        && item.current_client_secret_hash != item.client_secret_hash))
+            {
                 //加密状态不一致，无法通信的
                 out_list.push(vec![
-                    (item.name, Style::new().red()),
+                    (name, Style::new().red()),
                     (item.virtual_ip, Style::new().red()),
                     (item.status, Style::new().red()),
-                    ("".to_string(), Style::new().red()),
+                    ("Mismatch".to_string(), Style::new().red()),
                     ("".to_string(), Style::new().red()),
                 ]);
             } else {
                 if item.nat_traversal_type.contains("p2p") {
                     out_list.push(vec![
-                        (item.name, Style::new().green()),
+                        (name, Style::new().green()),
                         (item.virtual_ip, Style::new().green()),
                         (item.status, Style::new().green()),
                         (item.nat_traversal_type, Style::new().green()),
@@ -110,7 +163,7 @@ pub fn console_device_list(mut list: Vec<DeviceItem>) {
                     ]);
                 } else {
                     out_list.push(vec![
-                        (item.name, Style::new().yellow()),
+                        (name, Style::new().yellow()),
                         (item.virtual_ip, Style::new().yellow()),
                         (item.status, Style::new().yellow()),
                         (item.nat_traversal_type, Style::new().yellow()),
@@ -120,7 +173,7 @@ pub fn console_device_list(mut list: Vec<DeviceItem>) {
             }
         } else {
             out_list.push(vec![
-                (item.name, Style::new().color256(102)),
+                (name, Style::new().color256(102)),
                 (item.virtual_ip, Style::new().color256(102)),
                 (item.status, Style::new().color256(102)),
                 ("".to_string(), Style::new().color256(102)),
@@ -194,3 +247,120 @@ pub fn console_device_list_all(mut list: Vec<DeviceItem>) {
     }
     table::println_table(out_list)
 }
+
+pub fn console_chart_a(chart_a: ChartA) {
+    if chart_a.disable_stats {
+        println!("Traffic statistics not enabled");
+        return;
+    }
+    println!();
+    println!("-----------------------------------------------------------------");
+    println!(
+        "Upload total = {}",
+        style(convert(chart_a.up_total)).green()
+    );
+    println!(
+        "Download total = {}",
+        style(convert(chart_a.down_total)).green()
+    );
+    println!("-----------------------------------------------------------------");
+    let up_keys: HashSet<_> = chart_a.up_map.keys().cloned().collect();
+    let down_keys: HashSet<_> = chart_a.down_map.keys().cloned().collect();
+    let mut keys: Vec<Ipv4Addr> = up_keys.union(&down_keys).cloned().collect();
+    // 排序
+    keys.sort();
+
+    // 找到最大的值，用于缩放条形图长度
+    let up_max_value = *chart_a.up_map.values().max().unwrap_or(&0);
+    let down_max_value = *chart_a.down_map.values().max().unwrap_or(&0);
+    let max_value = up_max_value.max(down_max_value);
+    let max_value = max_value.max(1);
+    let max_height = 50;
+    // 打印条形图
+    for key in &keys {
+        if let Some(&value) = chart_a.up_map.get(key) {
+            let bar = "█".repeat(((value as f64 / max_value as f64) * max_height as f64) as usize);
+            println!(
+                "{:<10} | {} upload {}",
+                key,
+                bar,
+                style(convert(value)).green()
+            );
+        }
+        if let Some(&value) = chart_a.down_map.get(key) {
+            let bar = "█".repeat(((value as f64 / max_value as f64) * max_height as f64) as usize);
+            println!(
+                "{:<10} | {} download {}",
+                key,
+                bar,
+                style(convert(value)).green()
+            );
+        }
+        println!("-");
+    }
+}
+
+pub fn console_chart_b(chart_b: ChartB) {
+    if chart_b.disable_stats {
+        println!("Traffic statistics not enabled");
+        return;
+    }
+    let ip = if let Some(ip) = chart_b.ip {
+        ip
+    } else {
+        println!("Ip: None");
+        return;
+    };
+    println!("----------------------------  upload  ----------------------------");
+    println!("IP: {}", ip);
+    println!("Upload total: {}", style(convert(chart_b.up_total)).green());
+    println!(
+        "Max: {}",
+        style(convert(
+            chart_b
+                .up_list
+                .iter()
+                .max()
+                .cloned()
+                .map_or(0, |v| v as u64)
+        ))
+        .green()
+    );
+    console_chart_b_list(chart_b.up_list);
+    println!("---------------------------- download ----------------------------");
+    println!("IP: {}", ip);
+    println!(
+        "Download total: {}",
+        style(convert(chart_b.down_total)).green()
+    );
+    println!(
+        "Max: {}",
+        style(convert(
+            chart_b
+                .down_list
+                .iter()
+                .max()
+                .cloned()
+                .map_or(0, |v| v as u64)
+        ))
+        .green()
+    );
+    console_chart_b_list(chart_b.down_list);
+}
+fn console_chart_b_list(list: Vec<usize>) {
+    let max_value = *list.iter().max().unwrap_or(&0);
+    let max_value = max_value.max(1);
+    let max_height = max_value.min(20);
+    // 遍历从最大高度到0
+    for i in (0..=max_height).rev() {
+        for &value in &list {
+            let scaled_value = (value as f64 / max_value as f64 * max_height as f64) as usize;
+            if scaled_value >= i {
+                print!("█");
+            } else {
+                print!(" ");
+            }
+        }
+        println!();
+    }
+}

common/src/identifier.rs

@@ -51,22 +51,28 @@ pub fn get_unique_identifier() -> Option<String> {
 #[cfg(target_os = "linux")]
 pub fn get_unique_identifier() -> Option<String> {
     use std::process::Command;
-    let output = match Command::new("dmidecode")
+
+    // Try to execute 'dmidecode' command to get the system identifier first.
+    if let Ok(output) = Command::new("dmidecode")
         .arg("-s")
         .arg("system-uuid")
         .output()
     {
-        Ok(output) => output,
-        Err(_) => {
-            return None;
+        let identifier = String::from_utf8_lossy(&output.stdout).trim().to_owned();
+        if !identifier.is_empty() {
+            return Some(identifier.to_string());
         }
-    };
-
-    let result = String::from_utf8_lossy(&output.stdout);
-    let identifier = result.trim().to_string();
-    if identifier.is_empty() {
-        None
-    } else {
-        Some(identifier.to_string())
     }
+
+    // Try to read file /etc/machine-id if 'dmidecode' command cannot be executed or get nothing.
+    // 对 linux 或 wsl 来说，读取 /etc/machine-id 即可获取当前操作系统的
+    // 唯一标识，而且某些环境没有预装`dmidecode`命令
+    if let Ok(identifier) = std::fs::read_to_string("/etc/machine-id") {
+        let identifier = identifier.trim();
+        if !identifier.is_empty() {
+            return Some(identifier.to_string());
+        }
+    }
+
+    None
 }

common/src/lib.rs

@@ -1,2 +1,12 @@
 pub mod args_parse;
+#[cfg(feature = "command")]
+pub mod command;
+pub mod config;
+#[cfg(feature = "command")]
+mod console_out;
 pub mod identifier;
+
+pub mod cli;
+mod generated_serial_number;
+
+pub mod callback;

vn-link-cli/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "vn-link-cli"
+version = "1.2.16"
+edition = "2021"
+
+[dependencies]
+vn-link = { path = "../vn-link", default-features = false }
+common = { path = "../common", default-features = false }
+tokio = { version = "1.37.0", features = ["full"] }
+log = "0.4.17"
+
+[target.'cfg(windows)'.build-dependencies]
+thunk-rs = { version = "0.3.3", features = ["win7"] }
+
+[features]
+default = ["default-feature"]
+default-feature = ["server_encrypt", "aes_gcm", "aes_cbc", "aes_ecb", "sm4_cbc", "chacha20_poly1305", "port_mapping", "log", "command", "file_config", "lz4", "ws"]
+
+openssl = ["vn-link/openssl", "common/openssl"]
+openssl-vendored = ["vn-link/openssl-vendored", "common/openssl-vendored"]
+ring-cipher = ["vn-link/ring-cipher", "common/ring-cipher"]
+aes_cbc = ["vn-link/aes_cbc", "common/aes_cbc"]
+aes_ecb = ["vn-link/aes_ecb", "common/aes_ecb"]
+sm4_cbc = ["vn-link/sm4_cbc", "common/sm4_cbc"]
+aes_gcm = ["vn-link/aes_gcm", "common/aes_gcm"]
+chacha20_poly1305 = ["vn-link/chacha20_poly1305", "common/chacha20_poly1305"]
+server_encrypt = ["vn-link/server_encrypt", "common/server_encrypt"]
+port_mapping = ["vn-link/port_mapping", "common/port_mapping"]
+lz4 = ["vn-link/lz4_compress", "common/lz4"]
+zstd = ["vn-link/zstd_compress", "common/zstd"]
+upnp = ["vn-link/upnp", "common/upnp"]
+ws = ["vn-link/ws", "common/ws"]
+wss = ["vn-link/wss", "common/wss"]
+log = ["common/log"]
+command = ["common/command"]
+file_config = ["common/file_config"]
+

vn-link-cli/README.md

@@ -0,0 +1,61 @@
+# 端口映射模式
+
+## 一、特点
+
+1. 不需要tap/tun虚拟网卡
+2. 不需要管理员/root权限
+3. 不改变本地路由
+4. 使用端口映射来访问目标服务
+
+## 二、作用
+
+和vnt互补，能简单快速构建网络，外部依赖更少
+
+## 三、使用方式
+
+和vnt的使用方式一样，只是多了"--vnt-mapping"这个参数
+
+### vn-link作为被访问端，不需要额外配置vnt-mapping
+
+### vn-link访问vnt或者vn-link，需要加vnt-mapping
+
+例如：
+
+设备A 运行vnt(虚拟IP 10.26.0.A)，设备B 运行vn-link(虚拟IP 10.26.0.B)。
+
+如果要用B访问A上的tcp 80端口，则在设备B上需要加--vnt-mapping "tcp:port1-10.26.0.A:80"
+
+这个参数的作用是将B上的***本地端口port1***转发到设备A的地址10.26.0.A:
+80，此时在设备B上可以访问本地port1端口从而间接访问10.26.0.A:80
+
+## 四、vn-link的子网代理
+
+vn-link也支持点对网参数。 还是接着上面的例子
+
+假设 设备C在设备A的子网下，C的子网IP为192.168.1.C，A的子网IP为192.168.1.A，要在设备B上访问C
+
+则在B上加这些参数
+
+- --vnt-mapping "tcp:port2-192.168.1.C:80" (将本地port2端口映射到C的80端口)
+- -i 192.168.1.0/24,10.26.0.A (将目标192.168.1.0/24的数据发送到10.26.0.A，也就是A节点)
+
+在A上加参数
+
+- -o 0.0.0.0/0 (允许所有流量转发)
+
+***再次说明，vn-link作为被访问端时和vnt使用方式一致，vn-link作为访问端时需要加--vnt-mapping映射端口***
+
+***vn-link是基于端口映射的使用模式，不会改变本地路由***
+
+## 五、参数介绍
+
+--vnt-mapping支持udp/tcp，例如 --vnt-mapping "tcp:port1-remoteIp:remotePort"
+
+- 第一部分为协议，支持使用udp/tcp
+- 第二部分是本地端口，注意不要和本地服务的端口冲突
+- 第三部分是目标机器的地址，一般是目标虚拟IP地址，如果配置了点对网参数(-i和-o)则也可以是目标子网地址
+
+
+
+
+

vn-link-cli/build.rs

@@ -0,0 +1,5 @@
+fn main() {
+    // 配置 thunk-rs 来链接 Windows 7 兼容库，并自动设置链接参数
+    #[cfg(target_os = "windows")]
+    thunk::thunk();
+}

vn-link-cli/src/main.rs

@@ -0,0 +1,89 @@
+use common::callback;
+use vn_link::config::VnLinkConfig;
+use vn_link::vnt::core::Config;
+
+fn main() {
+    let (config, vnt_link_config, cmd) = match common::cli::parse_args_config() {
+        Ok(rs) => {
+            if let Some(rs) = rs {
+                rs
+            } else {
+                return;
+            }
+        }
+        Err(e) => {
+            log::error!(
+                "parse error={:?} cmd={:?}",
+                e,
+                std::env::args().collect::<Vec<String>>()
+            );
+            println!("Error {:?}", e);
+            return;
+        }
+    };
+    let vnt_link_config = VnLinkConfig::new(vn_link::config::convert(vnt_link_config).unwrap());
+    main0(config, vnt_link_config, cmd)
+}
+
+#[tokio::main]
+async fn main0(config: Config, vn_link_config: VnLinkConfig, _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)
+        }
+    }
+    for x in &vn_link_config.mapping {
+        if x.protocol.is_tcp() {
+            println!("TCP vnt addr mapping 127.0.0.1:{}->{}", x.src_port, x.dest)
+        } else {
+            println!("UDP vnt addr mapping 127.0.0.1:{}->{}", x.src_port, x.dest)
+        }
+    }
+
+    let vnt_util = match vn_link::VnLink::new(config, vn_link_config, callback::VntHandler {}).await
+    {
+        Ok(vnt) => vnt,
+        Err(e) => {
+            println!("error: {:?}", e);
+            std::process::exit(1);
+        }
+    };
+
+    #[cfg(feature = "command")]
+    {
+        let vnt_c = vnt_util.as_vnt().clone();
+        std::thread::Builder::new()
+            .name("CommandServer".into())
+            .spawn(move || {
+                if let Err(e) = common::command::server::CommandServer::new().start(vnt_c) {
+                    log::warn!("cmd:{:?}", e);
+                }
+            })
+            .expect("CommandServer");
+        let vnt_c = vnt_util.as_vnt();
+        if _show_cmd {
+            use tokio::io::AsyncBufReadExt;
+            let mut cmd = String::new();
+            let mut reader = tokio::io::BufReader::new(tokio::io::stdin());
+            loop {
+                cmd.clear();
+                println!("======== input:list,info,route,all,stop,chart_a,chart_b[:ip] ========");
+                match reader.read_line(&mut cmd).await {
+                    Ok(len) => {
+                        if !common::command::command_str(&cmd[..len], vnt_c) {
+                            break;
+                        }
+                    }
+                    Err(e) => {
+                        println!("input err:{}", e);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    vnt_util.wait().await
+}

vn-link/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "vn-link"
+version = "1.2.16"
+edition = "2021"
+
+[dependencies]
+lwip-rs = { git = "https://github.com/vnt-dev/lwip-rs" }
+vnt = { path = "../vnt", package = "vnt", default-features = false }
+log = "0.4.17"
+anyhow = "1.0.82"
+parking_lot = "0.12.1"
+
+tokio = { version = "1.37.0", features = ["full"] }
+crossbeam-utils = "0.8"
+
+[features]
+default = ["server_encrypt", "aes_gcm", "aes_cbc", "aes_ecb", "sm4_cbc", "chacha20_poly1305", "port_mapping", "lz4_compress"]
+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"]
+chacha20_poly1305 = ["vnt/chacha20_poly1305"]
+server_encrypt = ["vnt/server_encrypt"]
+port_mapping = ["vnt/port_mapping"]
+lz4_compress = ["vnt/lz4_compress"]
+zstd_compress = ["vnt/zstd_compress"]
+upnp = ["vnt/upnp"]
+ws = ["vnt/ws"]
+wss = ["vnt/wss"]

vn-link/src/config.rs

@@ -0,0 +1,85 @@
+use anyhow::Context;
+use std::net::SocketAddr;
+use std::str::FromStr;
+
+#[derive(Clone, Debug)]
+pub struct VnLinkConfig {
+    pub mapping: Vec<LinkItem>,
+}
+
+impl VnLinkConfig {
+    pub fn new(mapping: Vec<LinkItem>) -> Self {
+        Self { mapping }
+    }
+}
+
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub enum LinkProtocol {
+    Tcp,
+    Udp,
+}
+
+impl LinkProtocol {
+    pub fn is_tcp(&self) -> bool {
+        self == &LinkProtocol::Tcp
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub struct LinkItem {
+    pub protocol: LinkProtocol,
+    pub src_port: u16,
+    pub dest: SocketAddr,
+}
+
+impl LinkItem {
+    pub fn new(protocol: LinkProtocol, src_port: u16, dest: SocketAddr) -> Self {
+        Self {
+            protocol,
+            src_port,
+            dest,
+        }
+    }
+}
+
+pub fn convert(vec: Vec<String>) -> anyhow::Result<Vec<LinkItem>> {
+    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_port = split
+                .next()
+                .with_context(|| format!("vnt-mapping error {:?},eg: udp:80-10.26.0.10:8080", x))?;
+            let bind_port = u16::from_str(bind_port)
+                .with_context(|| format!("udp_mapping error {}", bind_port))?;
+            let dest = split
+                .next()
+                .with_context(|| format!("vnt-mapping error {:?},eg: udp:80-10.26.0.10:8080", x))?;
+            let dest_addr = SocketAddr::from_str(dest)
+                .with_context(|| format!("udp_mapping error {}", dest))?;
+            rs.push(LinkItem::new(LinkProtocol::Udp, bind_port, dest_addr));
+            continue;
+        }
+        if let Some(tcp_mapping) = string.strip_prefix("tcp:") {
+            let mut split = tcp_mapping.split("-");
+            let bind_port = split
+                .next()
+                .with_context(|| format!("vnt-mapping error {:?},eg: tcp:80-10.26.0.10:8080", x))?;
+            let bind_port = u16::from_str(bind_port)
+                .with_context(|| format!("tcp_mapping error {}", bind_port))?;
+            let dest = split
+                .next()
+                .with_context(|| format!("vnt-mapping error {:?},eg: tcp:80-10.26.0.10:8080", x))?;
+            let dest_addr = SocketAddr::from_str(dest)
+                .with_context(|| format!("tcp_mapping error {}", dest))?;
+            rs.push(LinkItem::new(LinkProtocol::Tcp, bind_port, dest_addr));
+            continue;
+        }
+        Err(anyhow::anyhow!(
+            "vnt-mapping error {:?},eg: tcp:80-10.26.0.10:8080",
+            x
+        ))?;
+    }
+    Ok(rs)
+}

vn-link/src/in_mapping/mod.rs

@@ -0,0 +1,2 @@
+pub mod tcp;
+pub mod udp;

vn-link/src/in_mapping/tcp.rs

@@ -0,0 +1,46 @@
+use crate::out_mapping::tcp::tcp_copy;
+use crossbeam_utils::atomic::AtomicCell;
+use lwip_rs::tcp_stream::TcpStream as LwIpTcpStream;
+use std::net::{IpAddr, SocketAddr};
+use std::sync::Arc;
+use std::time::Duration;
+use tokio::net::TcpListener;
+use vnt::handle::CurrentDeviceInfo;
+
+pub async fn tcp_mapping_listen(
+    tcp_listener: TcpListener,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    dest: SocketAddr,
+) {
+    loop {
+        let (stream, addr) = match tcp_listener.accept().await {
+            Ok((stream, addr)) => (stream, addr),
+            Err(e) => {
+                log::warn!("tcp_mapping_listen {:?} dest {}", e, dest);
+                continue;
+            }
+        };
+        let current_info = current_device.load();
+        if current_info.virtual_ip.is_unspecified() {
+            continue;
+        }
+        if let IpAddr::V4(ip) = dest.ip() {
+            if ip == current_info.virtual_ip {
+                //防止用错参数的
+                log::warn!("目的地址不能是本地虚拟ip tcp->{}", dest);
+                continue;
+            }
+        }
+        let src = SocketAddr::new(IpAddr::V4(current_info.virtual_ip), addr.port());
+        tokio::spawn(async move {
+            match LwIpTcpStream::connect(src, dest, Duration::from_secs(5)).await {
+                Ok(lw_tcp) => {
+                    tcp_copy(lw_tcp, stream);
+                }
+                Err(e) => {
+                    log::warn!("{}  {}->{} {}", addr, src, dest, e);
+                }
+            };
+        });
+    }
+}

vn-link/src/in_mapping/udp.rs

@@ -0,0 +1,63 @@
+use std::collections::HashMap;
+use std::net::{IpAddr, SocketAddr};
+use std::sync::Arc;
+use std::time::Instant;
+
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use tokio::net::UdpSocket;
+
+use lwip_rs::udp::UdpSocketWrite;
+use vnt::handle::CurrentDeviceInfo;
+
+pub async fn udp_mapping_start(
+    udp: UdpSocket,
+    lwip_udp_write: UdpSocketWrite,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    in_udp_map: &Arc<
+        Mutex<
+            HashMap<
+                (SocketAddr, SocketAddr),
+                (Arc<UdpSocket>, Option<SocketAddr>, Arc<AtomicCell<Instant>>),
+            >,
+        >,
+    >,
+
+    dest: SocketAddr,
+) {
+    let udp = Arc::new(udp);
+    let mut buf = [0u8; 65536];
+    loop {
+        let (len, addr) = match udp.recv_from(&mut buf).await {
+            Ok(rs) => rs,
+            Err(e) => {
+                log::warn!("recv_from {} {}", dest, e);
+                continue;
+            }
+        };
+        let current_info = current_device.load();
+        if current_info.virtual_ip.is_unspecified() {
+            continue;
+        }
+        if let IpAddr::V4(ip) = dest.ip() {
+            if ip == current_info.virtual_ip {
+                //防止用错参数的
+                log::warn!("目的地址不能是本地虚拟ip udp->{}", dest);
+                continue;
+            }
+        }
+        let src = SocketAddr::new(IpAddr::V4(current_info.virtual_ip), addr.port());
+        in_udp_map.lock().insert(
+            (dest, src),
+            (
+                udp.clone(),
+                Some(addr),
+                Arc::new(AtomicCell::new(Instant::now())),
+            ),
+        );
+
+        if let Err(e) = lwip_udp_write.send(&buf[..len], &src, &dest) {
+            log::warn!("lwip_udp_write {}->{} {}", src, dest, e);
+        }
+    }
+}

vn-link/src/lib.rs

@@ -0,0 +1,8 @@
+pub mod config;
+mod in_mapping;
+mod out_mapping;
+mod vnt_link;
+
+pub use vnt;
+
+pub use vnt_link::*;

vn-link/src/out_mapping/mod.rs

@@ -0,0 +1,2 @@
+pub mod tcp;
+pub mod udp;

vn-link/src/out_mapping/tcp.rs

@@ -0,0 +1,64 @@
+use std::net::{IpAddr, Ipv4Addr};
+use std::sync::Arc;
+
+use crossbeam_utils::atomic::AtomicCell;
+use tokio::net::TcpStream;
+
+use lwip_rs::tcp_listener::TcpListener;
+use lwip_rs::tcp_stream::TcpStream as LwIpTcpStream;
+use vnt::handle::CurrentDeviceInfo;
+
+pub async fn tcp_mapping_listen(
+    mut tcp_listener: TcpListener,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+) {
+    loop {
+        let stream = match tcp_listener.accept().await {
+            Ok(stream) => stream,
+            Err(e) => {
+                log::warn!("tcp_mapping_listen err  {:?}", e);
+                break;
+            }
+        };
+        let device_info = current_device.load();
+        tokio::spawn(async move {
+            let dest = stream.dest_addr();
+            let src = stream.src_addr();
+            if let Err(e) = tcp_mapping_handle(stream, device_info).await {
+                log::warn!("tcp_mapping_handle {}->{} {:?}", src, dest, e)
+            }
+        });
+    }
+}
+
+async fn tcp_mapping_handle(
+    tcp_stream: LwIpTcpStream,
+    device_info: CurrentDeviceInfo,
+) -> anyhow::Result<()> {
+    let mut dest = tcp_stream.dest_addr();
+    // let src = tcp_stream.src_addr();
+    if let IpAddr::V4(ip) = dest.ip() {
+        if ip.is_unspecified()
+            || ip.is_broadcast()
+            || ip.is_multicast()
+            || ip == device_info.virtual_ip
+            || ip == device_info.broadcast_ip
+        {
+            //是自己
+            dest.set_ip(IpAddr::V4(Ipv4Addr::LOCALHOST));
+        }
+    }
+    let peer_stream = TcpStream::connect(dest).await?;
+    if dest.port() == peer_stream.local_addr()?.port() {
+        return Err(anyhow::anyhow!("tcp port loop"));
+    }
+    tcp_copy(tcp_stream, peer_stream);
+    Ok(())
+}
+
+pub(crate) fn tcp_copy(lw_tcp: LwIpTcpStream, tokio_tcp: TcpStream) {
+    let (mut write, mut read) = lw_tcp.into_split();
+    let (mut peer_read, mut peer_write) = tokio_tcp.into_split();
+    tokio::spawn(async move { tokio::io::copy(&mut read, &mut peer_write).await });
+    tokio::spawn(async move { tokio::io::copy(&mut peer_read, &mut write).await });
+}

vn-link/src/out_mapping/udp.rs

@@ -0,0 +1,137 @@
+use crossbeam_utils::atomic::AtomicCell;
+use lwip_rs::udp::{UdpSocketRead, UdpSocketWrite};
+use parking_lot::Mutex;
+use std::collections::HashMap;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+use tokio::net::UdpSocket;
+use vnt::handle::CurrentDeviceInfo;
+
+pub async fn udp_mapping_start(
+    lwip_udp_write: UdpSocketWrite,
+    mut lwip_udp_read: UdpSocketRead,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    in_udp_map: Arc<
+        Mutex<
+            HashMap<
+                (SocketAddr, SocketAddr),
+                (Arc<UdpSocket>, Option<SocketAddr>, Arc<AtomicCell<Instant>>),
+            >,
+        >,
+    >,
+) {
+    loop {
+        let (buf, src, dest) = match lwip_udp_read.recv().await {
+            Ok(rs) => rs,
+            Err(e) => {
+                log::warn!("udp_mapping err  {:?}", e);
+                break;
+            }
+        };
+        if let Err(e) = handle(
+            &current_device,
+            &lwip_udp_write,
+            &in_udp_map,
+            buf,
+            src,
+            dest,
+        )
+        .await
+        {
+            log::warn!("udp_mapping err {}->{} {:?}", src, dest, e)
+        }
+    }
+}
+
+async fn handle(
+    current_device: &AtomicCell<CurrentDeviceInfo>,
+    lwip_udp_write: &UdpSocketWrite,
+    map: &Arc<
+        Mutex<
+            HashMap<
+                (SocketAddr, SocketAddr),
+                (Arc<UdpSocket>, Option<SocketAddr>, Arc<AtomicCell<Instant>>),
+            >,
+        >,
+    >,
+    buf: Vec<u8>,
+    src: SocketAddr,
+    dest: SocketAddr,
+) -> anyhow::Result<()> {
+    let option = map.lock().get(&(src, dest)).cloned();
+
+    if let Some((dest_udp, addr, time)) = option {
+        time.store(Instant::now());
+        if let Some(addr) = addr {
+            dest_udp.send_to(&buf, addr).await?;
+        } else {
+            dest_udp.send(&buf).await?;
+        }
+    } else {
+        let mut real_dest = dest;
+        let peer_udp_socket = match UdpSocket::bind(format!("0.0.0.0:{}", src.port())).await {
+            Ok(udp) => udp,
+            Err(_) => UdpSocket::bind("0.0.0.0:0").await?,
+        };
+        if let IpAddr::V4(ip) = dest.ip() {
+            let device_info = current_device.load();
+            if ip.is_unspecified()
+                || ip.is_broadcast()
+                || ip.is_multicast()
+                || ip == device_info.virtual_ip
+                || ip == device_info.broadcast_ip
+            {
+                //是自己
+                real_dest.set_ip(IpAddr::V4(Ipv4Addr::LOCALHOST));
+            }
+        }
+        peer_udp_socket.connect(real_dest).await?;
+        peer_udp_socket.send(&buf).await?;
+        let peer_udp_socket = Arc::new(peer_udp_socket);
+        let time = Arc::new(AtomicCell::new(Instant::now()));
+        let map = map.clone();
+        map.lock()
+            .insert((src, dest), (peer_udp_socket.clone(), None, time.clone()));
+        let lwip_udp_write = lwip_udp_write.clone();
+        tokio::spawn(async move {
+            peer_udp_handle(peer_udp_socket, lwip_udp_write, src, dest, time).await;
+            map.lock().remove(&(src, dest));
+        });
+    }
+    Ok(())
+}
+
+async fn peer_udp_handle(
+    peer_udp_socket: Arc<UdpSocket>,
+    lwip_udp_write: UdpSocketWrite,
+    src: SocketAddr,
+    dest: SocketAddr,
+    time: Arc<AtomicCell<Instant>>,
+) {
+    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 lwip_udp_write.send(&buf[..len], &dest, &src) {
+                    Ok(_) => {}
+                    Err(e) => {
+                        log::warn!("udp proxy {}->{} {:?}", dest, src, e);
+                        break;
+                    }
+                },
+                Err(e) => {
+                    log::warn!("udp proxy {}->{} {:?}", dest, src, e);
+                    break;
+                }
+            },
+            Err(_) => {
+                if time.load().elapsed() > Duration::from_secs(580) {
+                    //超时关闭
+                    log::warn!("udp proxy timeout {}->{}", dest, src,);
+                    break;
+                }
+            }
+        }
+    }
+}

vn-link/src/vnt_link/mod.rs

@@ -0,0 +1,217 @@
+use std::collections::HashMap;
+use std::net::SocketAddr;
+use std::sync::Arc;
+use std::time::Instant;
+
+use anyhow::Context;
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use tokio::net::{TcpListener, UdpSocket};
+use tokio::sync::watch::{channel, Sender};
+
+use lwip_rs::stack::{NetStack, NetStackWrite};
+use lwip_rs::tcp_listener::TcpListener as LwIPTcpListener;
+use lwip_rs::udp::{UdpSocket as LwIpUdpSocket, UdpSocketWrite};
+use vnt::channel::BUFFER_SIZE;
+use vnt::core::{Config, Vnt};
+use vnt::packet::ip::ipv4::packet::IpV4Packet;
+use vnt::protocol::HEAD_LEN;
+use vnt::vnt_device::DeviceWrite;
+use vnt::VntCallback;
+
+use crate::config::{LinkItem, LinkProtocol, VnLinkConfig};
+use crate::{in_mapping, out_mapping};
+
+pub struct VnLink {
+    vnt: Vnt,
+    in_udp_map: Arc<
+        Mutex<
+            HashMap<
+                (SocketAddr, SocketAddr),
+                (Arc<UdpSocket>, Option<SocketAddr>, Arc<AtomicCell<Instant>>),
+            >,
+        >,
+    >,
+    lwip_udp_write: UdpSocketWrite,
+    shutdown_tx: Sender<bool>,
+}
+
+impl VnLink {
+    pub async fn new<Call: VntCallback>(
+        vnt_config: Config,
+        vn_link_config: VnLinkConfig,
+        callback: Call,
+    ) -> anyhow::Result<Self> {
+        let stack = NetStack::new(HEAD_LEN, 1024, vnt_config.mtu.unwrap_or(1420) as u16).await;
+        let udp = LwIpUdpSocket::new()?;
+        let tcp_listener = LwIPTcpListener::new()?;
+        let (shutdown_tx, shutdown_rx) = channel(false);
+        let (net_stack_write, mut net_stack_read) = stack.into_split();
+        let vnt = Vnt::new_device(vnt_config, callback, VntDevice { net_stack_write })?;
+        let shutdown_tx_ = shutdown_tx.clone();
+        let w = vnt.add_stop_listener("vnt-link".into(), move || {
+            let _ = shutdown_tx_.send(true);
+        })?;
+        let ip_sender = vnt.ipv4_packet_sender().unwrap();
+        let mut shutdown_rx_ = shutdown_rx.clone();
+        tokio::spawn(async move {
+            let mut extend = [0; BUFFER_SIZE];
+            loop {
+                tokio::select! {
+                    _ = shutdown_rx_.changed() => {
+                        break;
+                    }
+                    rs = net_stack_read.recv_ip() => {
+                         match rs{
+                              Ok((mut buf, start_index, len)) => {
+                                let ipv4_packet = if let Ok(packet) =
+                                     IpV4Packet::new(&buf[start_index..len])
+                                {
+                                    packet
+                                } else {
+                                    continue;
+                                };
+                                let destination_ip = ipv4_packet.destination_ip();
+                                let source_ip = ipv4_packet.source_ip();
+
+                                if let Err(e) = ip_sender.send_ip(&mut buf, len, &mut extend, destination_ip) {
+                                    log::warn!("{}->{},{}", source_ip, destination_ip, e);
+                                }
+                            },
+                            Err(e) => {
+                                log::error!("net_stack_read {:?}", e);
+                                break;
+                            }
+                        };
+                    }
+                }
+            }
+            w.stop_all();
+        });
+
+        let (lwip_udp_write, lwip_udp_read) = udp.into_split();
+        let in_udp_map: Arc<
+            Mutex<
+                HashMap<
+                    (SocketAddr, SocketAddr),
+                    (Arc<UdpSocket>, Option<SocketAddr>, Arc<AtomicCell<Instant>>),
+                >,
+            >,
+        > = Arc::new(Mutex::new(HashMap::new()));
+
+        let current_device_info = vnt.current_device_info();
+        let in_udp_map_ = in_udp_map.clone();
+        let lwip_udp_write_ = lwip_udp_write.clone();
+        let vnt_ = vnt.clone();
+        let mut shutdown_rx_ = shutdown_rx.clone();
+        tokio::spawn(async move {
+            tokio::select! {
+                _ = shutdown_rx_.changed() => {}
+                _ = out_mapping::udp::udp_mapping_start(
+                    lwip_udp_write_,
+                    lwip_udp_read,
+                    current_device_info,
+                    in_udp_map_,
+                ) => {}
+            }
+
+            vnt_.stop();
+        });
+        let current_device_info = vnt.current_device_info();
+        let vnt_ = vnt.clone();
+        let mut shutdown_rx_ = shutdown_rx.clone();
+
+        tokio::spawn(async move {
+            tokio::select! {
+                _ = shutdown_rx_.changed() => {}
+                _ = out_mapping::tcp::tcp_mapping_listen(tcp_listener, current_device_info) => {}
+            }
+            vnt_.stop();
+        });
+        let link = Self {
+            vnt,
+            in_udp_map,
+            lwip_udp_write,
+            shutdown_tx,
+        };
+        link.add_mapping(vn_link_config.mapping).await?;
+        Ok(link)
+    }
+    pub async fn add_mapping(&self, mapping: Vec<LinkItem>) -> anyhow::Result<()> {
+        for item in mapping {
+            let current_device_info = self.vnt.current_device_info();
+            if item.dest.ip().is_unspecified() {
+                Err(anyhow::anyhow!("dest_address {:?} is_unspecified", item))?
+            }
+            let mut shutdown_rx_ = self.shutdown_tx.subscribe();
+            if *shutdown_rx_.borrow() {
+                Err(anyhow::anyhow!("mapping stop"))?
+            }
+            if item.protocol == LinkProtocol::Udp {
+                let lwip_udp_write = self.lwip_udp_write.clone();
+                let in_udp_map = self.in_udp_map.clone();
+                //只能本机访问，不然不同IP的相同来源端口会有问题
+                let udp = UdpSocket::bind(format!("127.0.0.1:{}", item.src_port))
+                    .await
+                    .with_context(|| format!("udp bind failed {}", item.src_port))?;
+                tokio::spawn(async move {
+                    tokio::select! {
+                        _ = shutdown_rx_.changed() => {}
+                        _ = in_mapping::udp::udp_mapping_start(
+                                udp,
+                                lwip_udp_write,
+                                current_device_info,
+                                &in_udp_map,
+                                item.dest,
+                        ) => {}
+                    }
+                });
+            } else {
+                let listener = TcpListener::bind(format!("127.0.0.1:{}", item.src_port))
+                    .await
+                    .with_context(|| format!("tcp bind failed {}", item.src_port))?;
+                tokio::spawn(async move {
+                    tokio::select! {
+                        _ = shutdown_rx_.changed() => {}
+                        _ = in_mapping::tcp::tcp_mapping_listen(
+                            listener,
+                            current_device_info,
+                            item.dest,
+                        ) => {}
+                    }
+                });
+            }
+        }
+        Ok(())
+    }
+    pub fn stop(&self) {
+        self.as_vnt().stop()
+    }
+    pub async fn wait(&self) {
+        loop {
+            let mut receiver = self.shutdown_tx.subscribe();
+            if *receiver.borrow() {
+                return;
+            }
+            if receiver.changed().await.is_err() {
+                return;
+            }
+        }
+    }
+
+    pub fn as_vnt(&self) -> &Vnt {
+        &self.vnt
+    }
+}
+
+#[derive(Clone)]
+pub struct VntDevice {
+    net_stack_write: NetStackWrite,
+}
+
+impl DeviceWrite for VntDevice {
+    fn write(&self, buf: &[u8]) -> std::io::Result<usize> {
+        self.net_stack_write.send_ip(buf)?;
+        Ok(buf.len())
+    }
+}

vnt-cli/Cargo.toml

@@ -1,44 +1,51 @@
 [package]
 name = "vnt-cli"
-version = "1.2.9"
+version = "1.2.16"
 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 }
-common = { path = "../common" }
-getopts = "0.2.21"
-console = "0.15.2"
-os_info = "3.7.0"
-serde = "1.0"
-#serde_json = "1.0.94"
-serde_yaml = "0.9.32"
+vnt = { path = "../vnt", package = "vnt", default-features = false, features = ["integrated_tun"] }
+common = { path = "../common", default-features = false, features = ["integrated_tun"] }
 log = "0.4.17"
-log4rs = "1.2.0"
-[dependencies.uuid]
-version = "1.4.1"
-features = [
-    "v4", # Lets you generate random UUIDs
-]
+anyhow = "1.0.82"
+console = "0.15.2"
 
 [target.'cfg(any(target_os = "linux",target_os = "macos"))'.dependencies]
 sudo = "0.6.0"
+signal-hook = "0.3.17"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 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"]
-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"]
+default = ["default-feature"]
+default-feature = ["server_encrypt", "aes_gcm", "aes_cbc", "aes_ecb", "sm4_cbc", "chacha20_poly1305", "ip_proxy", "port_mapping", "log", "command", "file_config", "lz4", "ws"]
+
+openssl = ["vnt/openssl", "common/openssl"]
+openssl-vendored = ["vnt/openssl-vendored", "common/openssl-vendored"]
+ring-cipher = ["vnt/ring-cipher", "common/ring-cipher"]
+aes_cbc = ["vnt/aes_cbc", "common/aes_cbc"]
+aes_ecb = ["vnt/aes_ecb", "common/aes_ecb"]
+sm4_cbc = ["vnt/sm4_cbc", "common/sm4_cbc"]
+aes_gcm = ["vnt/aes_gcm", "common/aes_gcm"]
+chacha20_poly1305 = ["vnt/chacha20_poly1305", "common/chacha20_poly1305"]
+server_encrypt = ["vnt/server_encrypt", "common/server_encrypt"]
+port_mapping = ["vnt/port_mapping", "common/port_mapping"]
+lz4 = ["vnt/lz4_compress", "common/lz4"]
+zstd = ["vnt/zstd_compress", "common/zstd"]
+ip_proxy = ["vnt/ip_proxy", "common/ip_proxy"]
+upnp = ["vnt/upnp", "common/upnp"]
+ws = ["vnt/ws", "common/ws"]
+wss = ["vnt/wss", "common/wss"]
+log = ["common/log"]
+command = ["common/command"]
+file_config = ["common/file_config"]
 [build-dependencies]
-embed-manifest = "1.4.0"
-rand = "0.9.0-alpha.0"
+rand = "0.8.5"
+chrono = "0.4.23"
+
+[target.'cfg(windows)'.build-dependencies]
+thunk-rs = { version = "0.3.3", features = ["win7"] }

vnt-cli/README.md

@@ -1,31 +1,56 @@
 ## 模块介绍
+
 体积小，可以在服务器、路由器等环境使用
+
 ## 详细参数说明
+
 ### -k `<token>`
+
 一个虚拟局域网的标识，在同一服务器下，相同token的设备会组建一个局域网
+
 ### -n `<name>`
+
 设备名称，方便区分不同设备
+
 ### -d `<id>`
+
 设备id，每台设备的唯一标识，注意不要重复
+
 ### -c
+
 关闭控制台交互式命令，后台运行时可以加此参数
+
 ### -s `<server>`
-注册和中继服务器地址，注册和转发数据
+
+注册和中继服务器地址，注册和转发数据，以'TXT:'开头表示解析TXT记录，TXT记录内容必须是'host:port'形式的服务器地址
+
 ### -e `<stun-server>`
+
 使用stun服务探测客户端NAT类型，不同类型有不同的打洞策略
+
 ### -a
+
 加了此参数表示使用tap网卡，默认使用tun网卡，tun网卡效率更高
+
+注意：仅在windows上支持使用tap，用于兼容低版本windows系统（低版本windows不支持wintun）
+
+使用tap模式需要手动创建tap网卡，使用--nic参数指定已经创建好的tap网卡名称
+
 ### --nic `<tun0>`
+
 指定虚拟网卡名称，默认tun模式使用vnt-tun，tap模式使用vnt-tap
+
 ### -i `<in-ip>`、-o  `<out-ip>`
 
-配置点对网(IP代理)时使用，例如A(虚拟ip:10.26.0.2)通过B(虚拟ip:10.26.0.3,本地出口ip:192.168.0.10)访问C(目标网段192.168.0.0/24)，
+配置点对网(IP代理)时使用，例如A(虚拟ip:10.26.0.2)通过B(虚拟ip:10.26.0.3,本地出口ip:192.168.0.10)访问C(
+目标网段192.168.0.0/24)，
 
 则在A配置 **'-i 192.168.0.0/24,10.26.0.3'** ,表示将192.168.0.0/24网段的数据都转发到10.26.0.3节点
 
 在B配置 **'-o 192.168.0.0/24'**  ,表示允许将数据转发到 192.168.0.0/24 ,允许转发所有网段可以使用 **'-o 0.0.0.0/0'**
 
--i和-o参数均可使用多次，来指定不同网段，例如 **'-o 192.168.1.0/24 -o 192.168.2.0/24'** 表示允许转发目标为192.168.1.0/24或192.168.2.0/24这两个网段的数据
+-i和-o参数均可使用多次，来指定不同网段，例如 **'-o 192.168.1.0/24 -o 192.168.2.0/24'**
+表示允许转发目标为192.168.1.0/24或192.168.2.0/24这两个网段的数据
 
 ### -w `<password>`
 
@@ -37,9 +62,11 @@
 | 大于等于8 | AES256-GCM | 
 
 ### -W
+
 开启和服务端通信的数据加密，采用rsa+aes256gcm加密客户端和服务端之间通信的数据，可以避免token泄漏、中间人攻击
 
 注意：
+
 1. -w `<password>`是用于客户端-客户端之间的加密，password不会传递到服务端，只添加这个参数不会加密客户端-服务端通信的数据
 2. -W 用于开启客户端-服务端之间的加密
 
@@ -47,55 +74,103 @@
 
 设置虚拟网卡的mtu值，大多数情况下使用默认值效率会更高，也可根据实际情况微调这个值，不加密默认为1450，加密默认为1410
 
-###  --tcp
-和服务端使用tcp通信。有些网络提供商对UDP限制比较大，这个时候可以选择使用TCP模式，提高稳定性。一般来说udp延迟和消耗更低
+### ~~--tcp~~
+
+~~和服务端使用tcp通信。有些网络提供商对UDP限制比较大，这个时候可以选择使用TCP模式，提高稳定性。一般来说udp延迟和消耗更低~~
+
+新版本使用 `-s tcp://`的形式使用tcp
+
 ### --ip `<IP>`
+
 指定虚拟ip,指定的ip不能和其他设备重复,必须有效并且在服务端所属网段下,默认情况由服务端分配
+
 ### --par `<parallel>`
+
 任务并行度(必须为正整数),默认值为1,该值表示处理网卡读写的任务数,组网设备数较多、处理延迟较大时可适当调大此值
+
 ### --model `<model>`
-加密模式，可选值 aes_gcm/aes_cbc/aes_ecb/sm4_cbc，默认使用aes_gcm，通常情况aes_gcm安全性高、aes_ecb性能更好，但是在低性能设备上sm4_cbc也许速度会更快；
 
+加密模式，可选值
+aes_gcm/aes_cbc/aes_ecb/sm4_cbc/chacha20_poly1305/chacha20/xor，默认使用aes_gcm，通常情况aes_gcm和chacha20_poly1305安全性高。
+各种加密模式的安全性和速度都不相同，请按需选取
 
-| 密码位数  | model   | 加密算法       |  
-|-------|---------|------------|
-| 1~8位  | aes_gcm | AES128-GCM |
-| `>=`8 | aes_gcm | AES256-GCM |
-| 1~8位  | aes_cbc | AES128-CBC |
-| `>=`8 | aes_cbc | AES256-CBC |
-| 1~8位  | aes_ecb | AES128-ECB |
-| `>=`8 | aes_ecb | AES256-ECB |
-| `>0`  | sm4_cbc | SM4-CBC    |
-### --finger 
+特别说明：xor只是对数据进行简单异或，仅仅避免了明文传输，安全性很差，同时对性能影响也极小；
+
+| 密码位数   | model             | 加密算法              |  
+|--------|-------------------|-------------------|
+| `< 8`  | aes_gcm           | AES128-GCM        |
+| `>= 8` | aes_gcm           | AES256-GCM        |
+| `< 8`  | aes_cbc           | AES128-CBC        |
+| `>= 8` | aes_cbc           | AES256-CBC        |
+| `< 8`  | aes_ecb           | AES128-ECB        |
+| `>= 8` | aes_ecb           | AES256-ECB        |
+| `> 0`  | sm4_cbc           | SM4-CBC           |
+| `> 0`  | chacha20_poly1305 | ChaCha20-Poly1305 |
+| `> 0`  | chacha20          | ChaCha20          |
+| `> 0`  | xor               | 简单异或混淆            |
+
+### --finger
 
 开启数据指纹校验，可增加安全性，如果服务端开启指纹校验，则客户端也必须开启，开启会损耗一部分性能
 
 注意：默认情况下服务端不会对中转的数据做校验，如果要对中转的数据做校验，则需要客户端、服务端都开启此参数
+
 ### --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监听一个未使用的端口
+
 ### --cmd
+
 开启交互式命令，开启后可以直接在窗口下输入命令，如需后台运行请勿开启
+
 ### --first_latency
+
 优先使用低延迟通道，默认情况下优先使用p2p通道，某些情况下可能p2p比客户端中继延迟更高，可使用此参数进行优化传输
+
 ### --no-proxy
+
 关闭内置的ip代理，内置的代理较为简单，而且一般来说直接使用网卡NAT转发性能会更高，
-有需要可以自行配置NAT转发，[可参考‘编译’小节中的NAT配置](https://github.com/lbl8603/vnt#%E7%BC%96%E8%AF%91)
+有需要可以自行配置NAT转发，[可参考‘编译’小节中的NAT配置](https://github.com/vnt-dev/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，转发的目的地址可以使用域名+端口
+
+### --compressor `<lz4>`
+
+启用压缩，默认仅支持lz4压缩，开启压缩后，如果数据包长度大于等于128，则会使用压缩，否则还是会按原数据发送
+
+也支持开启zstd压缩，但是需要自行编译，编译时加入参数--features zstd
+
+如果宽度速度比较慢，可以考虑使用高级别的压缩
+
 ### -f `<conf>`
+
 指定配置文件
 配置文件采用yaml格式，可参考：
+
 ```yaml
 # 全部参数
-tap: false #是否使用tap 
+tap: false #是否使用tap 仅在windows上支持使用tap
 token: xxx #组网token
 device_id: xxx #当前设备id
 name: windows 11 #当前设备名称
 server_address: ip:port #注册和中继服务器
-stun_server:  #stun服务器
+stun_server: #stun服务器
   - stun1.l.google.com:19302
   - stun2.l.google.com:19302
 in_ips: #代理ip入站
@@ -111,8 +186,8 @@ server_encrypt: true #服务端加密
 parallel: 1 #任务并行度
 cipher_model: aes_gcm #客户端加密算法
 finger: false #关闭数据指纹
-punch_model: ipv4 #打洞模式 
-ports: 
+punch_model: ipv4 #打洞模式，表示只使用ipv4地址打洞，默认会同时使用v6和v4
+ports:
   - 0 #使用随机端口，tcp监听此端口
   - 0
 cmd: false #关闭控制台输入
@@ -121,26 +196,61 @@ first_latency: false #是否优先低延迟通道，默认为false，表示优
 device_name: vnt-tun #网卡名称
 packet_loss: 0 #指定丢包率 取值0~1之间的数 用于模拟弱网
 packet_delay: 0 #指定延迟 单位毫秒 用于模拟弱网
+dns:
+  - 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数据
+disable_stats: false # 为true表示关闭统计
+allow_wire_guard: false # 为true则表示允许接入wg
 ```
 
 或者需要哪个配置就加哪个，当然token是必须的
+
 ```yaml
 # 部分参数
 token: xxx #组网token
 ```
+
 ### --use-channel `<relay/p2p>`
+
 - relay:仅中继模式，会禁止打洞/p2p直连，只使用服务器转发
 - p2p:仅直连模式，会禁止网络数据从服务器/客户端转发，只会使用服务器转发控制包
+
 ### --packet-loss `<0>`
-模拟丢包，取值0~1之间的小数，程序会按设定的概率主动丢包。在模拟弱网环境会有帮助。
+
+模拟丢包，取值0~1之间的小数，程序会按设定的概率主动丢包。在模拟弱网环境时会有帮助。
+
+### --packet-delay `<0>`
+
+模拟延迟,整数,单位毫秒(ms),程序会按设定的值延迟发包,可用于模拟弱网
+
+### --disable-stats
+
+关闭流量统计
+
+### --allow-wg
+
+允许接入WireGuard客户端，和wg混用时必须开启此参数
 
 ### --list
+
 在后台运行时,查看其他设备列表
+
 ### --all
+
 在后台运行时,查看其他设备完整信息
+
 ### --info
+
 在后台运行时,查看当前设备信息
-### --route 
+
+### --route
+
 在后台运行时,查看数据转发路径
+
 ### --stop
+
 停止后台运行

vnt-cli/build.rs

@@ -1,17 +1,5 @@
-use rand::Rng;
-use std::fs::File;
-use std::io::Write;
-
 fn main() {
-    // 生成随机序列号
-    let serial_number = format!(
-        "{}-{}-{}",
-        rand::thread_rng().gen_range(100..1000),
-        rand::thread_rng().gen_range(100..1000),
-        rand::thread_rng().gen_range(100..1000)
-    );
-    let generated_code = format!(r#"pub const SERIAL_NUMBER: &str = "{}";"#, serial_number);
-    let dest_path = "src/generated_serial_number.rs";
-    let mut file = File::create(&dest_path).unwrap();
-    file.write_all(generated_code.as_bytes()).unwrap();
+    // 配置 thunk-rs 来链接 Windows 7 兼容库，并自动设置链接参数
+    #[cfg(target_os = "windows")]
+    thunk::thunk();
 }

vnt-cli/src/config/mod.rs

@@ -1,199 +0,0 @@
-use std::io;
-use std::net::{Ipv4Addr, ToSocketAddrs};
-use std::str::FromStr;
-
-use serde::{Deserialize, Serialize};
-
-use vnt::channel::punch::PunchModel;
-use vnt::channel::UseChannelType;
-use vnt::cipher::CipherModel;
-use vnt::core::Config;
-
-#[derive(Serialize, Deserialize, Debug)]
-#[serde(default)]
-pub struct FileConfig {
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
-    pub tap: bool,
-    pub token: String,
-    pub device_id: String,
-    pub name: String,
-    pub server_address: String,
-    pub stun_server: Vec<String>,
-    pub in_ips: Vec<String>,
-    pub out_ips: Vec<String>,
-    pub password: Option<String>,
-    pub mtu: Option<u32>,
-    pub tcp: bool,
-    pub ip: Option<String>,
-    pub use_channel: String,
-    #[cfg(feature = "ip_proxy")]
-    pub no_proxy: bool,
-    pub server_encrypt: bool,
-    pub parallel: usize,
-    pub cipher_model: String,
-    pub finger: bool,
-    pub punch_model: String,
-    pub ports: Option<Vec<u16>>,
-    pub cmd: bool,
-    pub first_latency: bool,
-    pub device_name: Option<String>,
-    pub packet_loss: Option<f64>,
-    pub packet_delay: u32,
-}
-
-impl Default for FileConfig {
-    fn default() -> Self {
-        Self {
-            #[cfg(any(target_os = "windows", target_os = "linux"))]
-            tap: false,
-            token: "".to_string(),
-            device_id: get_device_id(),
-            name: os_info::get().to_string(),
-            server_address: "nat1.wherewego.top:29872".to_string(),
-            stun_server: vec![
-                "stun1.l.google.com:19302".to_string(),
-                "stun2.l.google.com:19302".to_string(),
-                "stun.qq.com:3478".to_string(),
-            ],
-            in_ips: vec![],
-            out_ips: vec![],
-            password: None,
-            mtu: None,
-            tcp: false,
-            ip: None,
-            use_channel: "all".to_string(),
-            #[cfg(feature = "ip_proxy")]
-            no_proxy: false,
-            server_encrypt: false,
-            parallel: 1,
-            cipher_model: "aes_gcm".to_string(),
-            finger: false,
-            punch_model: "all".to_string(),
-            ports: None,
-            cmd: false,
-            first_latency: false,
-            device_name: None,
-            packet_loss: None,
-            packet_delay: 0,
-        }
-    }
-}
-
-pub fn read_config(file_path: &str) -> io::Result<(Config, bool)> {
-    let conf = std::fs::read_to_string(file_path)?;
-    let file_conf = match serde_yaml::from_str::<FileConfig>(&conf) {
-        Ok(val) => val,
-        Err(e) => {
-            log::error!("{:?}", e);
-            return Err(io::Error::new(io::ErrorKind::Other, format!("{}", e)));
-        }
-    };
-    if file_conf.token.is_empty() {
-        return Err(io::Error::new(io::ErrorKind::Other, "token is_empty"));
-    }
-    let server_address = match file_conf.server_address.to_socket_addrs() {
-        Ok(mut addr) => {
-            if let Some(addr) = addr.next() {
-                addr
-            } else {
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("server_address {:?} error", &file_conf.server_address),
-                ));
-            }
-        }
-        Err(e) => {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("server_address {:?} error:{}", &file_conf.server_address, e),
-            ));
-        }
-    };
-    let in_ips = match common::args_parse::ips_parse(&file_conf.in_ips) {
-        Ok(in_ips) => in_ips,
-        Err(e) => {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("in_ips {:?} error:{}", &file_conf.in_ips, e),
-            ));
-        }
-    };
-    let out_ips = match common::args_parse::out_ips_parse(&file_conf.out_ips) {
-        Ok(out_ips) => out_ips,
-        Err(e) => {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("out_ips {:?} error:{}", &file_conf.out_ips, e),
-            ));
-        }
-    };
-    let virtual_ip = match file_conf.ip.clone().map(|v| Ipv4Addr::from_str(&v)) {
-        None => None,
-        Some(r) => Some(r.map_err(|e| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("ip {:?} error:{}", &file_conf.ip, e),
-            )
-        })?),
-    };
-
-    let cipher_model = CipherModel::from_str(&file_conf.cipher_model)
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
-
-    let punch_model = PunchModel::from_str(&file_conf.punch_model)
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
-    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"))]
-        file_conf.tap,
-        file_conf.token,
-        file_conf.device_id,
-        file_conf.name,
-        server_address,
-        file_conf.server_address,
-        file_conf.stun_server,
-        in_ips,
-        out_ips,
-        file_conf.password,
-        file_conf.mtu,
-        file_conf.tcp,
-        virtual_ip,
-        #[cfg(feature = "ip_proxy")]
-        file_conf.no_proxy,
-        file_conf.server_encrypt,
-        file_conf.parallel,
-        cipher_model,
-        file_conf.finger,
-        punch_model,
-        file_conf.ports,
-        file_conf.first_latency,
-        file_conf.device_name,
-        use_channel_type,
-        file_conf.packet_loss,
-        file_conf.packet_delay,
-    )
-    .unwrap();
-    Ok((config, file_conf.cmd))
-}
-
-pub fn get_device_id() -> String {
-    if let Some(id) = common::identifier::get_unique_identifier() {
-        id
-    } else {
-        let path_buf = match crate::app_home() {
-            Ok(path_buf) => path_buf.join("device-id"),
-            Err(e) => {
-                log::warn!("{:?}", e);
-                return String::new();
-            }
-        };
-        if let Ok(id) = std::fs::read_to_string(path_buf.as_path()) {
-            id
-        } else {
-            let id = uuid::Uuid::new_v4().to_string();
-            let _ = std::fs::write(path_buf, &id);
-            id
-        }
-    }
-}

vnt-cli/src/main.rs

@@ -1,515 +1,104 @@
-use std::net::{Ipv4Addr, ToSocketAddrs};
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::{io, thread};
-
+use common::callback;
 use console::style;
-use getopts::Options;
-
-use common::args_parse::{ips_parse, out_ips_parse};
-use vnt::channel::punch::PunchModel;
-use vnt::channel::UseChannelType;
-use vnt::cipher::CipherModel;
 use vnt::core::{Config, Vnt};
-
-mod command;
-mod config;
-mod console_out;
-mod generated_serial_number;
 mod root_check;
-
-pub fn app_home() -> io::Result<PathBuf> {
-    let root_path = match std::env::current_exe() {
-        Ok(path) => {
-            if let Some(v) = path.as_path().parent() {
-                v.to_path_buf()
+fn main() {
+    let (config, _vnt_link_config, cmd) = match common::cli::parse_args_config() {
+        Ok(rs) => {
+            if let Some(rs) = rs {
+                rs
             } else {
-                log::warn!("current_exe parent none:{:?}", path);
-                PathBuf::new()
+                return;
             }
         }
         Err(e) => {
-            log::warn!("current_exe err:{:?}", e);
-            PathBuf::new()
-        }
-    };
-    let path = root_path.join("env");
-    if !path.exists() {
-        std::fs::create_dir_all(&path)?;
-    }
-    Ok(path)
-}
-
-fn main() {
-    let _ = log4rs::init_file("log4rs.yaml", Default::default());
-    let args: Vec<String> = std::env::args().collect();
-    let program = args[0].clone();
-    let mut opts = Options::new();
-    opts.optopt("k", "", "组网标识", "<token>");
-    opts.optopt("n", "", "设备名称", "<name>");
-    opts.optopt("d", "", "设备标识", "<id>");
-    opts.optflag("c", "", "关闭交互式命令");
-    opts.optopt("s", "", "注册和中继服务器地址", "<server>");
-    opts.optmulti("e", "", "stun服务器", "<stun-server>");
-    opts.optflag("a", "", "使用tap模式");
-    opts.optopt("", "nic", "虚拟网卡名称,windows下使用tap则必填", "<tun0>");
-    opts.optmulti("i", "", "配置点对网(IP代理)入站时使用", "<in-ip>");
-    opts.optmulti("o", "", "配置点对网出站时使用", "<out-ip>");
-    opts.optopt("w", "", "客户端加密", "<password>");
-    opts.optflag("W", "", "服务端加密");
-    opts.optopt("u", "", "自定义mtu(默认为1430)", "<mtu>");
-    opts.optflag("", "tcp", "tcp");
-    opts.optopt("", "ip", "指定虚拟ip", "<ip>");
-    opts.optflag("", "relay", "仅使用服务器转发");
-    opts.optopt("", "par", "任务并行度(必须为正整数)", "<parallel>");
-    opts.optopt("", "model", "加密模式", "<model>");
-    opts.optflag("", "finger", "指纹校验");
-    opts.optopt("", "punch", "取值ipv4/ipv6", "<punch>");
-    opts.optopt("", "ports", "监听的端口", "<port,port>");
-    opts.optflag("", "cmd", "开启窗口输入");
-    opts.optflag("", "no-proxy", "关闭内置代理");
-    opts.optflag("", "first-latency", "优先延迟");
-    opts.optopt("", "use-channel", "使用通道 relay/p2p", "<use-channel>");
-    opts.optopt("", "packet-loss", "丢包率", "<packet-loss>");
-    opts.optopt("", "packet-delay", "延迟", "<packet-delay>");
-    opts.optopt("f", "", "配置文件", "<conf>");
-    //"后台运行时,查看其他设备列表"
-    opts.optflag("", "list", "后台运行时,查看其他设备列表");
-    opts.optflag("", "all", "后台运行时,查看其他设备完整信息");
-    opts.optflag("", "info", "后台运行时,查看当前设备信息");
-    opts.optflag("", "route", "后台运行时,查看数据转发路径");
-    opts.optflag("", "stop", "停止后台运行");
-    opts.optflag("h", "help", "帮助");
-    let matches = match opts.parse(&args[1..]) {
-        Ok(m) => m,
-        Err(f) => {
-            print_usage(&program, opts);
-            println!("{}", f.to_string());
+            log::error!(
+                "parse error={:?} cmd={:?}",
+                e,
+                std::env::args().collect::<Vec<String>>()
+            );
+            println!("{}", style(format!("Error {:?}", e)).red());
             return;
         }
     };
-    if matches.opt_present("h") || args.len() == 1 {
-        print_usage(&program, opts);
-        return;
-    }
+    main0(config, cmd)
+}
+fn main0(config: Config, _show_cmd: bool) {
     if !root_check::is_app_elevated() {
         println!("Please run it with administrator or root privileges");
         #[cfg(any(target_os = "linux", target_os = "macos"))]
         sudo::escalate_if_needed().unwrap();
         return;
     }
-    if matches.opt_present("list") {
-        command::command(command::CommandEnum::List);
-        return;
-    } else if matches.opt_present("info") {
-        command::command(command::CommandEnum::Info);
-        return;
-    } else if matches.opt_present("stop") {
-        command::command(command::CommandEnum::Stop);
-        return;
-    } else if matches.opt_present("route") {
-        command::command(command::CommandEnum::Route);
-        return;
-    } else if matches.opt_present("all") {
-        command::command(command::CommandEnum::All);
-        return;
+    #[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 conf = matches.opt_str("f");
-    let (config, cmd) = if conf.is_some() {
-        match config::read_config(&conf.unwrap()) {
-            Ok(c) => c,
-            Err(e) => {
-                println!("conf err {}", e);
-                return;
-            }
+    let vnt_util = match Vnt::new(config, callback::VntHandler {}) {
+        Ok(vnt) => vnt,
+        Err(e) => {
+            log::error!("vnt create error {:?}", e);
+            println!("error: {:?}", e);
+            std::process::exit(1);
         }
-    } else {
-        if !matches.opt_present("k") {
-            print_usage(&program, opts);
-            println!("parameter -k not found .");
-            return;
-        }
-        #[cfg(any(target_os = "windows", target_os = "linux"))]
-        let tap = matches.opt_present("a");
-        let device_name = matches.opt_str("nic");
-        let token: String = matches.opt_get("k").unwrap().unwrap();
-        let device_id = matches.opt_get_default("d", String::new()).unwrap();
-        let device_id = if device_id.is_empty() {
-            config::get_device_id()
-        } else {
-            device_id
-        };
-        if device_id.is_empty() {
-            print_usage(&program, opts);
-            println!("parameter -d not found .");
-            return;
-        }
-        let name = matches
-            .opt_get_default("n", os_info::get().to_string())
-            .unwrap();
-        let server_address_str = matches
-            .opt_get_default("s", "nat1.wherewego.top:29872".to_string())
-            .unwrap();
-        let server_address = match server_address_str.to_socket_addrs() {
-            Ok(mut addr) => {
-                if let Some(addr) = addr.next() {
-                    addr
-                } else {
-                    println!("parameter '-s {}' error .", server_address_str);
-                    return;
-                }
-            }
-            Err(e) => {
-                println!("parameter '-s {}' error {}.", server_address_str, e);
-                return;
-            }
-        };
-        let mut stun_server = matches.opt_strs("e");
-        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());
-        }
-
-        let in_ip = matches.opt_strs("i");
-        let in_ip = match ips_parse(&in_ip) {
-            Ok(in_ip) => in_ip,
-            Err(e) => {
-                print_usage(&program, opts);
-                println!();
-                println!("-i: {:?} {}", in_ip, e);
-                println!("example: -i 192.168.0.0/24,10.26.0.3");
-                return;
-            }
-        };
-        let out_ip = matches.opt_strs("o");
-        let out_ip = match out_ips_parse(&out_ip) {
-            Ok(out_ip) => out_ip,
-            Err(e) => {
-                print_usage(&program, opts);
-                println!();
-                println!("-o: {:?} {}", out_ip, e);
-                println!("example: -o 0.0.0.0/0");
-                return;
-            }
-        };
-        let password: Option<String> = matches.opt_get("w").unwrap();
-        let server_encrypt = matches.opt_present("W");
-        #[cfg(not(feature = "server_encrypt"))]
-        {
-            if server_encrypt {
-                println!("Server encryption not supported");
-                return;
-            }
-        }
-        let mtu: Option<String> = matches.opt_get("u").unwrap();
-        let mtu = if let Some(mtu) = mtu {
-            match u32::from_str(&mtu) {
-                Ok(mtu) => Some(mtu),
-                Err(e) => {
-                    print_usage(&program, opts);
-                    println!();
-                    println!("'-u {}' {}", mtu, e);
-                    return;
-                }
-            }
-        } else {
-            None
-        };
-        let virtual_ip: Option<String> = matches.opt_get("ip").unwrap();
-        let virtual_ip =
-            virtual_ip.map(|v| Ipv4Addr::from_str(&v).expect(&format!("'--ip {}' error", v)));
-        if let Some(virtual_ip) = virtual_ip {
-            if virtual_ip.is_unspecified() || virtual_ip.is_broadcast() || virtual_ip.is_multicast()
-            {
-                println!("'--ip {}' invalid", virtual_ip);
-                return;
-            }
-        }
-        let tcp_channel = matches.opt_present("tcp");
-        let relay = matches.opt_present("relay");
-
-        let parallel = matches.opt_get::<usize>("par").unwrap().unwrap_or(1);
-        if parallel == 0 {
-            println!("'--par {}' invalid", parallel);
-            return;
-        }
-
-        let cipher_model = match matches.opt_get::<CipherModel>("model") {
-            Ok(model) => {
-                #[cfg(not(any(
-                    feature = "aes_gcm",
-                    feature = "server_encrypt",
-                    feature = "aes_cbc",
-                    feature = "aes_ecb",
-                    feature = "sm4_cbc"
-                )))]
-                {
-                    if password.is_some() && model.is_none() {
-                        println!("Encryption not supported");
-                        return;
-                    }
-                }
-                #[cfg(not(any(feature = "aes_gcm", feature = "server_encrypt")))]
-                {
-                    if password.is_some() && model.is_none() {
-                        println!("'--model ' undefined");
-                        return;
-                    }
-                    model.unwrap_or(CipherModel::None)
-                }
-                #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
-                model.unwrap_or(CipherModel::AesGcm)
-            }
-            Err(e) => {
-                println!("'--model ' invalid,{}", e);
-                return;
-            }
-        };
-
-        let finger = matches.opt_present("finger");
-        let punch_model = matches
-            .opt_get::<PunchModel>("punch")
-            .unwrap()
-            .unwrap_or(PunchModel::All);
-        let use_channel_type = matches
-            .opt_get::<UseChannelType>("use-channel")
-            .unwrap()
-            .unwrap_or_else(|| {
-                if relay {
-                    UseChannelType::Relay
-                } else {
-                    UseChannelType::All
-                }
-            });
-
-        let ports = matches
-            .opt_get::<String>("ports")
-            .unwrap_or(None)
-            .map(|v| v.split(",").map(|x| x.parse().unwrap_or(0)).collect());
-
-        let cmd = matches.opt_present("cmd");
-        #[cfg(feature = "ip_proxy")]
-        let no_proxy = matches.opt_present("no-proxy");
-        let first_latency = matches.opt_present("first-latency");
-        let packet_loss = matches
-            .opt_get::<f64>("packet-loss")
-            .expect("--packet-loss");
-        let packet_delay = matches
-            .opt_get::<u32>("packet-delay")
-            .expect("--packet-delay")
-            .unwrap_or(0);
-        let config = match Config::new(
-            #[cfg(any(target_os = "windows", target_os = "linux"))]
-            tap,
-            token,
-            device_id,
-            name,
-            server_address,
-            server_address_str,
-            stun_server,
-            in_ip,
-            out_ip,
-            password,
-            mtu,
-            tcp_channel,
-            virtual_ip,
-            #[cfg(feature = "ip_proxy")]
-            no_proxy,
-            server_encrypt,
-            parallel,
-            cipher_model,
-            finger,
-            punch_model,
-            ports,
-            first_latency,
-            device_name,
-            use_channel_type,
-            packet_loss,
-            packet_delay,
-        ) {
-            Ok(config) => config,
-            Err(e) => {
-                println!("config error: {}", e);
-                return;
-            }
-        };
-        (config, cmd)
     };
-    println!("version {}", vnt::VNT_VERSION);
-    println!("Serial:{}", generated_serial_number::SERIAL_NUMBER);
-    main0(config, cmd);
-    std::process::exit(0);
-}
-
-mod callback;
-
-fn main0(config: Config, show_cmd: bool) {
-    let vnt_util = Vnt::new(config, callback::VntHandler {}).unwrap();
-    let vnt_c = vnt_util.clone();
-    thread::Builder::new()
-        .name("CommandServer".into())
-        .spawn(move || {
-            if let Err(e) = command::server::CommandServer::new().start(vnt_c) {
-                log::warn!("cmd:{:?}", e);
+    #[cfg(any(target_os = "linux", target_os = "macos"))]
+    {
+        let vnt_c = vnt_util.clone();
+        let mut signals = signal_hook::iterator::Signals::new(&[
+            signal_hook::consts::SIGINT,
+            signal_hook::consts::SIGTERM,
+        ])
+        .unwrap();
+        let handle = signals.handle();
+        std::thread::spawn(move || {
+            for sig in signals.forever() {
+                match sig {
+                    signal_hook::consts::SIGINT | signal_hook::consts::SIGTERM => {
+                        println!("Received SIGINT, {}", sig);
+                        vnt_c.stop();
+                        handle.close();
+                        break;
+                    }
+                    _ => {}
+                }
             }
-        })
-        .expect("CommandServer");
-    if show_cmd {
-        let mut cmd = String::new();
-        loop {
-            cmd.clear();
-            println!("======== input:list,info,route,all,stop ========");
-            match io::stdin().read_line(&mut cmd) {
-                Ok(len) => {
-                    if !command(&cmd[..len], &vnt_util) {
+        });
+    }
+    #[cfg(feature = "command")]
+    {
+        let vnt_c = vnt_util.clone();
+        std::thread::Builder::new()
+            .name("CommandServer".into())
+            .spawn(move || {
+                if let Err(e) = common::command::server::CommandServer::new().start(vnt_c) {
+                    log::warn!("cmd:{:?}", e);
+                }
+            })
+            .expect("CommandServer");
+        if _show_cmd {
+            let mut cmd = String::new();
+            loop {
+                cmd.clear();
+                println!("======== input:list,info,route,all,stop,chart_a,chart_b[:ip] ========");
+                match std::io::stdin().read_line(&mut cmd) {
+                    Ok(len) => {
+                        if !common::command::command_str(&cmd[..len], &vnt_util) {
+                            break;
+                        }
+                    }
+                    Err(e) => {
+                        println!("input err:{}", e);
                         break;
                     }
                 }
-                Err(e) => {
-                    println!("input err:{}", e);
-                    break;
-                }
             }
         }
     }
+
     vnt_util.wait()
 }
-
-fn command(cmd: &str, vnt: &Vnt) -> bool {
-    if cmd.is_empty() {
-        return false;
-    }
-    match cmd.to_lowercase().trim() {
-        "list" => {
-            let list = command::command_list(&vnt);
-            console_out::console_device_list(list);
-        }
-        "info" => {
-            let info = command::command_info(&vnt);
-            console_out::console_info(info);
-        }
-        "route" => {
-            let route = command::command_route(&vnt);
-            console_out::console_route_table(route);
-        }
-        "all" => {
-            let list = command::command_list(&vnt);
-            console_out::console_device_list_all(list);
-        }
-        "stop" => {
-            let _ = vnt.stop();
-            return false;
-        }
-        _ => {}
-    }
-    println!();
-    return true;
-}
-
-fn print_usage(program: &str, _opts: Options) {
-    println!("Usage: {} [options]", program);
-    println!("version:{}", vnt::VNT_VERSION);
-    println!("Serial:{}", generated_serial_number::SERIAL_NUMBER);
-    println!("Options:");
-    println!(
-        "  -k <token>          {}",
-        green("使用相同的token,就能组建一个局域网络".to_string())
-    );
-    println!("  -n <name>           给设备一个名字,便于区分不同设备,默认使用系统版本");
-    println!("  -d <id>             设备唯一标识符,不使用--ip参数时,服务端凭此参数分配虚拟ip,注意不能重复");
-    println!("  -s <server>         注册和中继服务器地址");
-    println!("  -e <stun-server>    stun服务器,用于探测NAT类型,可多次指定,如-e addr1 -e addr2");
-    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,可指定多个网段");
-    #[cfg(feature = "ip_proxy")]
-    println!("  -o <out-ip>         配置点对网时使用,-o 192.168.0.0/24表示允许将数据转发到192.168.0.0/24,可指定多个网段");
-    #[cfg(not(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    )))]
-    let enums = String::new();
-    #[cfg(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    ))]
-    let mut enums = String::new();
-    #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
-    enums.push_str("/aes_gcm");
-    #[cfg(feature = "aes_cbc")]
-    enums.push_str("/aes_cbc");
-    #[cfg(feature = "aes_ecb")]
-    enums.push_str("/aes_ecb");
-    #[cfg(feature = "sm4_cbc")]
-    enums.push_str("/sm4_cbc");
-    if !enums.is_empty() {
-        println!("  -w <password>       使用该密码生成的密钥对客户端数据进行加密,并且服务端无法解密,使用相同密码的客户端才能通信");
-    }
-    #[cfg(feature = "server_encrypt")]
-    println!("  -W                  加密当前客户端和服务端通信的数据,请留意服务端指纹是否正确");
-    println!("  -u <mtu>            自定义mtu(不加密默认为1450，加密默认为1410)");
-    println!("  -f <conf_file>      读取配置文件中的配置");
-
-    println!("  --tcp               和服务端使用tcp通信,默认使用udp,遇到udp qos时可指定使用tcp");
-    println!("  --ip <ip>           指定虚拟ip,指定的ip不能和其他设备重复,必须有效并且在服务端所属网段下,默认情况由服务端分配");
-    println!("  --par <parallel>    任务并行度(必须为正整数),默认值为1");
-    if !enums.is_empty() {
-        println!(
-            "  --model <model>     加密模式(默认aes_gcm),可选值{}",
-            &enums[1..]
-        );
-    }
-    if !enums.is_empty() {
-        println!("  --finger            增加数据指纹校验,可增加安全性,如果服务端开启指纹校验,则客户端也必须开启");
-    }
-    println!("  --punch <punch>     取值ipv4/ipv6/all,ipv4表示仅使用ipv4打洞");
-    println!("  --ports <port,port> 取值0~65535,指定本地监听的一组端口,默认监听两个随机端口,使用过多端口会增加网络负担");
-    println!("  --cmd               开启交互式命令,使用此参数开启控制台输入");
-    #[cfg(feature = "ip_proxy")]
-    println!("  --no-proxy          关闭内置代理,如需点对网则需要配置网卡NAT转发");
-    println!("  --first-latency     优先低延迟的通道,默认情况优先使用p2p通道");
-    println!("  --use-channel <p2p> 使用通道 relay/p2p/all,默认两者都使用");
-    println!("  --nic <tun0>        指定虚拟网卡名称");
-    println!("  --packet-loss <0>   模拟丢包,取值0~1之间的小数,程序会按设定的概率主动丢包,可用于模拟弱网");
-    println!(
-        "  --packet-delay <0>  模拟延迟,整数,单位毫秒(ms),程序会按设定的值延迟发包,可用于模拟弱网"
-    );
-
-    println!();
-    println!(
-        "  --list              {}",
-        yellow("后台运行时,查看其他设备列表".to_string())
-    );
-    println!(
-        "  --all               {}",
-        yellow("后台运行时,查看其他设备完整信息".to_string())
-    );
-    println!(
-        "  --info              {}",
-        yellow("后台运行时,查看当前设备信息".to_string())
-    );
-    println!(
-        "  --route             {}",
-        yellow("后台运行时,查看数据转发路径".to_string())
-    );
-    println!(
-        "  --stop              {}",
-        yellow("停止后台运行".to_string())
-    );
-    println!("  -h, --help          帮助");
-}
-
-fn green(str: String) -> impl std::fmt::Display {
-    style(str).green()
-}
-
-fn yellow(str: String) -> impl std::fmt::Display {
-    style(str).yellow()
-}

vnt-jni/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "vnt-jni"
-version = "1.2.9"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-common = { path = "../common" }
-vnt = {path="../vnt"}
-parking_lot = "0.12.1"
-
-jni = { version = "0.21.1", default-features = false }
-log = "0.4.20"
-spki = { version = "0.7.2", features = ["fingerprint", "alloc","base64","pem"]}
-
-[lib]
-crate-type = ["staticlib", "cdylib"]

vnt-jni/README.md

@@ -1 +0,0 @@
-## 提供给安卓端使用

vnt-jni/java/top/wherewego/vnt/jni/CallBack.java

@@ -1,53 +0,0 @@
-package top.wherewego.vnt.jni;
-
-import top.wherewego.vnt.jni.param.*;
-
-/**
- * 回调
- *
- * @author https://github.com/lbl8603/vnt
- */
-public interface CallBack {
-    /**
-     * 创建虚拟网卡成功的回调方法
-     *
-     * @param info 网卡信息
-     */
-    void createTun(DeviceInfo info);
-
-    /**
-     * 连接服务端
-     *
-     * @param info 将要连接的服务端信息
-     */
-    void connect(ConnectInfo info);
-
-    /**
-     * 和服务端握手
-     *
-     * @param info 握手信息
-     * @return 是否确认握手
-     */
-    boolean handshake(HandshakeInfo info);
-
-    /**
-     * 注册成功回调
-     *
-     * @param info 注册信息
-     * @return 是否确认注册信息
-     */
-    boolean register(RegisterInfo info);
-
-    /**
-     * 异常回调
-     *
-     * @param info 错误信息
-     */
-    void error(ErrorInfo info);
-
-    /**
-     * 服务停止
-     */
-    void stop();
-
-}

vnt-jni/java/top/wherewego/vnt/jni/Config.java

@@ -1,264 +0,0 @@
-package top.wherewego.vnt.jni;
-
-/**
- * 启动配置
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class Config {
-    /**
-     * 是否是tap模式，仅支持windows和linux
-     */
-    private boolean tap;
-    /**
-     * 组网标识
-     */
-    private String token;
-    /**
-     * 设备名称
-     */
-    private String name;
-    /**
-     * 客户端间加密的密码
-     */
-    private String password;
-    /**
-     * 客户端间加密模式 aes_gcm/aes_cbc/aes_ecb/sm4_cbc
-     */
-    private String cipherModel;
-    /**
-     * 打洞模式 ipv4/ipv6/all
-     */
-    private String punchModel;
-    /**
-     * mtu 默认自动计算
-     */
-    private Integer mtu;
-    /**
-     * 是否开启服务端加密
-     */
-    private boolean serverEncrypt;
-    /**
-     * 仅使用中继转发
-     */
-    private boolean relay;
-    /**
-     * 设备id，请使用唯一值
-     */
-    private String deviceId;
-    /**
-     * 服务端地址
-     */
-    private String server;
-    /**
-     * stun服务地址
-     */
-    private String[] stunServer;
-    /**
-     * 和服务端使用tcp通信，默认使用udp
-     */
-    private boolean tcp;
-    /**
-     * 指定组网IP
-     */
-    private String ip;
-    /**
-     * 开启加密指纹校验
-     */
-    private boolean finger;
-    /**
-     * 延迟优先，默认p2p优先
-     */
-    private boolean firstLatency;
-    /**
-     * 点对网入口 格式 192.168.0.0/26,10.26.0.2
-     */
-    private String[] inIps;
-    /**
-     * 点对网出口 格式 192.168.0.0/26
-     */
-    private String[] outIps;
-    /**
-     * 端口组，udp会监听一组端口，tcp监听ports[0]端口
-     */
-    private int[] ports;
-    /**
-     * 虚拟网卡名称 仅在linux、windows、macos上支持
-     */
-    private String deviceName;
-    /**
-     * 虚拟网卡fd 仅在android上支持
-     */
-    private int deviceFd;
-
-    public Config() {
-    }
-
-    public boolean isTap() {
-        return tap;
-    }
-
-    public void setTap(boolean tap) {
-        this.tap = tap;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getCipherModel() {
-        return cipherModel;
-    }
-
-    public void setCipherModel(String cipherModel) {
-        this.cipherModel = cipherModel;
-    }
-
-    public String getPunchModel() {
-        return punchModel;
-    }
-
-    public void setPunchModel(String punchModel) {
-        this.punchModel = punchModel;
-    }
-
-    public Integer getMtu() {
-        return mtu;
-    }
-
-    public void setMtu(Integer mtu) {
-        this.mtu = mtu;
-    }
-
-    public boolean isServerEncrypt() {
-        return serverEncrypt;
-    }
-
-    public void setServerEncrypt(boolean serverEncrypt) {
-        this.serverEncrypt = serverEncrypt;
-    }
-
-    public boolean isRelay() {
-        return relay;
-    }
-
-    public void setRelay(boolean relay) {
-        this.relay = relay;
-    }
-
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    public String getServer() {
-        return server;
-    }
-
-    public void setServer(String server) {
-        this.server = server;
-    }
-
-    public String[] getStunServer() {
-        return stunServer;
-    }
-
-    public void setStunServer(String[] stunServer) {
-        this.stunServer = stunServer;
-    }
-
-    public boolean isTcp() {
-        return tcp;
-    }
-
-    public void setTcp(boolean tcp) {
-        this.tcp = tcp;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public boolean isFinger() {
-        return finger;
-    }
-
-    public void setFinger(boolean finger) {
-        this.finger = finger;
-    }
-
-    public boolean isFirstLatency() {
-        return firstLatency;
-    }
-
-    public void setFirstLatency(boolean firstLatency) {
-        this.firstLatency = firstLatency;
-    }
-
-    public String[] getInIps() {
-        return inIps;
-    }
-
-    public void setInIps(String[] inIps) {
-        this.inIps = inIps;
-    }
-
-    public String[] getOutIps() {
-        return outIps;
-    }
-
-    public void setOutIps(String[] outIps) {
-        this.outIps = outIps;
-    }
-
-    public int[] getPorts() {
-        return ports;
-    }
-
-    public void setPorts(int[] ports) {
-        this.ports = ports;
-    }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public int getDeviceFd() {
-        return deviceFd;
-    }
-
-    public void setDeviceFd(int deviceFd) {
-        this.deviceFd = deviceFd;
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/IpUtils.java

@@ -1,29 +0,0 @@
-package top.wherewego.vnt.jni;
-
-/**
- * @author lubeilin
- * @date: 2024/02/27 18:31
- */
-public class IpUtils {
-    public static String intToIpAddress(int ipAddress) {
-
-        return ((ipAddress & 0xFF000000) >>> 24) + "." +
-                ((ipAddress & 0x00FF0000) >>> 16) + "." +
-                ((ipAddress & 0x0000FF00) >>> 8) + "." +
-                (ipAddress & 0x000000FF);
-    }
-    public static int subnetMaskToPrefixLength(int subnetMask) {
-        int prefixLength = 0;
-        int bit = 1 << 31;
-
-        while (subnetMask != 0) {
-            if ((subnetMask & bit) != bit) {
-                break;
-            }
-            prefixLength++;
-            subnetMask <<= 1;
-        }
-
-        return prefixLength;
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/PeerDeviceInfo.java

@@ -1,46 +0,0 @@
-package top.wherewego.vnt.jni;
-
-/**
- * 对端设备信息
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class PeerDeviceInfo {
-    private final int virtualIp;
-    private final String name;
-    private final String status;
-    private final Route route;
-
-    public PeerDeviceInfo(int virtualIp, String name, String status, Route route) {
-        this.virtualIp = virtualIp;
-        this.name = name;
-        this.status = status;
-        this.route = route;
-    }
-
-    public int getVirtualIp() {
-        return virtualIp;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public Route getRoute() {
-        return route;
-    }
-
-    @Override
-    public String toString() {
-        return "PeerDeviceInfo{" +
-                "virtualIp=" + IpUtils.intToIpAddress(virtualIp) +
-                ", name='" + name + '\'' +
-                ", status='" + status + '\'' +
-                ", route=" + route +
-                '}';
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/Route.java

@@ -1,39 +0,0 @@
-package top.wherewego.vnt.jni;
-
-/**
- * 路由信息
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class Route {
-    private final String address;
-    private final byte metric;
-    private final int rt;
-
-    public Route(String address, byte metric, int rt) {
-        this.address = address;
-        this.metric = metric;
-        this.rt = rt;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public byte getMetric() {
-        return metric;
-    }
-
-    public int getRt() {
-        return rt;
-    }
-
-    @Override
-    public String toString() {
-        return "Route{" +
-                "address='" + address + '\'' +
-                ", metric=" + metric +
-                ", rt=" + rt +
-                '}';
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/Vnt.java

@@ -1,47 +0,0 @@
-package top.wherewego.vnt.jni;
-
-import java.io.Closeable;
-import java.io.IOException;
-
-/**
- * vnt的Java映射
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class Vnt implements Closeable {
-    private final long raw;
-
-    public Vnt(Config config, CallBack callBack) {
-        this.raw = new0(config, callBack);
-        if(this.raw == 0){
-            throw new RuntimeException();
-        }
-    }
-
-    public void stop() {
-        stop0(raw);
-    }
-
-    public void await() {
-        wait0(raw);
-    }
-
-    public PeerDeviceInfo[] list() {
-        return list0(raw);
-    }
-
-    private native long new0(Config config, CallBack callBack);
-
-    private native void stop0(long raw);
-
-    private native void wait0(long raw);
-
-    private native void drop0(long raw);
-
-    private native PeerDeviceInfo[] list0(long raw);
-
-    @Override
-    public void close() throws IOException {
-        drop0(raw);
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/param/ConnectInfo.java

@@ -1,32 +0,0 @@
-package top.wherewego.vnt.jni.param;
-
-/**
- * 连接信息
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class ConnectInfo {
-    private final long count;
-    private final String address;
-
-    public ConnectInfo(long count, String address) {
-        this.count = count;
-        this.address = address;
-    }
-
-    public long getCount() {
-        return count;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    @Override
-    public String toString() {
-        return "ConnectInfo{" +
-                "count=" + count +
-                ", address='" + address + '\'' +
-                '}';
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/param/DeviceInfo.java

@@ -1,38 +0,0 @@
-package top.wherewego.vnt.jni.param;
-
-/**
- * 网卡信息
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class DeviceInfo {
-    /**
-     * 虚拟网卡名称
-     */
-    private final String name;
-    /**
-     * 虚拟网卡版本
-     */
-    private final String version;
-
-    public DeviceInfo(String name, String version) {
-        this.name = name;
-        this.version = version;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    @Override
-    public String toString() {
-        return "DeviceInfo{" +
-                "name='" + name + '\'' +
-                ", version='" + version + '\'' +
-                '}';
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/param/ErrorInfo.java

@@ -1,55 +0,0 @@
-package top.wherewego.vnt.jni.param;
-
-/**
- * 异常回调信息
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class ErrorInfo {
-    /**
-     * 错误码
-     */
-    public final ErrorCodeEnum code;
-    /**
-     * 错误信息，可能为空
-     */
-    public final String msg;
-
-    public ErrorInfo(int code, String msg) {
-        this.code = switch (code) {
-            case 1 -> ErrorCodeEnum.TokenError;
-            case 2 -> ErrorCodeEnum.Disconnect;
-            case 3 -> ErrorCodeEnum.AddressExhausted;
-            case 4 -> ErrorCodeEnum.IpAlreadyExists;
-            case 5 -> ErrorCodeEnum.InvalidIp;
-            case 6 -> ErrorCodeEnum.Unknown;
-            default -> null;
-        };
-        this.msg = msg;
-    }
-
-    public ErrorCodeEnum getCode() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public enum ErrorCodeEnum {
-        TokenError,
-        Disconnect,
-        AddressExhausted,
-        IpAlreadyExists,
-        InvalidIp,
-        Unknown,
-    }
-
-    @Override
-    public String toString() {
-        return "ErrorInfo{" +
-                "code=" + code +
-                ", msg='" + msg + '\'' +
-                '}';
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/param/HandshakeInfo.java

@@ -1,54 +0,0 @@
-package top.wherewego.vnt.jni.param;
-
-/**
- * 握手回调信息
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class HandshakeInfo {
-    /**
-     * 公钥 pem格式 CRLF分隔，不加密时为空
-     */
-    private final String publicKey;
-    /**
-     * 公钥签名，不加密时为空
-     */
-    private final String finger;
-    /**
-     * 服务端版本
-     */
-    private final String version;
-
-    public HandshakeInfo() {
-        this.publicKey = "publicKey";
-        this.finger = "finger";
-        this.version = "version";
-    }
-
-    public HandshakeInfo(String publicKey, String finger, String version) {
-        this.publicKey = publicKey;
-        this.finger = finger;
-        this.version = version;
-    }
-
-    public String getPublicKey() {
-        return publicKey;
-    }
-
-    public String getFinger() {
-        return finger;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    @Override
-    public String toString() {
-        return "HandshakeInfo{" +
-                "publicKey='" + publicKey + '\'' +
-                ", finger='" + finger + '\'' +
-                ", version='" + version + '\'' +
-                '}';
-    }
-}

vnt-jni/java/top/wherewego/vnt/jni/param/RegisterInfo.java

@@ -1,48 +0,0 @@
-package top.wherewego.vnt.jni.param;
-
-/**
- * 注册回调信息
- *
- * @author https://github.com/lbl8603/vnt
- */
-public class RegisterInfo {
-    /**
-     * 虚拟IP
-     */
-    public final String virtualIp;
-    /**
-     * 掩码
-     */
-    public final String virtualNetmask;
-    /**
-     * 网关
-     */
-    public final String virtualGateway;
-
-    public RegisterInfo(String virtualIp, String virtualNetmask, String virtualGateway) {
-        this.virtualIp = virtualIp;
-        this.virtualNetmask = virtualNetmask;
-        this.virtualGateway = virtualGateway;
-    }
-
-    public String getVirtualIp() {
-        return virtualIp;
-    }
-
-    public String getVirtualNetmask() {
-        return virtualNetmask;
-    }
-
-    public String getVirtualGateway() {
-        return virtualGateway;
-    }
-
-    @Override
-    public String toString() {
-        return "RegisterInfo{" +
-                "virtualIp='" + virtualIp + '\'' +
-                ", virtualNetmask='" + virtualNetmask + '\'' +
-                ", virtualGateway='" + virtualGateway + '\'' +
-                '}';
-    }
-}

vnt-jni/src/callback.rs

@@ -1,187 +0,0 @@
-use std::sync::Arc;
-
-use jni::objects::{GlobalRef, JString, JValue};
-use jni::{JNIEnv, JavaVM};
-use spki::der::pem::LineEnding;
-use spki::EncodePublicKey;
-
-use vnt::handle::callback::ConnectInfo;
-use vnt::{DeviceInfo, ErrorInfo, HandshakeInfo, RegisterInfo, VntCallback};
-
-#[derive(Clone)]
-pub struct CallBack {
-    jvm: Arc<JavaVM>,
-    this: GlobalRef,
-}
-
-unsafe impl Send for CallBack {}
-
-impl CallBack {
-    pub fn new(jvm: JavaVM, this: GlobalRef) -> Self {
-        Self {
-            jvm: Arc::new(jvm),
-            this,
-        }
-    }
-}
-
-impl CallBack {
-    fn create_tun0(&self, info: DeviceInfo) -> jni::errors::Result<()> {
-        let env = &mut self.jvm.attach_current_thread()? as &mut JNIEnv;
-        let param = env.new_object(
-            "top/wherewego/vnt/jni/param/DeviceInfo",
-            "(Ljava/lang/String;Ljava/lang/String;)V",
-            &[
-                JValue::Object(&env.new_string(info.name)?.into()),
-                JValue::Object(&env.new_string(info.version)?.into()),
-            ],
-        )?;
-        env.call_method(
-            &self.this,
-            "createTun",
-            "(Ltop/wherewego/vnt/jni/param/DeviceInfo;)V",
-            &[JValue::Object(&param)],
-        )?;
-        Ok(())
-    }
-    fn connect0(&self, info: ConnectInfo) -> jni::errors::Result<()> {
-        let env = &mut self.jvm.attach_current_thread()? as &mut JNIEnv;
-        let param = env.new_object(
-            "top/wherewego/vnt/jni/param/ConnectInfo",
-            "(JLjava/lang/String;)V",
-            &[
-                JValue::Long(info.count as _),
-                JValue::Object(&env.new_string(info.address.to_string())?.into()),
-            ],
-        )?;
-        env.call_method(
-            &self.this,
-            "connect",
-            "(Ltop/wherewego/vnt/jni/param/ConnectInfo;)V",
-            &[JValue::Object(&param)],
-        )?;
-        Ok(())
-    }
-    fn handshake0(&self, info: HandshakeInfo) -> jni::errors::Result<bool> {
-        let env = &mut self.jvm.attach_current_thread()? as &mut JNIEnv;
-        let public_key = if let Some(public_key) = info.public_key {
-            match public_key.to_public_key_pem(LineEnding::CRLF) {
-                Ok(public_key) => env.new_string(public_key)?,
-                Err(e) => {
-                    log::warn!("{:?}", e);
-                    JString::default()
-                }
-            }
-        } else {
-            JString::default()
-        };
-        let finger = if let Some(finger) = info.finger {
-            env.new_string(finger)?
-        } else {
-            JString::default()
-        };
-        let param = env.new_object(
-            "top/wherewego/vnt/jni/param/HandshakeInfo",
-            "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
-            &[
-                JValue::Object(&public_key),
-                JValue::Object(&finger),
-                JValue::Object(&env.new_string(info.version)?.into()),
-            ],
-        )?;
-        let rs = env.call_method(
-            &self.this,
-            "handshake",
-            "(Ltop/wherewego/vnt/jni/param/HandshakeInfo;)Z",
-            &[JValue::Object(&param)],
-        )?;
-        rs.z()
-    }
-    fn register0(&self, info: RegisterInfo) -> jni::errors::Result<bool> {
-        let env = &mut self.jvm.attach_current_thread()? as &mut JNIEnv;
-        let param = env.new_object(
-            "top/wherewego/vnt/jni/param/RegisterInfo",
-            "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V",
-            &[
-                JValue::Object(&env.new_string(info.virtual_ip.to_string())?.into()),
-                JValue::Object(&env.new_string(info.virtual_netmask.to_string())?.into()),
-                JValue::Object(&env.new_string(info.virtual_gateway.to_string())?.into()),
-            ],
-        )?;
-        let rs = env.call_method(
-            &self.this,
-            "register",
-            "(Ltop/wherewego/vnt/jni/param/RegisterInfo;)Z",
-            &[JValue::Object(&param)],
-        )?;
-        rs.z()
-    }
-    fn error0(&self, info: ErrorInfo) -> jni::errors::Result<()> {
-        let code: u8 = info.code.into();
-        let env = &mut self.jvm.attach_current_thread()? as &mut JNIEnv;
-        let msg = if let Some(msg) = info.msg {
-            env.new_string(msg)?
-        } else {
-            JString::default()
-        };
-        let param = env.new_object(
-            "top/wherewego/vnt/jni/param/ErrorInfo",
-            "(ILjava/lang/String;)V",
-            &[JValue::Int(code as _), JValue::Object(&msg.into())],
-        )?;
-        env.call_method(
-            &self.this,
-            "error",
-            "(Ltop/wherewego/vnt/jni/param/ErrorInfo;)V",
-            &[JValue::Object(&param)],
-        )?;
-        Ok(())
-    }
-    fn stop0(&self) -> jni::errors::Result<()> {
-        let env = &mut self.jvm.attach_current_thread()? as &mut JNIEnv;
-        env.call_method(&self.this, "error", "()V", &[])?;
-        Ok(())
-    }
-}
-
-impl VntCallback for CallBack {
-    fn success(&self) {
-    }
-    fn create_tun(&self, info: DeviceInfo) {
-        if let Err(e) = self.create_tun0(info) {
-            log::warn!("create_tun {:?}", e);
-        }
-    }
-
-    fn connect(&self, info: ConnectInfo) {
-        if let Err(e) = self.connect0(info) {
-            log::warn!("connect {:?}", e);
-        }
-    }
-
-    fn handshake(&self, info: HandshakeInfo) -> bool {
-        self.handshake0(info).unwrap_or_else(|e| {
-            log::warn!("handshake {:?}", e);
-            false
-        })
-    }
-
-    fn register(&self, info: RegisterInfo) -> bool {
-        self.register0(info).unwrap_or_else(|e| {
-            log::warn!("register {:?}", e);
-            false
-        })
-    }
-
-    fn error(&self, info: ErrorInfo) {
-        if let Err(e) = self.error0(info) {
-            log::warn!("error {:?}", e);
-        }
-    }
-
-    fn stop(&self) {
-        if let Err(e) = self.stop0() {
-            log::warn!("stop {:?}", e);
-        }
-    }
-}

vnt-jni/src/config.rs

@@ -1,149 +0,0 @@
-use std::net::ToSocketAddrs;
-use std::str::FromStr;
-
-use jni::errors::Error;
-use jni::objects::JObject;
-use jni::JNIEnv;
-
-use vnt::channel::punch::PunchModel;
-use vnt::channel::UseChannelType;
-use vnt::cipher::CipherModel;
-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"))]
-    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")?;
-    let device_id = to_string_not_null(env, &config, "deviceId")?;
-    let password = to_string(env, &config, "password")?;
-    let server_address_str = to_string_not_null(env, &config, "server")?;
-    let stun_server = to_string_array_not_null(env, &config, "stunServer")?;
-    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);
-    let tcp = env.get_field(&config, "tcp", "Z")?.z()?;
-    let server_encrypt = env.get_field(&config, "serverEncrypt", "Z")?.z()?;
-    let use_channel = to_string(env, &config, "useChannel")?;
-    let finger = env.get_field(&config, "finger", "Z")?.z()?;
-    let first_latency = env.get_field(&config, "firstLatency", "Z")?.z()?;
-    let in_ips = to_string_array(env, &config, "inIps")?;
-    let out_ips = to_string_array(env, &config, "outIps")?;
-    let ports =
-        to_i32_array(env, &config, "ports")?.map(|v| v.into_iter().map(|v| v as u16).collect());
-    let ip = if let Some(ip) = to_string(env, &config, "ip")? {
-        match ip.parse() {
-            Ok(ip) => Some(ip),
-            Err(e) => {
-                env.throw_new(
-                    "java/lang/RuntimeException",
-                    format!("ip {} err: {}", ip, e),
-                )
-                .expect("throw");
-                return Err(Error::JavaException);
-            }
-        }
-    } else {
-        None
-    };
-    let in_ips = if let Some(in_ips) = in_ips {
-        match common::args_parse::ips_parse(&in_ips) {
-            Ok(in_ips) => in_ips,
-            Err(e) => {
-                env.throw_new("java/lang/RuntimeException", format!("in_ips {}", e))
-                    .expect("throw");
-                return Err(Error::JavaException);
-            }
-        }
-    } else {
-        vec![]
-    };
-    let out_ips = if let Some(out_ips) = out_ips {
-        match common::args_parse::out_ips_parse(&out_ips) {
-            Ok(out_ips) => out_ips,
-            Err(e) => {
-                env.throw_new("java/lang/RuntimeException", format!("out_ips {}", e))
-                    .expect("throw");
-                return Err(Error::JavaException);
-            }
-        }
-    } else {
-        vec![]
-    };
-
-    let server_address = match server_address_str.to_socket_addrs() {
-        Ok(mut rs) => {
-            if let Some(addr) = rs.next() {
-                addr
-            } else {
-                env.throw_new("java/lang/RuntimeException", "server address err")
-                    .expect("throw");
-                return Err(Error::JavaException);
-            }
-        }
-        Err(e) => {
-            env.throw_new(
-                "java/lang/RuntimeException",
-                format!("server address {}", e),
-            )
-            .expect("throw");
-            return Err(Error::JavaException);
-        }
-    };
-    let cipher_model = match CipherModel::from_str(&cipher_model) {
-        Ok(cipher_model) => cipher_model,
-        Err(e) => {
-            env.throw_new("java/lang/RuntimeException", format!("cipher_model {}", e))
-                .expect("throw");
-            return Err(Error::JavaException);
-        }
-    };
-    #[cfg(not(target_os = "android"))]
-    let device_name = to_string(env, &config, "deviceName")?;
-    #[cfg(target_os = "android")]
-    let device_fd = env.get_field(&config, "deviceFd", "I")?.i()? as i32;
-    let config = match Config::new(
-        #[cfg(any(target_os = "windows", target_os = "linux"))]
-        tap,
-        token,
-        device_id,
-        name,
-        server_address,
-        server_address_str,
-        stun_server,
-        in_ips,
-        out_ips,
-        password,
-        mtu,
-        tcp,
-        ip,
-        false,
-        server_encrypt,
-        1,
-        cipher_model,
-        finger,
-        PunchModel::from_str(&punch_model.unwrap_or_default()).unwrap_or_default(),
-        ports,
-        first_latency,
-        #[cfg(not(target_os = "android"))]
-        device_name,
-        #[cfg(target_os = "android")]
-        device_fd,
-        UseChannelType::from_str(&use_channel.unwrap_or_default()).unwrap_or_default(),
-        None,
-        0,
-    ) {
-        Ok(config) => config,
-        Err(e) => {
-            env.throw_new(
-                "java/lang/RuntimeException",
-                format!("vnt start error {}", e),
-            )
-            .expect("throw");
-            return Err(Error::JavaException);
-        }
-    };
-    Ok(config)
-}

vnt-jni/src/lib.rs

@@ -1,4 +0,0 @@
-pub mod callback;
-pub mod config;
-pub mod utils;
-pub mod vnt;

vnt-jni/src/utils.rs

@@ -1,121 +0,0 @@
-use jni::errors::Error;
-use jni::objects::{JIntArray, JObject, JObjectArray, JString};
-use jni::JNIEnv;
-
-pub fn to_string_not_null(
-    env: &mut JNIEnv,
-    config: &JObject,
-    name: &'static str,
-) -> Result<String, Error> {
-    let value = env.get_field(config, name, "Ljava/lang/String;")?.l()?;
-    if value.is_null() {
-        env.throw_new("java/lang/NullPointerException", name)
-            .expect("throw");
-        return Err(Error::NullPtr(name));
-    }
-    let binding = JString::from(value);
-    let value = env.get_string(binding.as_ref())?;
-    match value.to_str() {
-        Ok(value) => Ok(value.to_string()),
-        Err(_) => {
-            env.throw_new("java/lang/RuntimeException", "not utf-8")
-                .expect("throw");
-            return Err(Error::JavaException);
-        }
-    }
-}
-
-pub fn to_string(env: &mut JNIEnv, config: &JObject, name: &str) -> Result<Option<String>, Error> {
-    let value = env.get_field(config, name, "Ljava/lang/String;")?.l()?;
-    if value.is_null() {
-        return Ok(None);
-    }
-    let tmp = JString::from(value);
-    let value = env.get_string(tmp.as_ref())?;
-    match value.to_str() {
-        Ok(value) => Ok(Some(value.to_string())),
-        Err(_) => {
-            env.throw_new("java/lang/RuntimeException", "not utf-8")
-                .expect("throw");
-            return Err(Error::JavaException);
-        }
-    }
-}
-
-pub fn to_string_array_not_null(
-    env: &mut JNIEnv,
-    config: &JObject,
-    name: &str,
-) -> Result<Vec<String>, Error> {
-    match to_string_array(env, config, name)? {
-        None => {
-            env.throw_new("java/lang/NullPointerException", name)
-                .expect("throw");
-            return Err(Error::JavaException);
-        }
-        Some(rs) => Ok(rs),
-    }
-}
-
-pub fn to_string_array(
-    env: &mut JNIEnv,
-    config: &JObject,
-    name: &str,
-) -> Result<Option<Vec<String>>, Error> {
-    let value = env.get_field(config, name, "[Ljava/lang/String;")?.l()?;
-    if value.is_null() {
-        return Ok(None);
-    }
-    let arr = JObjectArray::from(value);
-    let len = env.get_array_length(&arr)?;
-    let mut rs = Vec::with_capacity(len as usize);
-    for index in 0..len {
-        let object = env.get_object_array_element(&arr, index)?;
-        if object.is_null() {
-            env.throw_new(
-                "java/lang/NullPointerException",
-                format!("{},index={}", name, index),
-            )
-            .expect("throw");
-            return Err(Error::JavaException);
-        }
-        match env.get_string(JString::from(object).as_ref())?.to_str() {
-            Ok(value) => {
-                rs.push(value.to_string());
-            }
-            Err(_) => {
-                env.throw_new("java/lang/RuntimeException", "not utf-8")
-                    .expect("throw");
-                return Err(Error::JavaException);
-            }
-        }
-    }
-    Ok(Some(rs))
-}
-
-pub fn to_i32_array(
-    env: &mut JNIEnv,
-    config: &JObject,
-    name: &str,
-) -> Result<Option<Vec<i32>>, Error> {
-    let obj = env.get_field(&config, name, "[I")?.l()?;
-    if obj.is_null() {
-        Ok(None)
-    } else {
-        let j_arr = JIntArray::from(obj);
-        let len = env.get_array_length(&j_arr)?;
-        let mut arr = vec![0i32; len as usize];
-        env.get_int_array_region(j_arr, 0, &mut arr)?;
-        Ok(Some(arr))
-    }
-}
-pub fn to_integer(env: &mut JNIEnv, config: &JObject, name: &str) -> Result<Option<i32>, Error> {
-    let value = env.get_field(config, name, "Ljava/lang/Integer;")?.l()?;
-    if value.is_null() {
-        return Ok(None);
-    }
-    // 调用 intValue
-    return Ok(Some(
-        env.call_method(value, "intValue", "()I", &[])?.i()? as _
-    ));
-}

vnt-jni/src/vnt.rs

@@ -1,168 +0,0 @@
-use std::ptr;
-
-use jni::errors::Error;
-use jni::objects::{JClass, JObject, JValue};
-use jni::sys::{jbyte, jint, jlong, jobject, jobjectArray, jsize};
-use jni::JNIEnv;
-
-use vnt::channel::Route;
-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>,
-    _class: JClass,
-    config: JObject,
-    call_back: JObject<'static>,
-) -> jlong {
-    let jvm = if let Ok(jvm) = env.get_java_vm() {
-        jvm
-    } else {
-        return 0;
-    };
-    match crate::config::new_config(&mut env, config) {
-        Ok(config) => {
-            let call_back = if let Ok(call_back) = env.new_global_ref(call_back) {
-                call_back
-            } else {
-                return 0;
-            };
-            let vnt_util = match Vnt::new(config, CallBack::new(jvm, call_back)) {
-                Ok(vnt_util) => vnt_util,
-                Err(e) => {
-                    env.throw_new(
-                        "java/lang/RuntimeException",
-                        format!("vnt start error {}", e),
-                    )
-                    .expect("throw");
-                    return 0;
-                }
-            };
-            let ptr = Box::into_raw(Box::new(vnt_util));
-            return ptr as jlong;
-        }
-        Err(_) => {}
-    }
-    return 0;
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_stop0(
-    _env: JNIEnv,
-    _class: JClass,
-    raw_vnt: jlong,
-) {
-    let vnt = raw_vnt as *mut Vnt;
-    let _ = (&*vnt).stop();
-}
-#[no_mangle]
-pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_wait0(
-    _env: JNIEnv,
-    _class: JClass,
-    raw_vnt: jlong,
-) {
-    let vnt = raw_vnt as *mut Vnt;
-    let _ = (&*vnt).wait();
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_drop0(
-    _env: JNIEnv,
-    _class: JClass,
-    raw_vnt: jlong,
-) {
-    let vnt = raw_vnt as *mut Vnt;
-    let _ = Box::from_raw(vnt).stop();
-}
-
-#[no_mangle]
-pub unsafe extern "C" fn Java_top_wherewego_vnt_jni_Vnt_list0(
-    mut env: JNIEnv,
-    _class: JClass,
-    raw_vnt: jlong,
-) -> jobjectArray {
-    let vnt = raw_vnt as *mut Vnt;
-    let vnt = &mut *vnt;
-    let list = vnt.device_list();
-
-    let arr = match env.new_object_array(
-        list.len() as jsize,
-        "top/wherewego/vnt/jni/PeerDeviceInfo",
-        JObject::null(),
-    ) {
-        Ok(arr) => arr,
-        Err(e) => {
-            env.throw_new("java/lang/RuntimeException", format!("error:{:?}", e))
-                .expect("throw");
-            return ptr::null_mut();
-        }
-    };
-    for (index, peer) in list.into_iter().enumerate() {
-        let route = if let Some(route) = vnt.route(&peer.virtual_ip) {
-            match route_parse(&mut env, route) {
-                Ok(route) => JObject::from_raw(route),
-                Err(_) => JObject::null(),
-            }
-        } else {
-            JObject::null()
-        };
-        match peer_device_info_parse(&mut env, peer, route) {
-            Ok(peer) => {
-                match env.set_object_array_element(&arr, index as jsize, JObject::from_raw(peer)) {
-                    Ok(_) => {}
-                    Err(e) => {
-                        env.throw_new("java/lang/RuntimeException", format!("error:{:?}", e))
-                            .expect("throw");
-                        return ptr::null_mut();
-                    }
-                }
-            }
-            Err(e) => {
-                env.throw_new("java/lang/RuntimeException", format!("error:{:?}", e))
-                    .expect("throw");
-                return ptr::null_mut();
-            }
-        }
-    }
-    arr.as_raw()
-}
-
-fn route_parse(env: &mut JNIEnv, route: Route) -> Result<jobject, Error> {
-    let address = route.addr.to_string();
-    let metric = route.metric;
-    let rt = route.rt;
-    let rs = env.new_object(
-        "top/wherewego/vnt/jni/Route",
-        "(Ljava/lang/String;BI)V",
-        &[
-            JValue::Object(&env.new_string(address)?.into()),
-            JValue::Byte(metric as jbyte),
-            JValue::Int(rt as jint),
-        ],
-    )?;
-    Ok(rs.as_raw())
-}
-
-fn peer_device_info_parse(
-    env: &mut JNIEnv,
-    peer: PeerDeviceInfo,
-    route: JObject,
-) -> Result<jobject, Error> {
-    let virtual_ip = u32::from(peer.virtual_ip);
-    let name = peer.name.to_string();
-    let status = format!("{:?}", peer.status);
-    let rs = env.new_object(
-        "top/wherewego/vnt/jni/PeerDeviceInfo",
-        "(ILjava/lang/String;Ljava/lang/String;Ltop/wherewego/vnt/jni/Route;)V",
-        &[
-            JValue::Int(virtual_ip as jint),
-            JValue::Object(&env.new_string(name)?.into()),
-            JValue::Object(&env.new_string(status)?.into()),
-            JValue::Object(&route),
-        ],
-    )?;
-    Ok(rs.as_raw())
-}

vnt/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "vnt"
-version = "1.2.9"
+version = "1.2.16"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tun= {path = "tun"}
+tun-rs = { version = "2.5.0", optional = true, features = ["interruptible"] }
 packet = { path = "./packet" }
 bytes = "1.5.0"
 log = "0.4.17"
@@ -17,38 +17,73 @@ parking_lot = "0.12.1"
 rand = "0.8.5"
 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 }
+protobuf = "=3.2.0"
+socket2 = { version = "0.5.7", features = ["all"] }
+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 }
+chacha20poly1305 = { version = "0.10.1", optional = true }
+chacha20 = { version = "0.9.1", 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/vnt-dev/rust-openssl", optional = true }
+libsm = { git = "https://github.com/vnt-dev/libsm", optional = true }
+http_req = { git = "https://github.com/lmq8267/http_req.git", default-features = false, features = ["rust-tls"] }
 
-mio = {version = "0.8.10",features = ["os-poll","net"]}
+mio = { version = "=0.8.11", features = ["os-poll", "net", "os-ext"] }
+crossbeam-queue = "0.3.11"
+anyhow = "1.0.82"
+dns-parser = "0.8.0"
 
+tokio = { version = "1.46.1", features = ["full"] }
+
+lz4_flex = { version = "0.11", default-features = false, optional = true }
+zstd = { version = "0.13.1", optional = true }
+
+fnv = "1.0.7"
+igd = { version = "0.12.1", optional = true }
+tokio-tungstenite = { version = "0.23.1", optional = true }
+rustls = { version = "0.23.0", features = ["ring", "tls12"], default-features = false, optional = true }
+
+network-interface = "2.0.0"
+
+futures-util = "0.3.30"
 [target.'cfg(target_os = "windows")'.dependencies]
+winreg = "0.55.0"
 libloading = "0.8.0"
-
+windows-sys = { version = "0.60.2", features = ["Win32_Foundation",
+    "Win32_NetworkManagement",
+    "Win32_NetworkManagement_IpHelper",
+    "Win32_Networking_WinSock",
+    "Win32_System_IO",
+    "Win32_System_Threading",
+    "Win32_System_WindowsProgramming", ] }
 
 [build-dependencies]
-protobuf-codegen = "3.2.0"
+protobuf-codegen = "=3.2.0"
 protoc-bin-vendored = "3.0.0"
+cfg_aliases = "0.2.1"
 
 [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", "chacha20_poly1305", "ip_proxy", "port_mapping", "lz4_compress", "zstd_compress", "integrated_tun"]
 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"]
+chacha20_poly1305 = ["chacha20poly1305", "chacha20"]
+server_encrypt = ["aes-gcm", "rsa", "spki"]
+ip_proxy = []
+port_mapping = []
+lz4_compress = ["lz4_flex"]
+zstd_compress = ["zstd"]
+integrated_tun = ["tun-rs"]
+upnp = ["igd"]
+ws = ["tokio-tungstenite"]
+wss = ["ws", "tokio-tungstenite/rustls-tls-native-roots", "tokio-tungstenite/rustls-tls-webpki-roots", "rustls"]

vnt/build.rs

@@ -1,4 +1,17 @@
+use cfg_aliases::cfg_aliases;
+
 fn main() {
+    cfg_aliases! {
+        cipher: {
+            any(feature = "aes_gcm",
+            feature = "chacha20_poly1305",
+            feature = "server_encrypt",
+            feature = "aes_cbc",
+            feature = "aes_ecb",
+            feature = "sm4_cbc"
+        )},
+    }
+
     std::fs::create_dir_all("src/proto").unwrap();
     protobuf_codegen::Codegen::new()
         .pure()

vnt/packet/src/ip/ipv4/packet.rs

@@ -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())
     }

vnt/packet/src/lib.rs

@@ -71,14 +71,12 @@ unsigned short getChecksum(unsigned short * iphead, int count)
 pub fn cal_checksum(buffer: &[u8]) -> u16 {
     use std::io::Cursor;
     let mut sum = 0;
-    let length = buffer.len();
     let mut buffer = Cursor::new(buffer);
     while let Ok(value) = buffer.read_u16::<BigEndian>() {
         sum += u32::from(value);
     }
-    if length & 1 == 1 {
-        //奇数,说明还有一位,不足的补0
-        sum += u32c(buffer.read_u8().unwrap(), 0);
+    if let Ok(l) = buffer.read_u8() {
+        sum += u32c(l, 0);
     }
     while sum >> 16 != 0 {
         sum = (sum & 0xffff) + (sum >> 16);
@@ -119,9 +117,8 @@ pub fn ipv4_cal_checksum(
     while let Ok(value) = buffer.read_u16::<BigEndian>() {
         sum += u32::from(value);
     }
-    if length & 1 == 1 {
-        //奇数,说明还有一位
-        sum += u32c(buffer.read_u8().unwrap(), 0);
+    if let Ok(l) = buffer.read_u8() {
+        sum += u32c(l, 0);
     }
     while sum >> 16 != 0 {
         sum = (sum & 0xffff) + (sum >> 16);

vnt/proto/message.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 message HandshakeRequest {
     string version = 1;
     bool secret = 2;
+    string key_finger = 3;
 }
 message HandshakeResponse {
     string version = 1;
@@ -23,6 +24,7 @@ message RegistrationRequest {
     fixed32 virtual_ip = 6;
     bool allow_ip_change = 7;
     bool client_secret = 8;
+    bytes client_secret_hash = 9;
 }
 
 message RegistrationResponse {
@@ -40,6 +42,8 @@ message DeviceInfo {
     fixed32 virtual_ip = 2;
     uint32 device_status = 3;
     bool client_secret = 4;
+    bytes client_secret_hash = 5;
+    bool wireguard = 6;
 }
 
 message DeviceList {
@@ -60,11 +64,23 @@ message PunchInfo {
     uint32 tcp_port = 11;
     repeated uint32 udp_ports = 12;
     repeated uint32 public_ports = 13;
+    uint32 public_tcp_port = 14;
+    PunchNatModel punch_model = 15;
 }
 enum PunchNatType {
     Symmetric = 0;
     Cone = 1;
 }
+enum PunchNatModel {
+    All = 0;
+    IPv4 = 1;
+    IPv6 = 2;
+    IPv4Tcp = 3;
+    IPv4Udp = 4;
+    IPv6Tcp = 5;
+    IPv6Udp = 6;
+}
+
 /// 向服务器上报客户端状态信息
 message ClientStatusInfo {
     fixed32 source = 1;

vnt/src/channel/context.rs

@@ -1,7 +1,7 @@
-use std::collections::HashMap;
-use std::net::{Ipv4Addr, SocketAddr, SocketAddrV6, UdpSocket};
+use fnv::FnvHashMap;
+use std::net::{Ipv4Addr, SocketAddr, UdpSocket};
 use std::ops::Deref;
-use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::atomic::AtomicUsize;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use std::{io, thread};
@@ -11,26 +11,32 @@ use parking_lot::RwLock;
 use rand::Rng;
 
 use crate::channel::punch::NatType;
-use crate::channel::sender::{AcceptSocketSender, ChannelSender, PacketSender};
-use crate::channel::{Route, RouteKey, UseChannelType, DEFAULT_RT};
+use crate::channel::sender::{AcceptSocketSender, PacketSender};
+use crate::channel::socket::LocalInterface;
+use crate::channel::{ConnectProtocol, Route, RouteKey, UseChannelType, DEFAULT_RT};
+use crate::protocol::NetPacket;
+use crate::util::limit::TrafficMeterMultiAddress;
 
 /// 传输通道上下文，持有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>,
+        v4_len: usize,
         use_channel_type: UseChannelType,
         first_latency: bool,
-        is_tcp: bool,
+        protocol: ConnectProtocol,
         packet_loss_rate: Option<f64>,
         packet_delay: u32,
-        use_ipv6: bool,
+        up_traffic_meter: Option<TrafficMeterMultiAddress>,
+        down_traffic_meter: Option<TrafficMeterMultiAddress>,
+        default_interface: LocalInterface,
     ) -> Self {
-        let channel_num = main_udp_socket.len();
+        let channel_num = v4_len;
         assert_ne!(channel_num, 0, "not channel");
         let packet_loss_rate = packet_loss_rate
             .map(|v| {
@@ -44,26 +50,25 @@ impl Context {
             .unwrap_or(0);
         let inner = ContextInner {
             main_udp_socket,
-            sub_udp_socket: RwLock::new(Vec::with_capacity(64)),
-            tcp_map: RwLock::new(HashMap::with_capacity(64)),
+            v4_len,
+            sub_udp_socket: RwLock::new(Vec::new()),
+            packet_map: RwLock::new(FnvHashMap::default()),
             route_table: RouteTable::new(use_channel_type, first_latency, channel_num),
-            is_tcp,
-            state: AtomicBool::new(true),
+            protocol,
             packet_loss_rate,
             packet_delay,
-            main_index: AtomicUsize::new(0),
-            use_ipv6,
+            up_traffic_meter,
+            down_traffic_meter,
+            default_interface,
+            default_route_key: AtomicCell::default(),
         };
         Self {
             inner: Arc::new(inner),
         }
     }
-    pub fn sender(&self) -> ChannelSender {
-        ChannelSender::new(self.clone())
-    }
 }
 
-impl Deref for Context {
+impl Deref for ChannelContext {
     type Target = ContextInner;
 
     fn deref(&self) -> &Self::Target {
@@ -72,48 +77,50 @@ impl Deref for Context {
 }
 
 /// 对称网络增加的udp socket数目，有助于增加打洞成功率
-pub const SYMMETRIC_CHANNEL_NUM: usize = 100;
+pub const SYMMETRIC_CHANNEL_NUM: usize = 84;
 const PACKET_LOSS_RATE_DENOMINATOR: u32 = 100_0000;
+
 pub struct ContextInner {
     // 核心udp socket
     pub(crate) main_udp_socket: Vec<UdpSocket>,
+    v4_len: usize,
     // 对称网络增加的udp socket
     sub_udp_socket: RwLock<Vec<UdpSocket>>,
     // tcp数据发送器
-    pub(crate) tcp_map: RwLock<HashMap<SocketAddr, PacketSender>>,
+    pub(crate) packet_map: RwLock<FnvHashMap<RouteKey, PacketSender>>,
     // 路由信息
     pub route_table: RouteTable,
-    // 是否使用tcp连接服务器
-    is_tcp: bool,
-    //状态
-    state: AtomicBool,
+    // 使用什么协议连接服务器
+    protocol: ConnectProtocol,
     //控制丢包率，取值v=[0,100_0000] 丢包率r=v/100_0000
     packet_loss_rate: u32,
     //控制延迟
     packet_delay: u32,
-    main_index: AtomicUsize,
-    use_ipv6: bool,
+    pub(crate) up_traffic_meter: Option<TrafficMeterMultiAddress>,
+    pub(crate) down_traffic_meter: Option<TrafficMeterMultiAddress>,
+    default_interface: LocalInterface,
+    default_route_key: AtomicCell<Option<RouteKey>>,
 }
 
 impl ContextInner {
     pub fn use_channel_type(&self) -> UseChannelType {
         self.route_table.use_channel_type
     }
-    pub fn is_stop(&self) -> bool {
-        !self.state.load(Ordering::Acquire)
+    pub fn default_interface(&self) -> &LocalInterface {
+        &self.default_interface
     }
-    pub fn stop(&self) {
-        self.state.store(false, Ordering::Release);
+    pub fn set_default_route_key(&self, route_key: RouteKey) {
+        self.default_route_key.store(Some(route_key));
     }
     /// 通过sub_udp_socket是否为空来判断是否为锥形网络
     pub fn is_cone(&self) -> bool {
         self.sub_udp_socket.read().is_empty()
     }
-    pub fn is_main_tcp(&self) -> bool {
-        self.is_tcp
+    pub fn main_protocol(&self) -> ConnectProtocol {
+        self.protocol
     }
     pub fn is_udp_main(&self, route_key: &RouteKey) -> bool {
-        !route_key.is_tcp() && route_key.index < self.main_udp_socket.len()
+        route_key.protocol().is_udp() && route_key.index < self.main_udp_socket.len()
     }
     pub fn first_latency(&self) -> bool {
         self.route_table.first_latency
@@ -123,7 +130,7 @@ impl ContextInner {
         &self,
         nat_type: NatType,
         udp_socket_sender: &AcceptSocketSender<Option<Vec<mio::net::UdpSocket>>>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         let mut write_guard = self.sub_udp_socket.write();
         match nat_type {
             NatType::Symmetric => {
@@ -132,9 +139,11 @@ impl ContextInner {
                 }
                 let mut vec = Vec::with_capacity(SYMMETRIC_CHANNEL_NUM);
                 for _ in 0..SYMMETRIC_CHANNEL_NUM {
-                    let udp = UdpSocket::bind("0.0.0.0:0")?;
-                    //副通道使用异步io
-                    udp.set_nonblocking(true)?;
+                    let udp = crate::channel::socket::bind_udp(
+                        "0.0.0.0:0".parse().unwrap(),
+                        &self.default_interface,
+                    )?;
+                    let udp: UdpSocket = udp.into();
                     vec.push(udp);
                 }
                 let mut mio_vec = Vec::with_capacity(SYMMETRIC_CHANNEL_NUM);
@@ -155,53 +164,68 @@ impl ContextInner {
         }
         Ok(())
     }
-
+    #[inline]
     pub fn channel_num(&self) -> usize {
+        self.v4_len
+    }
+    #[inline]
+    pub fn main_len(&self) -> usize {
         self.main_udp_socket.len()
     }
     /// 获取核心udp监听的端口，用于其他客户端连接
     pub fn main_local_udp_port(&self) -> io::Result<Vec<u16>> {
         let mut ports = Vec::new();
-        for udp in self.main_udp_socket.iter() {
+        for udp in self.main_udp_socket[..self.v4_len].iter() {
             ports.push(udp.local_addr()?.port())
         }
         Ok(ports)
     }
-    pub fn send_tcp(&self, buf: &[u8], addr: SocketAddr) -> io::Result<()> {
-        if let Some(tcp) = self.tcp_map.read().get(&addr) {
+    pub fn send_tcp(&self, buf: &[u8], route_key: &RouteKey) -> io::Result<()> {
+        if let Some(tcp) = self.packet_map.read().get(route_key) {
             tcp.try_send(buf)
         } else {
-            Err(io::Error::from(io::ErrorKind::NotFound))
+            Err(io::Error::new(
+                io::ErrorKind::NotFound,
+                format!("dest={:?}", route_key),
+            ))
         }
     }
-    pub fn send_main_udp(&self, index: usize, buf: &[u8], mut addr: SocketAddr) -> io::Result<()> {
-        if self.use_ipv6 {
-            //如果是v4地址则需要转换成v6
-            if let SocketAddr::V4(ipv4) = addr {
-                addr = SocketAddr::V6(SocketAddrV6::new(
-                    ipv4.ip().to_ipv6_mapped(),
-                    ipv4.port(),
-                    0,
-                    0,
+    pub fn send_main_udp(&self, index: usize, buf: &[u8], addr: SocketAddr) -> io::Result<()> {
+        if let Some(udp) = self.main_udp_socket.get(index) {
+            udp.send_to(buf, addr)?;
+            Ok(())
+        } else {
+            Err(io::Error::new(io::ErrorKind::Other, "overflow"))
+        }
+    }
+    /// 将数据发送到默认通道，一般发往服务器才用此方法
+    pub fn send_default<B: AsRef<[u8]>>(
+        &self,
+        buf: &NetPacket<B>,
+        addr: SocketAddr,
+    ) -> io::Result<()> {
+        if self.protocol.is_udp() {
+            if addr.is_ipv4() {
+                self.send_main_udp(0, buf.buffer(), addr)?
+            } else {
+                self.send_main_udp(self.v4_len, buf.buffer(), addr)?
+            }
+        } else {
+            if let Some(key) = self.default_route_key.load() {
+                self.send_tcp(buf.buffer(), &key)?
+            } else {
+                return Err(io::Error::new(
+                    io::ErrorKind::NotFound,
+                    format!("dest={:?}", addr),
                 ));
             }
         }
-        self.main_udp_socket[index].send_to(buf, addr)?;
+        if let Some(up_traffic_meter) = &self.up_traffic_meter {
+            up_traffic_meter.add_traffic(buf.destination(), buf.data_len());
+        }
         Ok(())
     }
-    /// 将数据发送到默认通道，一般发往服务器才用此方法
-    pub fn send_default(&self, buf: &[u8], addr: SocketAddr) -> io::Result<()> {
-        if self.is_tcp {
-            //服务端地址只在重连时检测变化
-            self.send_tcp(buf, addr)
-        } else {
-            self.send_main_udp(self.main_index.load(Ordering::Relaxed), buf, addr)
-        }
-    }
-    pub fn change_main_index(&self) {
-        let index = (self.main_index.load(Ordering::Relaxed) + 1) % self.main_udp_socket.len();
-        self.main_index.store(index, Ordering::Relaxed);
-    }
+
     /// 此方法仅用于对称网络打洞
     pub fn try_send_all(&self, buf: &[u8], addr: SocketAddr) {
         self.try_send_all_main(buf, addr);
@@ -209,7 +233,7 @@ impl ContextInner {
             if let Err(e) = udp.send_to(buf, addr) {
                 log::warn!("{:?},add={:?}", e, addr);
             }
-            thread::sleep(Duration::from_millis(1));
+            thread::sleep(Duration::from_millis(3));
         }
     }
     pub fn try_send_all_main(&self, buf: &[u8], addr: SocketAddr) {
@@ -220,9 +244,9 @@ impl ContextInner {
         }
     }
     /// 发送网络数据
-    pub fn send_ipv4_by_id(
+    pub fn send_ipv4_by_id<B: AsRef<[u8]>>(
         &self,
-        buf: &[u8],
+        buf: &NetPacket<B>,
         id: &Ipv4Addr,
         server_addr: SocketAddr,
         send_default: bool,
@@ -232,6 +256,7 @@ impl ContextInner {
                 return Ok(());
             }
         }
+
         if self.packet_delay > 0 {
             thread::sleep(Duration::from_millis(self.packet_delay as _));
         }
@@ -248,7 +273,7 @@ impl ContextInner {
         Ok(())
     }
     /// 将数据发到指定id
-    pub fn send_by_id(&self, buf: &[u8], id: &Ipv4Addr) -> io::Result<()> {
+    pub fn send_by_id<B: AsRef<[u8]>>(&self, buf: &NetPacket<B>, id: &Ipv4Addr) -> io::Result<()> {
         let mut c = 0;
         loop {
             let route = self.route_table.get_route_by_id(c, id)?;
@@ -268,42 +293,44 @@ impl ContextInner {
         }
     }
     /// 将数据发到指定路由
-    pub fn send_by_key(&self, buf: &[u8], route_key: RouteKey) -> io::Result<()> {
-        if route_key.is_tcp {
-            self.send_tcp(buf, route_key.addr)
-        } else {
-            if let Some(main_udp) = self.main_udp_socket.get(route_key.index) {
-                main_udp.send_to(buf, route_key.addr)?;
-            } else {
-                if let Some(udp) = self
-                    .sub_udp_socket
-                    .read()
-                    .get(route_key.index - self.main_udp_socket.len())
-                {
-                    udp.send_to(buf, route_key.addr)?;
+    pub fn send_by_key<B: AsRef<[u8]>>(
+        &self,
+        buf: &NetPacket<B>,
+        route_key: RouteKey,
+    ) -> io::Result<()> {
+        match route_key.protocol() {
+            ConnectProtocol::UDP => {
+                if let Some(main_udp) = self.main_udp_socket.get(route_key.index) {
+                    main_udp.send_to(buf.buffer(), route_key.addr)?;
                 } else {
-                    Err(io::Error::from(io::ErrorKind::NotFound))?
-                }
-            }
-            Ok(())
-        }
-    }
-    pub fn remove_route(&self, ip: &Ipv4Addr, route_key: RouteKey) {
-        if self.route_table.remove_route(ip, route_key) {
-            if route_key.is_tcp {
-                if let Some(tcp) = self.tcp_map.write().remove(&route_key.addr) {
-                    if let Err(e) = tcp.shutdown() {
-                        log::warn!("{:?}", e);
+                    if let Some(udp) = self
+                        .sub_udp_socket
+                        .read()
+                        .get(route_key.index - self.main_len())
+                    {
+                        udp.send_to(buf.buffer(), route_key.addr)?;
+                    } else {
+                        Err(io::Error::from(io::ErrorKind::NotFound))?
                     }
                 }
             }
+            ConnectProtocol::TCP | ConnectProtocol::WS | ConnectProtocol::WSS => {
+                self.send_tcp(buf.buffer(), &route_key)?
+            }
         }
+        if let Some(up_traffic_meter) = &self.up_traffic_meter {
+            up_traffic_meter.add_traffic(buf.destination(), buf.data_len());
+        }
+        Ok(())
+    }
+    pub fn remove_route(&self, ip: &Ipv4Addr, route_key: RouteKey) {
+        self.route_table.remove_route(ip, route_key)
     }
 }
 
 pub struct RouteTable {
     pub(crate) route_table:
-        RwLock<HashMap<Ipv4Addr, (AtomicUsize, Vec<(Route, AtomicCell<Instant>)>)>>,
+        RwLock<FnvHashMap<Ipv4Addr, (AtomicUsize, Vec<(Route, AtomicCell<Instant>)>)>>,
     first_latency: bool,
     channel_num: usize,
     use_channel_type: UseChannelType,
@@ -312,7 +339,7 @@ pub struct RouteTable {
 impl RouteTable {
     fn new(use_channel_type: UseChannelType, first_latency: bool, channel_num: usize) -> Self {
         Self {
-            route_table: RwLock::new(HashMap::with_capacity(64)),
+            route_table: RwLock::new(FnvHashMap::with_capacity_and_hasher(64, Default::default())),
             use_channel_type,
             first_latency,
             channel_num,
@@ -330,29 +357,47 @@ 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);
+                        }
+                    }
                 }
             }
         }
         Err(io::Error::new(io::ErrorKind::NotFound, "route not found"))
     }
-    pub fn add_route_if_absent(&self, id: Ipv4Addr, route: Route) {
+    pub fn add_route_if_absent(&self, id: Ipv4Addr, route: Route) -> bool {
         self.add_route_(id, route, true)
     }
-    pub fn add_route(&self, id: Ipv4Addr, route: Route) {
+    pub fn add_route(&self, id: Ipv4Addr, route: Route) -> bool {
         self.add_route_(id, route, false)
     }
-    fn add_route_(&self, id: Ipv4Addr, route: Route, only_if_absent: bool) {
+    fn add_route_(&self, id: Ipv4Addr, route: Route, only_if_absent: bool) -> bool {
         // 限制通道类型
         match self.use_channel_type {
             UseChannelType::P2p => {
                 if !route.is_p2p() {
-                    return;
+                    return false;
                 }
             }
             _ => {}
         }
         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 true;
+                    }
+                }
+            }
+        }
         let mut route_table = self.route_table.write();
         let (_, list) = route_table
             .entry(id)
@@ -361,11 +406,11 @@ impl RouteTable {
         for (x, time) in list.iter_mut() {
             if x.metric < route.metric && !self.first_latency {
                 //非优先延迟的情况下 不能比当前的路径更长
-                return;
+                return false;
             }
             if x.route_key() == key {
                 if only_if_absent {
-                    return;
+                    return true;
                 }
                 x.metric = route.metric;
                 x.rt = route.rt;
@@ -375,21 +420,7 @@ impl RouteTable {
             }
         }
         if exist {
-            // 这个排序还有待优化，因为后加入的大概率排最后，被直接淘汰的概率也大，可能导致更好的通道被移除了
             list.sort_by_key(|(k, _)| k.rt);
-            //如果延迟都稳定了，则去除多余通道
-            for (route, _) in list.iter() {
-                if route.rt == DEFAULT_RT {
-                    return;
-                }
-            }
-            //延迟优先模式需要更多的通道探测延迟最低的路线
-            let limit_len = if self.first_latency {
-                self.channel_num + 2
-            } else {
-                self.channel_num
-            };
-            self.truncate_(list, limit_len);
         } else {
             if !self.first_latency {
                 if route.is_p2p() {
@@ -397,35 +428,34 @@ impl RouteTable {
                     list.retain(|(k, _)| k.is_p2p());
                 }
             };
-            //增加路由表容量，避免波动
-            let limit_len = self.channel_num * 2;
             list.sort_by_key(|(k, _)| k.rt);
-            self.truncate_(list, limit_len);
             list.push((route, AtomicCell::new(Instant::now())));
         }
+        return true;
     }
-    fn truncate_(&self, list: &mut Vec<(Route, AtomicCell<Instant>)>, len: usize) {
-        if list.len() <= len {
-            return;
-        }
-        if self.first_latency {
-            //找到第一个p2p通道
-            if let Some(index) =
-                list.iter()
-                    .enumerate()
-                    .find_map(|(index, (route, _))| if route.is_p2p() { Some(index) } else { None })
-            {
-                if index >= len {
-                    //保留第一个p2p通道
-                    let route = list.remove(index);
-                    list.truncate(len - 1);
-                    list.push(route);
-                    return;
-                }
-            }
-        }
-        list.truncate(len);
-    }
+    // 直接移除会导致通道不稳定，所以废弃这个方法，后面改用多余通道不发心跳包，从而让通道自动过期
+    // fn truncate_(&self, list: &mut Vec<(Route, AtomicCell<Instant>)>, len: usize) {
+    //     if list.len() <= len {
+    //         return;
+    //     }
+    //     if self.first_latency {
+    //         //找到第一个p2p通道
+    //         if let Some(index) =
+    //             list.iter()
+    //                 .enumerate()
+    //                 .find_map(|(index, (route, _))| if route.is_p2p() { Some(index) } else { None })
+    //         {
+    //             if index >= len {
+    //                 //保留第一个p2p通道
+    //                 let route = list.remove(index);
+    //                 list.truncate(len - 1);
+    //                 list.push(route);
+    //                 return;
+    //             }
+    //         }
+    //     }
+    //     list.truncate(len);
+    // }
     pub fn route(&self, id: &Ipv4Addr) -> Option<Vec<Route>> {
         if let Some((_, v)) = self.route_table.read().get(id) {
             Some(v.iter().map(|(i, _)| *i).collect())
@@ -461,14 +491,19 @@ impl RouteTable {
         }
         None
     }
-    pub fn need_punch(&self, id: &Ipv4Addr) -> bool {
+    pub fn no_need_punch(&self, id: &Ipv4Addr) -> bool {
         if let Some((_, v)) = self.route_table.read().get(id) {
-            //存在p2p的通道则不再打洞
-            if v.iter().filter(|(k, _)| k.is_p2p()).count() >= 1 {
-                return false;
-            }
+            //p2p的通道数符合要求
+            return v.iter().filter(|(k, _)| k.is_p2p()).count() >= self.channel_num;
+        }
+        false
+    }
+    pub fn p2p_num(&self, id: &Ipv4Addr) -> usize {
+        if let Some((_, v)) = self.route_table.read().get(id) {
+            v.iter().filter(|(k, _)| k.is_p2p()).count()
+        } else {
+            0
         }
-        true
     }
     /// 返回所有路由
     pub fn route_table(&self) -> Vec<(Ipv4Addr, Vec<Route>)> {
@@ -501,18 +536,13 @@ impl RouteTable {
         }
         list
     }
-    pub fn remove_route(&self, id: &Ipv4Addr, route_key: RouteKey) -> bool {
+    pub fn remove_route(&self, id: &Ipv4Addr, route_key: RouteKey) {
         let mut write_guard = self.route_table.write();
         if let Some((_, routes)) = write_guard.get_mut(id) {
             routes.retain(|(x, _)| x.route_key() != route_key);
             if routes.is_empty() {
                 write_guard.remove(id);
-                true
-            } else {
-                false
             }
-        } else {
-            return true;
         }
     }
     /// 更新路由入栈包的时刻，长时间没有收到数据的路由将会被剔除

vnt/src/channel/handler.rs

@@ -1,6 +1,12 @@
-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);
+pub trait RecvChannelHandler: Clone + Send + Sync + 'static {
+    fn handle(
+        &self,
+        buf: &mut [u8],
+        extend: &mut [u8],
+        route_key: RouteKey,
+        context: &ChannelContext,
+    );
 }

vnt/src/channel/idle.rs

@@ -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 }
     }
 }
@@ -39,7 +39,7 @@ impl Idle {
                 }
             }
         }
-        let sleep_time = self.read_idle - max;
+        let sleep_time = self.read_idle.checked_sub(max).unwrap_or_default();
         return IdleType::Sleep(sleep_time);
     }
 }

vnt/src/channel/mod.rs

@@ -1,13 +1,18 @@
-use std::io;
+use anyhow::Context;
 use std::net::{SocketAddr, UdpSocket};
 use std::str::FromStr;
+use tokio::sync::mpsc::channel;
 
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::handler::RecvChannelHandler;
-use crate::channel::sender::AcceptSocketSender;
+use crate::channel::sender::{AcceptSocketSender, ConnectUtil};
+use crate::channel::socket::{bind_udp, LocalInterface};
 use crate::channel::tcp_channel::tcp_listen;
 use crate::channel::udp_channel::udp_listen;
-use crate::util::{io_convert, StopManager};
+#[cfg(feature = "ws")]
+use crate::channel::ws_channel::ws_connect_accept;
+use crate::util::limit::TrafficMeterMultiAddress;
+use crate::util::StopManager;
 
 pub mod context;
 pub mod handler;
@@ -15,16 +20,24 @@ pub mod idle;
 pub mod notify;
 pub mod punch;
 pub mod sender;
+pub mod socket;
 pub mod tcp_channel;
 pub mod udp_channel;
+#[cfg(feature = "ws")]
+pub mod ws_channel;
+
+pub const BUFFER_SIZE: usize = 1024 * 64;
+// 这里留个坑，tcp是支持_TCP_MAX_PACKET_SIZE长度的，
+// 但是缓存只用BUFFER_SIZE，会导致多余的数据接收不了
+const TCP_MAX_PACKET_SIZE: usize = (1 << 24) - 1;
 
-const BUFFER_SIZE: usize = 1024 * 16;
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum UseChannelType {
     Relay,
     P2p,
     All,
 }
+
 impl UseChannelType {
     pub fn is_only_relay(&self) -> bool {
         self == &UseChannelType::Relay
@@ -36,6 +49,7 @@ impl UseChannelType {
         self == &UseChannelType::All
     }
 }
+
 impl FromStr for UseChannelType {
     type Err = String;
 
@@ -48,21 +62,49 @@ impl FromStr for UseChannelType {
         }
     }
 }
+
 impl Default for UseChannelType {
     fn default() -> Self {
         UseChannelType::All
     }
 }
-#[derive(Copy, Clone, Eq, PartialEq)]
-pub enum Status {
-    Cone,
-    Symmetric,
-    Close,
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
+pub enum ConnectProtocol {
+    UDP,
+    TCP,
+    WS,
+    WSS,
+}
+
+impl ConnectProtocol {
+    #[inline]
+    pub fn is_tcp(&self) -> bool {
+        self == &ConnectProtocol::TCP
+    }
+    #[inline]
+    pub fn is_udp(&self) -> bool {
+        self == &ConnectProtocol::UDP
+    }
+    #[inline]
+    pub fn is_ws(&self) -> bool {
+        self == &ConnectProtocol::WS
+    }
+    #[inline]
+    pub fn is_wss(&self) -> bool {
+        self == &ConnectProtocol::WSS
+    }
+    pub fn is_transport(&self) -> bool {
+        self.is_tcp() || self.is_udp()
+    }
+    pub fn is_base_tcp(&self) -> bool {
+        self.is_tcp() || self.is_ws() || self.is_wss()
+    }
 }
 
 #[derive(Copy, Clone, Debug)]
 pub struct Route {
-    pub is_tcp: bool,
+    pub protocol: ConnectProtocol,
     index: usize,
     pub addr: SocketAddr,
     pub metric: u8,
@@ -74,11 +116,19 @@ 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 {
+    pub fn new(
+        protocol: ConnectProtocol,
+        index: usize,
+        addr: SocketAddr,
+        metric: u8,
+        rt: i64,
+    ) -> Self {
         Self {
-            is_tcp,
+            protocol,
             index,
             addr,
             metric,
@@ -87,7 +137,7 @@ impl Route {
     }
     pub fn from(route_key: RouteKey, metric: u8, rt: i64) -> Self {
         Self {
-            is_tcp: route_key.is_tcp,
+            protocol: route_key.protocol,
             index: route_key.index,
             addr: route_key.addr,
             metric,
@@ -96,7 +146,7 @@ impl Route {
     }
     pub fn from_default_rt(route_key: RouteKey, metric: u8) -> Self {
         Self {
-            is_tcp: route_key.is_tcp,
+            protocol: route_key.protocol,
             index: route_key.index,
             addr: route_key.addr,
             metric,
@@ -105,7 +155,7 @@ impl Route {
     }
     pub fn route_key(&self) -> RouteKey {
         RouteKey {
-            is_tcp: self.is_tcp,
+            protocol: self.protocol,
             index: self.index,
             addr: self.addr,
         }
@@ -123,37 +173,43 @@ impl Route {
 
 #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug)]
 pub struct RouteKey {
-    is_tcp: bool,
+    protocol: ConnectProtocol,
     index: usize,
     pub addr: SocketAddr,
 }
 
 impl RouteKey {
-    pub(crate) fn new(is_tcp: bool, index: usize, addr: SocketAddr) -> Self {
+    pub(crate) const fn new(protocol: ConnectProtocol, index: usize, addr: SocketAddr) -> Self {
         Self {
-            is_tcp,
+            protocol,
             index,
             addr,
         }
     }
-    pub fn is_tcp(&self) -> bool {
-        self.is_tcp
+    #[inline]
+    pub fn protocol(&self) -> ConnectProtocol {
+        self.protocol
     }
+    #[inline]
     pub fn index(&self) -> usize {
         self.index
     }
 }
 
-pub fn init_context(
+pub(crate) fn init_context(
     ports: Vec<u16>,
     use_channel_type: UseChannelType,
     first_latency: bool,
-    is_tcp: bool,
+    protocol: ConnectProtocol,
     packet_loss_rate: Option<f64>,
     packet_delay: u32,
-) -> io::Result<(Context, mio::net::TcpListener)> {
+    default_interface: LocalInterface,
+    up_traffic_meter: Option<TrafficMeterMultiAddress>,
+    down_traffic_meter: Option<TrafficMeterMultiAddress>,
+) -> anyhow::Result<(ChannelContext, std::net::TcpListener)> {
     assert!(!ports.is_empty(), "not channel");
-    let mut udps = Vec::with_capacity(ports.len());
+    let mut main_udp_socket_v4 = Vec::with_capacity(ports.len());
+    let mut main_udp_socket_v6 = Vec::with_capacity(ports.len());
     //检查系统是否支持ipv6
     let use_ipv6 = match socket2::Socket::new(socket2::Domain::IPV6, socket2::Type::DGRAM, None) {
         Ok(_) => true,
@@ -163,46 +219,33 @@ pub fn init_context(
         }
     };
     for port in &ports {
-        //监听v6+v4双栈
-        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, address)
+        let addr_v4: SocketAddr = format!("0.0.0.0:{}", port).parse().unwrap();
+        if use_ipv6 {
+            let (main_channel_v4, main_channel_v6) = bind_udp_v4_and_v6(*port, &default_interface)?;
+            main_udp_socket_v4.push(main_channel_v4);
+            main_udp_socket_v6.push(main_channel_v6);
         } else {
-            let address: SocketAddr = format!("0.0.0.0:{}", port).parse().unwrap();
-            (
-                socket2::Socket::new(socket2::Domain::IPV4, socket2::Type::DGRAM, None)?,
-                address,
-            )
-        };
-
-        io_convert(socket.set_reuse_address(true), |_| {
-            format!("set_reuse_address failed: {}", &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)
-        })?;
-        let main_channel: UdpSocket = socket.into();
-        main_channel.set_nonblocking(true)?;
-        udps.push(main_channel);
+            let socket = bind_udp(addr_v4, &default_interface)?;
+            let main_channel_v4: UdpSocket = socket.into();
+            main_udp_socket_v4.push(main_channel_v4);
+        }
     }
-    let context = Context::new(
-        udps,
+    let mut main_udp_socket =
+        Vec::with_capacity(main_udp_socket_v4.len() + main_udp_socket_v6.len());
+    let v4_len = main_udp_socket_v4.len();
+    main_udp_socket.append(&mut main_udp_socket_v4);
+    main_udp_socket.append(&mut main_udp_socket_v6);
+    let context = ChannelContext::new(
+        main_udp_socket,
+        v4_len,
         use_channel_type,
         first_latency,
-        is_tcp,
+        protocol,
         packet_loss_rate,
         packet_delay,
-        use_ipv6,
+        up_traffic_meter,
+        down_traffic_meter,
+        default_interface,
     );
 
     let port = context.main_local_udp_port()?[0];
@@ -210,19 +253,22 @@ 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();
         let socket = socket2::Socket::new(socket2::Domain::IPV4, socket2::Type::STREAM, None)?;
         (socket, address)
     };
-
-    io_convert(socket.set_reuse_address(true), |_| {
-        format!("set_reuse_address failed: {}", &address)
-    })?;
+    socket
+        .set_reuse_address(true)
+        .context("set_reuse_address")?;
+    #[cfg(unix)]
+    if let Err(e) = socket.set_reuse_port(true) {
+        log::warn!("set_reuse_port {:?}", e)
+    }
     if let Err(e) = socket.bind(&address.into()) {
         if ports[0] == 0 {
             //端口可能冲突，则使用任意端口
@@ -232,43 +278,88 @@ 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)?;
     socket.set_nonblocking(true)?;
-    socket.set_nodelay(false)?;
-    let tcp_listener = mio::net::TcpListener::from_std(socket.into());
-    Ok((context, tcp_listener))
+    socket.set_nodelay(true)?;
+    Ok((context, socket.into()))
+}
+fn bind_udp_v4_and_v6(
+    port: u16,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<(UdpSocket, UdpSocket)> {
+    let mut count = 0;
+    loop {
+        let addr_v4: SocketAddr = format!("0.0.0.0:{}", port).parse().unwrap();
+        let socket = bind_udp(addr_v4, default_interface)?;
+        if let Err(e) = socket.set_recv_buffer_size(2 * 1024 * 1024) {
+            log::warn!("set_recv_buffer_size {:?}", e);
+        }
+        let main_channel_v4: UdpSocket = socket.into();
+        let addr = main_channel_v4.local_addr()?;
+        let addr_v6: SocketAddr = format!("[::]:{}", addr.port()).parse().unwrap();
+        let socket = if port == 0 {
+            match bind_udp(addr_v6, default_interface) {
+                Ok(socket) => socket,
+                Err(e) => {
+                    if count > 10 {
+                        return Err(e);
+                    }
+                    if let Some(e) = e.downcast_ref::<std::io::Error>() {
+                        if e.kind() == std::io::ErrorKind::AddrInUse {
+                            count += 1;
+                            continue;
+                        }
+                    }
+                    Err(e)?
+                }
+            }
+        } else {
+            bind_udp(addr_v6, default_interface)?
+        };
+        if let Err(e) = socket.set_recv_buffer_size(2 * 1024 * 1024) {
+            log::warn!("set_recv_buffer_size {:?}", e);
+        }
+        let main_channel_v6: UdpSocket = socket.into();
+        return Ok((main_channel_v4, main_channel_v6));
+    }
 }
 
-pub fn init_channel<H>(
-    tcp_listener: mio::net::TcpListener,
-    context: Context,
+pub(crate) fn init_channel<H>(
+    tcp_listener: std::net::TcpListener,
+    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>>)>,
+    ConnectUtil,
 )>
 where
     H: RecvChannelHandler,
 {
+    let (tcp_connect_s, tcp_connect_r) = channel(16);
+    let (ws_connect_s, _ws_connect_r) = channel(16);
+    let connect_util = ConnectUtil::new(tcp_connect_s, ws_connect_s);
     // udp监听，udp_socket_sender 用于NAT类型切换
     let udp_socket_sender =
         udp_listen(stop_manager.clone(), recv_handler.clone(), context.clone())?;
     // 建立tcp监听，tcp_socket_sender 用于tcp 直连
-    let tcp_socket_sender = tcp_listen(
+    tcp_listen(
         tcp_listener,
-        stop_manager.clone(),
+        tcp_connect_r,
         recv_handler.clone(),
         context.clone(),
+        stop_manager.clone(),
     )?;
+    #[cfg(feature = "ws")]
+    ws_connect_accept(_ws_connect_r, recv_handler, context.clone(), stop_manager)?;
 
-    Ok((udp_socket_sender, tcp_socket_sender))
+    Ok((udp_socket_sender, connect_util))
 }

vnt/src/channel/punch.rs

@@ -1,21 +1,51 @@
 use std::collections::HashMap;
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+use std::ops::{Div, Mul};
 use std::str::FromStr;
+use std::sync::Arc;
 use std::time::Duration;
 use std::{io, thread};
 
-use mio::net::TcpStream;
+use crossbeam_utils::atomic::AtomicCell;
 use rand::prelude::SliceRandom;
 use rand::Rng;
 
-use crate::channel::context::Context;
-use crate::channel::sender::AcceptSocketSender;
+use crate::channel::context::ChannelContext;
+use crate::channel::sender::ConnectUtil;
+use crate::handle::CurrentDeviceInfo;
+use crate::nat::{is_ipv4_global, NatTest};
+use crate::proto::message::{PunchNatModel, PunchNatType};
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum PunchModel {
+    All,
     IPv4,
     IPv6,
-    All,
+    IPv4Tcp,
+    IPv4Udp,
+    IPv6Tcp,
+    IPv6Udp,
+}
+
+impl PunchModel {
+    pub fn use_tcp(&self) -> bool {
+        self != &PunchModel::IPv4Udp && self != &PunchModel::IPv6Udp
+    }
+    pub fn use_udp(&self) -> bool {
+        self != &PunchModel::IPv4Tcp && self != &PunchModel::IPv6Tcp
+    }
+    pub fn use_ipv6(&self) -> bool {
+        self == &PunchModel::All
+            || self == &PunchModel::IPv6
+            || self == &PunchModel::IPv6Tcp
+            || self == &PunchModel::IPv6Udp
+    }
+    pub fn use_ipv4(&self) -> bool {
+        self == &PunchModel::All
+            || self == &PunchModel::IPv4
+            || self == &PunchModel::IPv4Tcp
+            || self == &PunchModel::IPv4Udp
+    }
 }
 
 impl FromStr for PunchModel {
@@ -25,8 +55,15 @@ impl FromStr for PunchModel {
         match s.to_lowercase().trim() {
             "ipv4" => Ok(PunchModel::IPv4),
             "ipv6" => Ok(PunchModel::IPv6),
+            "ipv4-tcp" => Ok(PunchModel::IPv4Tcp),
+            "ipv4-udp" => Ok(PunchModel::IPv4Udp),
+            "ipv6-tcp" => Ok(PunchModel::IPv6Tcp),
+            "ipv6-udp" => Ok(PunchModel::IPv6Udp),
             "all" => Ok(PunchModel::All),
-            _ => Err(format!("not match '{}', enum: ipv4/ipv6/all", s)),
+            _ => Err(format!(
+                "not match '{}', enum: ipv4/ipv4-tcp/ipv4-udp/ipv6/ipv6-tcp/ipv6-udp/all",
+                s
+            )),
         }
     }
 }
@@ -36,6 +73,33 @@ impl Default for PunchModel {
         PunchModel::All
     }
 }
+impl From<PunchModel> for PunchNatModel {
+    fn from(value: PunchModel) -> Self {
+        match value {
+            PunchModel::All => PunchNatModel::All,
+            PunchModel::IPv4 => PunchNatModel::IPv4,
+            PunchModel::IPv6 => PunchNatModel::IPv6,
+            PunchModel::IPv4Tcp => PunchNatModel::IPv4Tcp,
+            PunchModel::IPv4Udp => PunchNatModel::IPv4Udp,
+            PunchModel::IPv6Tcp => PunchNatModel::IPv6Tcp,
+            PunchModel::IPv6Udp => PunchNatModel::IPv6Udp,
+        }
+    }
+}
+
+impl Into<PunchModel> for PunchNatModel {
+    fn into(self) -> PunchModel {
+        match self {
+            PunchNatModel::All => PunchModel::All,
+            PunchNatModel::IPv4 => PunchModel::IPv4,
+            PunchNatModel::IPv6 => PunchModel::IPv6,
+            PunchNatModel::IPv4Tcp => PunchModel::IPv4Tcp,
+            PunchNatModel::IPv4Udp => PunchModel::IPv4Udp,
+            PunchNatModel::IPv6Tcp => PunchModel::IPv6Tcp,
+            PunchNatModel::IPv6Udp => PunchModel::IPv6Udp,
+        }
+    }
+}
 
 #[derive(Clone, Debug)]
 pub struct NatInfo {
@@ -45,8 +109,10 @@ pub struct NatInfo {
     pub nat_type: NatType,
     pub(crate) local_ipv4: Option<Ipv4Addr>,
     pub(crate) ipv6: Option<Ipv6Addr>,
-    pub(crate) udp_ports: Vec<u16>,
+    pub udp_ports: Vec<u16>,
     pub tcp_port: u16,
+    pub public_tcp_port: u16,
+    pub punch_model: PunchModel,
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
@@ -55,6 +121,29 @@ pub enum NatType {
     Cone,
 }
 
+impl NatType {
+    pub fn is_cone(&self) -> bool {
+        self == &NatType::Cone
+    }
+}
+impl From<NatType> for PunchNatType {
+    fn from(value: NatType) -> Self {
+        match value {
+            NatType::Symmetric => PunchNatType::Symmetric,
+            NatType::Cone => PunchNatType::Cone,
+        }
+    }
+}
+
+impl Into<NatType> for PunchNatType {
+    fn into(self) -> NatType {
+        match self {
+            PunchNatType::Symmetric => NatType::Symmetric,
+            PunchNatType::Cone => NatType::Cone,
+        }
+    }
+}
+
 impl NatInfo {
     pub fn new(
         mut public_ips: Vec<Ipv4Addr>,
@@ -64,7 +153,9 @@ impl NatInfo {
         mut ipv6: Option<Ipv6Addr>,
         udp_ports: Vec<u16>,
         tcp_port: u16,
+        public_tcp_port: u16,
         mut nat_type: NatType,
+        punch_model: PunchModel,
     ) -> Self {
         public_ips.retain(|ip| {
             !ip.is_multicast()
@@ -94,25 +185,33 @@ impl NatInfo {
             ipv6,
             udp_ports,
             tcp_port,
+            public_tcp_port,
             nat_type,
+            punch_model,
         }
     }
-    pub fn update_addr(&mut self, index: usize, ip: Ipv4Addr, port: u16) {
+    pub fn update_addr(&mut self, index: usize, ip: Ipv4Addr, port: u16) -> bool {
+        let mut updated = false;
         if port != 0 {
             if let Some(public_port) = self.public_ports.get_mut(index) {
+                if *public_port != port {
+                    updated = true;
+                    log::info!("端口变化={}:{} index={}", ip, port, index)
+                }
                 *public_port = port;
             }
         }
-        if !ip.is_multicast()
-            && !ip.is_broadcast()
-            && !ip.is_unspecified()
-            && !ip.is_loopback()
-            && !ip.is_private()
-        {
+        if is_ipv4_global(&ip) {
             if !self.public_ips.contains(&ip) {
                 self.public_ips.push(ip);
+                updated = true;
+                log::info!("ip变化={},{:?}", ip, self.public_ips)
             }
         }
+        updated
+    }
+    pub fn update_tcp_port(&mut self, port: u16) {
+        self.public_tcp_port = port;
     }
     pub fn local_ipv4(&self) -> Option<Ipv4Addr> {
         self.local_ipv4
@@ -175,20 +274,22 @@ 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>>)>,
+    connect_util: ConnectUtil,
+    nat_test: NatTest,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
 }
 
 impl Punch {
     pub fn new(
-        context: Context,
+        context: ChannelContext,
         punch_model: PunchModel,
-        is_tcp: bool,
-        tcp_socket_sender: AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
+        connect_util: ConnectUtil,
+        nat_test: NatTest,
+        current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
     ) -> Self {
         let mut port_vec: Vec<u16> = (1..65535).collect();
         port_vec.push(65535);
@@ -199,75 +300,112 @@ impl Punch {
             port_vec,
             port_index: HashMap::new(),
             punch_model,
-            is_tcp,
-            tcp_socket_sender,
+            connect_util,
+            nat_test,
+            current_device,
         }
     }
 }
 
 impl Punch {
-    fn connect_tcp(&self, buf: &[u8], addr: SocketAddr) -> bool {
-        // mio是非阻塞的，不能立马判断是否能连接成功，所以用标准库的tcp
-        match std::net::TcpStream::connect_timeout(&addr, Duration::from_secs(3)) {
-            Ok(tcp_stream) => {
-                if tcp_stream.set_nonblocking(true).is_err() {
-                    return false;
-                }
-                return self
-                    .tcp_socket_sender
-                    .try_add_socket((TcpStream::from_std(tcp_stream), addr, Some(buf.to_vec())))
-                    .is_ok();
-            }
-            Err(e) => {
-                log::warn!("连接到tcp失败,addr={},err={}", addr, e);
-            }
+    fn connect_tcp(&self, buf: &[u8], addr: SocketAddr) {
+        if self.nat_test.is_local_address(true, addr) {
+            return;
         }
-        false
+        if addr.ip().is_unspecified() || addr.port() == 0 {
+            return;
+        }
+        self.connect_util.try_connect_tcp_punch(buf.to_vec(), addr);
     }
-    pub fn punch(&mut self, buf: &[u8], id: Ipv4Addr, nat_info: NatInfo) -> io::Result<()> {
-        if !self.context.route_table.need_punch(&id) {
+    pub fn punch(
+        &mut self,
+        buf: &[u8],
+        id: Ipv4Addr,
+        mut nat_info: NatInfo,
+        punch_tcp: bool,
+        count: usize,
+    ) -> io::Result<()> {
+        if self.context.route_table.no_need_punch(&id) {
             log::info!("已打洞成功,无需打洞:{:?}", id);
             return Ok(());
         }
-        if self.is_tcp && nat_info.tcp_port != 0 {
-            //向tcp发起连接
-            if let Some(ipv6_addr) = nat_info.local_tcp_ipv6addr() {
-                if self.connect_tcp(buf, ipv6_addr) {
-                    return Ok(());
-                }
-            }
-            //向tcp发起连接
-            if let Some(ipv4_addr) = nat_info.local_tcp_ipv4addr() {
-                if self.connect_tcp(buf, ipv4_addr) {
-                    return Ok(());
-                }
-            }
-            if nat_info.nat_type == NatType::Cone && nat_info.public_ips.len() == 1 {
-                let addr =
-                    SocketAddr::V4(SocketAddrV4::new(nat_info.public_ips[0], nat_info.tcp_port));
-                if self.connect_tcp(buf, addr) {
-                    return Ok(());
-                }
-            }
-        }
-        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);
-            }
-        }
+        let device_info = self.current_device.load();
 
-        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(());
+        nat_info
+            .public_ips
+            .retain(|ip| is_ipv4_global(ip) && device_info.not_in_network(*ip));
+        nat_info.public_ports.retain(|port| *port != 0);
+        nat_info.udp_ports.retain(|port| *port != 0);
+
+        nat_info.local_ipv4 = nat_info
+            .local_ipv4
+            .filter(|ip| device_info.not_in_network(*ip));
+        if punch_tcp && self.punch_model.use_tcp() && nat_info.punch_model.use_tcp() {
+            //向tcp发起连接
+            if self.punch_model.use_ipv6() && nat_info.punch_model.use_ipv6() {
+                if let Some(ipv6_addr) = nat_info.local_tcp_ipv6addr() {
+                    self.connect_tcp(buf, ipv6_addr)
+                }
+            }
+            if self.punch_model.use_ipv4() && nat_info.punch_model.use_ipv4() {
+                if let Some(ipv4_addr) = nat_info.local_tcp_ipv4addr() {
+                    self.connect_tcp(buf, ipv4_addr)
+                }
+                for ip in &nat_info.public_ips {
+                    let addr = SocketAddr::V4(SocketAddrV4::new(*ip, nat_info.tcp_port));
+                    self.connect_tcp(buf, addr);
+                }
+                if nat_info.nat_type.is_cone() && nat_info.public_tcp_port != 0 {
+                    for ip in &nat_info.public_ips {
+                        let addr = SocketAddr::V4(SocketAddrV4::new(*ip, nat_info.public_tcp_port));
+                        self.connect_tcp(buf, addr);
                     }
                 }
             }
         }
+        if !self.punch_model.use_udp() || !nat_info.punch_model.use_udp() {
+            return Ok(());
+        }
+        let channel_num = self.context.channel_num();
+        let main_len = self.context.main_len();
+
+        if self.punch_model.use_ipv6() && nat_info.punch_model.use_ipv6() {
+            for index in channel_num..main_len {
+                if let Some(ipv6_addr) = nat_info.local_udp_ipv6addr(index) {
+                    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, id);
+                    }
+                }
+            }
+        }
+        if !self.punch_model.use_ipv4() || !nat_info.punch_model.use_ipv4() {
+            return Ok(());
+        }
+        for index in 0..channel_num {
+            if let Some(ipv4_addr) = nat_info.local_udp_ipv4addr(index) {
+                if !self.nat_test.is_local_address(false, ipv4_addr) {
+                    let _ = self.context.send_main_udp(index, buf, ipv4_addr);
+                }
+            }
+        }
+        // 可能是开放了端口的，需要打洞
+        for index in 0..channel_num {
+            for port in &nat_info.udp_ports {
+                if *port == 0 {
+                    continue;
+                }
+                for ip in &nat_info.public_ips {
+                    if ip.is_unspecified() {
+                        continue;
+                    }
+                    let addr = SocketAddrV4::new(*ip, *port);
+                    let _ = self.context.send_main_udp(index, buf, addr.into());
+                    thread::sleep(Duration::from_millis(3));
+                }
+            }
+        }
+
         match nat_info.nat_type {
             NatType::Symmetric => {
                 // 假设对方绑定n个端口，通过NAT对外映射出n个 公网ip:公网端口，自己随机尝试k次的情况下
@@ -278,7 +416,11 @@ impl Punch {
                 //预测范围内最多发送max_k1个包
                 let max_k1 = 60;
                 //全局最多发送max_k2个包
-                let max_k2 = rand::thread_rng().gen_range(600..800);
+                let mut max_k2: usize = rand::thread_rng().gen_range(600..800);
+                if count > 2 {
+                    //递减探测规模
+                    max_k2 = max_k2.mul(2).div(count).max(max_k1 as usize);
+                }
                 let port = nat_info.public_ports.get(0).map(|e| *e).unwrap_or(0);
                 if nat_info.public_port_range < max_k1 * 3 {
                     //端口变化不大时，在预测的范围内随机发送
@@ -294,8 +436,7 @@ impl Punch {
                     } else {
                         (max_port - min_port + 1) as usize
                     };
-                    let mut nums: Vec<u16> = (min_port..max_port).collect();
-                    nums.push(max_port);
+                    let mut nums: Vec<u16> = (min_port..=max_port).collect();
                     nums.shuffle(&mut rand::thread_rng());
                     self.punch_symmetric(&nums[..k], buf, &nat_info.public_ips, max_k1 as usize)?;
                 }
@@ -359,7 +500,7 @@ impl Punch {
                 }
                 let addr = SocketAddr::V4(SocketAddrV4::new(*pub_ip, *port));
                 self.context.send_main_udp(0, buf, addr)?;
-                thread::sleep(Duration::from_millis(2));
+                thread::sleep(Duration::from_millis(3));
             }
         }
         Ok(ports.len())

vnt/src/channel/sender.rs

@@ -1,31 +1,190 @@
+use std::collections::HashMap;
 use std::io;
-use std::ops::Deref;
+use std::net::{Ipv4Addr, SocketAddr};
 use std::sync::mpsc::{SyncSender, TrySendError};
 use std::sync::Arc;
 
-use mio::Token;
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use tokio::sync::mpsc::Sender;
 
-use crate::channel::context::Context;
-use crate::channel::notify::{AcceptNotify, WritableNotify};
+use crate::channel::context::ChannelContext;
+use crate::channel::notify::AcceptNotify;
+use crate::cipher::Cipher;
+use crate::compression::Compressor;
+use crate::external_route::ExternalRoute;
+use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
+use crate::protocol;
+use crate::protocol::{ip_turn_packet, NetPacket};
 
 #[derive(Clone)]
-pub struct ChannelSender {
-    context: Context,
+pub struct IpPacketSender {
+    context: ChannelContext,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    compressor: Compressor,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    ip_route: ExternalRoute,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+    allow_wire_guard: bool,
 }
 
-impl ChannelSender {
-    pub fn new(context: Context) -> Self {
-        Self { context }
+impl IpPacketSender {
+    pub fn new(
+        context: ChannelContext,
+        current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+        compressor: Compressor,
+        client_cipher: Cipher,
+        server_cipher: Cipher,
+        ip_route: ExternalRoute,
+        device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+        allow_wire_guard: bool,
+    ) -> Self {
+        Self {
+            context,
+            current_device,
+            compressor,
+            client_cipher,
+            server_cipher,
+            ip_route,
+            device_map,
+            allow_wire_guard,
+        }
+    }
+    pub fn self_virtual_ip(&self) -> Ipv4Addr {
+        self.current_device.load().virtual_ip
+    }
+    pub fn send_ip(
+        &self,
+        buf: &mut [u8],
+        data_len: usize,
+        auxiliary_buf: &mut [u8],
+        mut dest_ip: Ipv4Addr,
+    ) -> anyhow::Result<()> {
+        let device_info = self.current_device.load();
+        let src_ip = device_info.virtual_ip;
+        if src_ip.is_unspecified() {
+            return Ok(());
+        }
+        if let Some(v) = self.ip_route.route(&dest_ip) {
+            dest_ip = v;
+        }
+        if dest_ip.is_multicast() {
+            //广播
+            dest_ip = Ipv4Addr::BROADCAST;
+        }
+        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 self.allow_wire_guard {
+            if dest_ip.is_broadcast() || dest_ip == device_info.broadcast_ip {
+                let exists_wg = self
+                    .device_map
+                    .lock()
+                    .1
+                    .values()
+                    .any(|v| v.status.is_online() && v.wireguard);
+                if exists_wg {
+                    send_to_wg_broadcast(
+                        &self.context,
+                        &net_packet,
+                        &self.server_cipher,
+                        &device_info,
+                    )?;
+                }
+            } else {
+                let guard = self.device_map.lock();
+                if let Some(peer_info) = guard.1.get(&dest_ip) {
+                    if peer_info.wireguard {
+                        if peer_info.status.is_offline() {
+                            return Ok(());
+                        }
+                        drop(guard);
+                        send_to_wg(
+                            &self.context,
+                            &mut net_packet,
+                            &self.server_cipher,
+                            &device_info,
+                        )?;
+                        return Ok(());
+                    }
+                }
+            }
+        }
+
+        let mut auxiliary = NetPacket::new(auxiliary_buf)?;
+
+        let mut net_packet = if self.compressor.compress(&net_packet, &mut auxiliary)? {
+            auxiliary.set_default_version();
+            auxiliary.set_protocol(protocol::Protocol::IpTurn);
+            auxiliary.set_transport_protocol(ip_turn_packet::Protocol::Ipv4.into());
+            auxiliary.first_set_ttl(6);
+            auxiliary.set_source(src_ip);
+            auxiliary.set_destination(dest_ip);
+            auxiliary
+        } else {
+            net_packet
+        };
+        self.client_cipher.encrypt_ipv4(&mut net_packet)?;
+        if dest_ip.is_broadcast() || dest_ip == device_info.broadcast_ip {
+            //走服务端广播
+            self.context
+                .send_default(&net_packet, device_info.connect_server)?;
+            return Ok(());
+        }
+
+        if device_info.not_in_network(dest_ip) {
+            //不是一个网段的直接忽略
+            return Ok(());
+        }
+        self.context.send_ipv4_by_id(
+            &net_packet,
+            &dest_ip,
+            device_info.connect_server,
+            device_info.status.online(),
+        )?;
+        Ok(())
     }
 }
 
-impl Deref for ChannelSender {
-    type Target = Context;
+pub fn send_to_wg_broadcast(
+    sender: &ChannelContext,
+    net_packet: &NetPacket<&mut [u8]>,
+    server_cipher: &Cipher,
+    current_device: &CurrentDeviceInfo,
+) -> anyhow::Result<()> {
+    let mut copy_packet = NetPacket::new0(net_packet.data_len(), [0; 65536])?;
+    copy_packet.set_default_version();
+    copy_packet.set_protocol(protocol::Protocol::IpTurn);
+    copy_packet.set_transport_protocol(ip_turn_packet::Protocol::WGIpv4.into());
+    copy_packet.first_set_ttl(6);
+    copy_packet.set_source(net_packet.source());
+    copy_packet.set_destination(net_packet.destination());
+    copy_packet.set_gateway_flag(true);
+    copy_packet.set_payload(net_packet.payload())?;
+    server_cipher.encrypt_ipv4(&mut copy_packet)?;
+    sender.send_default(&copy_packet, current_device.connect_server)?;
 
-    fn deref(&self) -> &Self::Target {
-        &self.context
-    }
+    Ok(())
 }
+pub fn send_to_wg(
+    sender: &ChannelContext,
+    net_packet: &mut NetPacket<&mut [u8]>,
+    server_cipher: &Cipher,
+    current_device: &CurrentDeviceInfo,
+) -> anyhow::Result<()> {
+    net_packet.set_transport_protocol(ip_turn_packet::Protocol::WGIpv4.into());
+    net_packet.set_gateway_flag(true);
+    server_cipher.encrypt_ipv4(net_packet)?;
+    sender.send_default(&net_packet, current_device.connect_server)?;
+
+    Ok(())
+}
+
 pub struct AcceptSocketSender<T> {
     sender: SyncSender<T>,
     notify: AcceptNotify,
@@ -39,6 +198,7 @@ impl<T> Clone for AcceptSocketSender<T> {
         }
     }
 }
+
 impl<T> AcceptSocketSender<T> {
     pub fn new(notify: AcceptNotify, sender: SyncSender<T>) -> Self {
         Self { sender, notify }
@@ -53,53 +213,60 @@ impl<T> AcceptSocketSender<T> {
         }
     }
 }
-
 #[derive(Clone)]
 pub struct PacketSender {
-    inner: Arc<PacketSenderInner>,
+    sender: Sender<Vec<u8>>,
 }
 
 impl PacketSender {
-    pub fn new(notify: WritableNotify, buffer: SyncSender<Vec<u8>>, token: Token) -> Self {
-        Self {
-            inner: Arc::new(PacketSenderInner {
-                token,
-                notify,
-                buffer,
-            }),
-        }
+    pub fn new(sender: Sender<Vec<u8>>) -> Self {
+        Self { sender }
     }
-    #[inline]
     pub fn try_send(&self, buf: &[u8]) -> io::Result<()> {
-        self.inner.try_send(buf)
-    }
-    pub fn shutdown(&self) -> io::Result<()> {
-        self.inner.shutdown()
-    }
-}
-
-pub struct PacketSenderInner {
-    token: Token,
-    notify: WritableNotify,
-    buffer: SyncSender<Vec<u8>>,
-}
-
-impl PacketSenderInner {
-    #[inline]
-    fn try_send(&self, buf: &[u8]) -> io::Result<()> {
-        let len = buf.len();
-        let mut buf_vec = Vec::with_capacity(buf.len() + 4);
-        buf_vec.extend_from_slice(&[0, 0, (len >> 8) as u8, (len & 0xFF) as u8]);
-        buf_vec.extend_from_slice(buf);
-        match self.buffer.try_send(buf_vec) {
-            Ok(_) => self.notify.notify(self.token, true),
-            Err(e) => match e {
-                TrySendError::Disconnected(_) => Err(io::Error::from(io::ErrorKind::WriteZero)),
-                TrySendError::Full(_) => Err(io::Error::from(io::ErrorKind::WouldBlock)),
-            },
+        match self.sender.try_send(buf.to_vec()) {
+            Ok(_) => Ok(()),
+            Err(tokio::sync::mpsc::error::TrySendError::Full(_)) => Err(io::Error::new(
+                io::ErrorKind::WouldBlock,
+                "通道已满，发生丢包",
+            )),
+            Err(_) => Err(io::Error::new(
+                io::ErrorKind::ConnectionRefused,
+                "通道关闭，发生丢包",
+            )),
         }
     }
-    fn shutdown(&self) -> io::Result<()> {
-        self.notify.notify(self.token, false)
+}
+
+#[derive(Clone)]
+pub struct ConnectUtil {
+    connect_tcp: Sender<(Vec<u8>, Option<u16>, SocketAddr)>,
+    connect_ws: Sender<(Vec<u8>, String)>,
+}
+
+impl ConnectUtil {
+    pub fn new(
+        connect_tcp: Sender<(Vec<u8>, Option<u16>, SocketAddr)>,
+        connect_ws: Sender<(Vec<u8>, String)>,
+    ) -> Self {
+        Self {
+            connect_tcp,
+            connect_ws,
+        }
+    }
+    pub fn try_connect_tcp(&self, buf: Vec<u8>, addr: SocketAddr) {
+        if self.connect_tcp.try_send((buf, None, addr)).is_err() {
+            log::warn!("try_connect_tcp failed {}", addr);
+        }
+    }
+    pub fn try_connect_tcp_punch(&self, buf: Vec<u8>, addr: SocketAddr) {
+        // 打洞的连接可以绑定随机端口
+        if self.connect_tcp.try_send((buf, Some(0), addr)).is_err() {
+            log::warn!("try_connect_tcp failed {}", addr);
+        }
+    }
+    pub fn try_connect_ws(&self, buf: Vec<u8>, addr: String) {
+        if self.connect_ws.try_send((buf, addr)).is_err() {
+            log::warn!("try_connect_ws failed");
+        }
     }
 }

vnt/src/channel/socket/mod.rs

@@ -0,0 +1,138 @@
+use anyhow::{anyhow, Context};
+use network_interface::{NetworkInterface, NetworkInterfaceConfig};
+use socket2::Protocol;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+
+#[cfg(unix)]
+mod unix;
+#[cfg(windows)]
+mod windows;
+
+pub trait VntSocketTrait {
+    fn set_ip_unicast_if(&self, _interface: &LocalInterface) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct LocalInterface {
+    index: u32,
+    #[cfg(unix)]
+    name: Option<String>,
+}
+
+pub async fn connect_tcp(
+    addr: SocketAddr,
+    bind_port: u16,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<tokio::net::TcpStream> {
+    let socket = create_tcp0(addr.is_ipv4(), bind_port, default_interface)?;
+    Ok(socket.connect(addr).await?)
+}
+pub fn create_tcp(
+    v4: bool,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<tokio::net::TcpSocket> {
+    create_tcp0(v4, 0, default_interface)
+}
+pub fn create_tcp0(
+    v4: bool,
+    bind_port: u16,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<tokio::net::TcpSocket> {
+    let socket = if v4 {
+        socket2::Socket::new(
+            socket2::Domain::IPV4,
+            socket2::Type::STREAM,
+            Some(Protocol::TCP),
+        )?
+    } else {
+        socket2::Socket::new(
+            socket2::Domain::IPV6,
+            socket2::Type::STREAM,
+            Some(Protocol::TCP),
+        )?
+    };
+    if v4 {
+        if let Err(e) = socket.set_ip_unicast_if(default_interface) {
+            log::warn!("set_ip_unicast_if {:?}", e)
+        }
+    }
+    if bind_port != 0 {
+        socket
+            .set_reuse_address(true)
+            .context("set_reuse_address")?;
+        #[cfg(unix)]
+        if let Err(e) = socket.set_reuse_port(true) {
+            log::warn!("set_reuse_port {:?}", e)
+        }
+        if v4 {
+            let addr: SocketAddr = format!("0.0.0.0:{}", bind_port).parse().unwrap();
+            socket.bind(&addr.into())?;
+        } else {
+            socket.set_only_v6(true)?;
+            let addr: SocketAddr = format!("[::]:{}", bind_port).parse().unwrap();
+            socket.bind(&addr.into())?;
+        }
+    }
+    socket.set_nonblocking(true)?;
+    socket.set_nodelay(true)?;
+    Ok(tokio::net::TcpSocket::from_std_stream(socket.into()))
+}
+pub fn bind_udp_ops(
+    addr: SocketAddr,
+    only_v6: bool,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<socket2::Socket> {
+    let socket = if addr.is_ipv4() {
+        let socket = socket2::Socket::new(
+            socket2::Domain::IPV4,
+            socket2::Type::DGRAM,
+            Some(Protocol::UDP),
+        )?;
+        if let Err(e) = socket.set_ip_unicast_if(default_interface) {
+            log::warn!("set_ip_unicast_if {:?}", e)
+        }
+        socket
+    } else {
+        let socket = socket2::Socket::new(
+            socket2::Domain::IPV6,
+            socket2::Type::DGRAM,
+            Some(Protocol::UDP),
+        )?;
+        socket
+            .set_only_v6(only_v6)
+            .with_context(|| format!("set_only_v6 failed: {}", &addr))?;
+        socket
+    };
+    socket.set_nonblocking(true)?;
+    socket.bind(&addr.into())?;
+    Ok(socket)
+}
+pub fn bind_udp(
+    addr: SocketAddr,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<socket2::Socket> {
+    bind_udp_ops(addr, true, default_interface).with_context(|| format!("{}", addr))
+}
+
+pub fn get_interface(dest_name: String) -> anyhow::Result<(LocalInterface, Ipv4Addr)> {
+    let network_interfaces = NetworkInterface::show()?;
+    for iface in network_interfaces {
+        if iface.name == dest_name {
+            for addr in iface.addr {
+                if let IpAddr::V4(ip) = addr.ip() {
+                    return Ok((
+                        LocalInterface {
+                            index: iface.index,
+                            #[cfg(unix)]
+                            name: Some(iface.name),
+                        },
+                        ip,
+                    ));
+                }
+            }
+        }
+    }
+    Err(anyhow!("No network card with name {} found", dest_name))
+}

vnt/src/channel/socket/unix.rs

@@ -0,0 +1,46 @@
+use crate::channel::socket::{LocalInterface, VntSocketTrait};
+#[cfg(any(target_os = "linux", target_os = "macos"))]
+use anyhow::Context;
+
+#[cfg(target_os = "linux")]
+impl VntSocketTrait for socket2::Socket {
+    fn set_ip_unicast_if(&self, interface: &LocalInterface) -> anyhow::Result<()> {
+        if let Some(name) = &interface.name {
+            self.bind_device(Some(name.as_bytes()))
+                .context("bind_device")?;
+        }
+        Ok(())
+    }
+}
+#[cfg(target_os = "macos")]
+impl VntSocketTrait for socket2::Socket {
+    fn set_ip_unicast_if(&self, interface: &LocalInterface) -> anyhow::Result<()> {
+        if interface.index != 0 {
+            self.bind_device_by_index_v4(std::num::NonZeroU32::new(interface.index))
+                .with_context(|| format!("bind_device_by_index_v4 {:?}", interface))?;
+        }
+        Ok(())
+    }
+}
+#[cfg(target_os = "android")]
+impl VntSocketTrait for socket2::Socket {
+    fn set_ip_unicast_if(&self, _interface: &LocalInterface) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+// #[cfg(any(target_os = "linux", target_os = "macos"))]
+// pub fn get_best_interface(dest_ip: Ipv4Addr) -> anyhow::Result<LocalInterface> {
+//     match get_interface(dest_ip) {
+//         Ok(iface) => return Ok(iface),
+//         Err(e) => {
+//             log::warn!("not find interface e={:?},ip={}", e, dest_ip);
+//         }
+//     }
+//     // 应该再查路由表找到默认路由的
+//     Ok(LocalInterface::default())
+// }
+// #[cfg(target_os = "android")]
+// pub fn get_best_interface(_dest_ip: Ipv4Addr) -> anyhow::Result<LocalInterface> {
+//     Ok(LocalInterface::default())
+// }

vnt/src/channel/socket/windows.rs

@@ -0,0 +1,56 @@
+use std::mem;
+use std::os::windows::io::AsRawSocket;
+
+use windows_sys::core::PCSTR;
+use windows_sys::Win32::Networking::WinSock::{
+    htonl, setsockopt, IPPROTO_IP, IP_UNICAST_IF, SOCKET_ERROR,
+};
+
+use crate::channel::socket::{LocalInterface, VntSocketTrait};
+
+impl VntSocketTrait for socket2::Socket {
+    fn set_ip_unicast_if(&self, interface: &LocalInterface) -> anyhow::Result<()> {
+        let index = interface.index;
+        if index == 0 {
+            return Ok(());
+        }
+        let raw_socket = self.as_raw_socket();
+        let result = unsafe {
+            let best_interface = htonl(index);
+            setsockopt(
+                raw_socket as usize,
+                IPPROTO_IP,
+                IP_UNICAST_IF,
+                &best_interface as *const _ as PCSTR,
+                mem::size_of_val(&best_interface) as i32,
+            )
+        };
+        if result == SOCKET_ERROR {
+            Err(anyhow::anyhow!(
+                "Failed to set IP_UNICAST_IF: {:?} {}",
+                std::io::Error::last_os_error(),
+                index
+            ))?;
+        }
+        Ok(())
+    }
+}
+
+// pub fn get_best_interface(dest_ip: Ipv4Addr) -> anyhow::Result<LocalInterface> {
+//     // 获取最佳接口
+//     let index = unsafe {
+//         let mut dest: SOCKADDR_IN = mem::zeroed();
+//         dest.sin_family = AF_INET as u16;
+//         dest.sin_addr.S_un.S_addr = u32::from_ne_bytes(dest_ip.octets());
+//
+//         let mut index: u32 = 0;
+//         if GetBestInterfaceEx(&dest as *const _ as *mut SOCKADDR, &mut index) != 0 {
+//             Err(anyhow::anyhow!(
+//                 "Failed to GetBestInterfaceEx: {:?}",
+//                 std::io::Error::last_os_error()
+//             ))?;
+//         }
+//         index
+//     };
+//     Ok(LocalInterface { index })
+// }

vnt/src/channel/tcp_channel.rs

@@ -1,456 +1,212 @@
-use std::collections::HashMap;
-use std::io::{Read, Write};
-use std::net::{Shutdown, SocketAddr};
-#[cfg(any(unix))]
-use std::os::fd::FromRawFd;
-#[cfg(any(unix))]
-use std::os::fd::IntoRawFd;
+use anyhow::{anyhow, Context};
+use std::net::SocketAddr;
+#[cfg(unix)]
+use std::os::unix::io::AsRawFd;
 #[cfg(windows)]
-use std::os::windows::io::FromRawSocket;
-#[cfg(windows)]
-use std::os::windows::io::IntoRawSocket;
-use std::sync::mpsc::{sync_channel, Receiver, SyncSender, TryRecvError, TrySendError};
-use std::{io, thread};
+use std::os::windows::io::AsRawSocket;
+use std::thread;
+use std::time::Duration;
+use tokio::io::{AsyncReadExt, AsyncWrite, AsyncWriteExt};
+use tokio::net::tcp::OwnedReadHalf;
+use tokio::net::{TcpListener, TcpStream};
+use tokio::sync::mpsc::{channel, Receiver};
 
-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};
-use crate::channel::{RouteKey, BUFFER_SIZE};
+use crate::channel::sender::PacketSender;
+use crate::channel::socket::create_tcp0;
+use crate::channel::{ConnectProtocol, RouteKey, BUFFER_SIZE, TCP_MAX_PACKET_SIZE};
 use crate::util::StopManager;
 
-const SERVER: Token = Token(0);
-const NOTIFY: Token = Token(1);
-
 /// 监听tcp端口，等待客户端连接
 pub fn tcp_listen<H>(
-    tcp_server: TcpListener,
-    stop_manager: StopManager,
+    tcp_server: std::net::TcpListener,
+    receiver: Receiver<(Vec<u8>, Option<u16>, SocketAddr)>,
     recv_handler: H,
-    context: Context,
-) -> io::Result<AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>>
-where
-    H: RecvChannelHandler,
-{
-    let (tcp_sender, tcp_receiver) = sync_channel(64);
-    let poll = Poll::new()?;
-    let waker = AcceptNotify::new(Waker::new(poll.registry(), NOTIFY)?);
-    let accept = AcceptSocketSender::new(waker.clone(), tcp_sender);
-    let worker = {
-        let waker = waker.clone();
-        stop_manager.add_listener("tcp_listen".into(), move || {
-            if let Err(e) = waker.stop() {
-                log::error!("{:?}", e);
-            }
-        })?
-    };
-
-    thread::Builder::new()
-        .name("tcpRead".into())
-        .spawn(move || {
-            if let Err(e) = tcp_listen0(
-                poll,
-                tcp_server,
-                &stop_manager,
-                waker,
-                tcp_receiver,
-                recv_handler,
-                context,
-            ) {
-                log::error!("{:?}", e);
-            }
-            worker.stop_all();
-        })?;
-    Ok(accept)
-}
-
-fn tcp_listen0<H>(
-    mut poll: Poll,
-    mut tcp_server: TcpListener,
-    stop_manager: &StopManager,
-    accept_notify: AcceptNotify,
-    accept_tcp_receiver: Receiver<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
-    mut recv_handler: H,
-    context: Context,
-) -> io::Result<()>
-where
-    H: RecvChannelHandler,
-{
-    let (tcp_sender, tcp_receiver) = sync_channel(64);
-    let write_waker = init_writable_handler(tcp_receiver, stop_manager.clone(), context.clone())?;
-    poll.registry()
-        .register(&mut tcp_server, SERVER, Interest::READABLE)?;
-    let mut events = Events::with_capacity(1024);
-
-    let mut read_map: HashMap<Token, (RouteKey, TcpStream, Box<[u8; BUFFER_SIZE]>, usize)> =
-        HashMap::with_capacity(32);
-    loop {
-        poll.poll(&mut events, None)?;
-        for event in events.iter() {
-            match event.token() {
-                SERVER => loop {
-                    match tcp_server.accept() {
-                        Ok((stream, addr)) => {
-                            accept_handle(
-                                stream,
-                                addr,
-                                None,
-                                &write_waker,
-                                &mut read_map,
-                                &tcp_sender,
-                                poll.registry(),
-                            )?;
-                        }
-                        Err(e) => {
-                            if e.kind() == io::ErrorKind::WouldBlock {
-                                break;
-                            }
-                            return Err(e);
-                        }
-                    }
-                },
-                NOTIFY => {
-                    if accept_notify.is_stop() {
-                        return Ok(());
-                    }
-                    if accept_notify.is_add_socket() {
-                        while let Ok((stream, addr, init_buf)) = accept_tcp_receiver.try_recv() {
-                            accept_handle(
-                                stream,
-                                addr,
-                                init_buf,
-                                &write_waker,
-                                &mut read_map,
-                                &tcp_sender,
-                                poll.registry(),
-                            )?;
-                        }
-                    }
-                }
-                token => {
-                    if event.is_readable() {
-                        if let Err(e) =
-                            readable_handle(&token, &mut read_map, &mut recv_handler, &context)
-                        {
-                            closed_handle_r(&token, &mut read_map);
-                            log::warn!("{:?}", e);
-                            if let Err(e) = write_waker.notify(token, false) {
-                                log::warn!("{:?}", e);
-                            }
-                        }
-                    } else {
-                        closed_handle_r(&token, &mut read_map);
-                        if let Err(e) = write_waker.notify(token, false) {
-                            log::warn!("{:?}", e);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-/// 处理写事件
-
-fn init_writable_handler(
-    receiver: Receiver<(TcpStream, Token, SocketAddr, Option<Vec<u8>>)>,
+    context: ChannelContext,
     stop_manager: StopManager,
-    context: Context,
-) -> io::Result<WritableNotify> {
-    let poll = Poll::new()?;
-    let writable_notify = WritableNotify::new(Waker::new(poll.registry(), NOTIFY)?);
-    let worker = {
-        let writable_notify = writable_notify.clone();
-        stop_manager.add_listener("tcp_writable_handler".into(), move || {
-            if let Err(e) = writable_notify.stop() {
-                log::error!("{:?}", e);
-            }
-        })?
-    };
-    {
-        let writable_notify = writable_notify.clone();
-        thread::Builder::new()
-            .name("tcpWriteableListen".into())
-            .spawn(move || {
-                if let Err(e) = tcp_writable_listen(receiver, poll, writable_notify, &context) {
-                    log::error!("{:?}", e);
+) -> anyhow::Result<()>
+where
+    H: RecvChannelHandler,
+{
+    let (stop_sender, stop_receiver) = tokio::sync::oneshot::channel::<()>();
+    let worker = stop_manager.add_listener("tcpChannel".into(), move || {
+        let _ = stop_sender.send(());
+    })?;
+    let bind_port = tcp_server.local_addr()?.port();
+    let runtime = tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(2)
+        .enable_all()
+        .build()
+        .context("tcp tokio runtime build failed")?;
+    thread::Builder::new()
+        .name("tcpChannel".into())
+        .spawn(move || {
+            runtime.spawn(async move {
+                {
+                    let recv_handler = recv_handler.clone();
+                    let context = context.clone();
+                    tokio::spawn(async move {
+                        if let Err(e) = tcp_accept(tcp_server, recv_handler, context).await {
+                            log::warn!("tcp_listen {:?}", e);
+                        }
+                    });
                 }
-                worker.stop_all();
-            })?;
-    }
-
-    Ok(writable_notify)
+                tokio::spawn(async move {
+                    connect_tcp_handle(receiver, recv_handler, context, bind_port).await
+                });
+            });
+            runtime.block_on(async {
+                let _ = stop_receiver.await;
+            });
+            runtime.shutdown_background();
+            worker.stop_all();
+        })
+        .context("tcp thread build failed")?;
+    Ok(())
 }
 
-/// 处理写事件
-fn tcp_writable_listen(
-    receiver: Receiver<(TcpStream, Token, SocketAddr, Option<Vec<u8>>)>,
-    mut poll: Poll,
-    writable_notify: WritableNotify,
-    context: &Context,
-) -> io::Result<()> {
-    let mut events = Events::with_capacity(1024);
-    let mut write_map: HashMap<
-        Token,
-        (
-            TcpStream,
-            SocketAddr,
-            Receiver<Vec<u8>>,
-            Option<(Vec<u8>, usize)>,
-        ),
-    > = HashMap::with_capacity(32);
-    loop {
-        poll.poll(&mut events, None)?;
-        for event in events.iter() {
-            match event.token() {
-                NOTIFY => {
-                    if writable_notify.is_stop() {
-                        //服务停止
-                        return Ok(());
-                    }
-                    if writable_notify.is_need_write() {
-                        // 需要写入数据
-                        if let Some(tokens) = writable_notify.take_all() {
-                            for (token, state) in tokens {
-                                if !state {
-                                    closed_handle_w(&token, &mut write_map, &context);
-                                    continue;
-                                }
-                                if let Err(e) = writable_handle(&token, &mut write_map) {
-                                    closed_handle_w(&token, &mut write_map, &context);
-                                    log::warn!("{:?}", e);
-                                }
-                            }
-                        }
-                    }
-                    if writable_notify.is_add_socket() {
-                        //添加tcp连接，并监听写事件
-                        while let Ok((mut stream, token, addr, init_buf)) = receiver.try_recv() {
-                            if let Err(e) = stream.set_nodelay(true) {
-                                log::warn!("set_nodelay err={:?}", e);
-                            }
-                            if let Err(e) =
-                                poll.registry()
-                                    .register(&mut stream, token, Interest::WRITABLE)
-                            {
-                                log::warn!("registry err={:?}", e);
-                                continue;
-                            }
-                            let (sender, receiver) = sync_channel(128);
-                            let packet_sender =
-                                PacketSender::new(writable_notify.clone(), sender, token);
-                            if let Some(init_buf) = init_buf {
-                                packet_sender.try_send(&init_buf)?;
-                            }
+async fn connect_tcp_handle<H>(
+    mut receiver: Receiver<(Vec<u8>, Option<u16>, SocketAddr)>,
+    recv_handler: H,
+    context: ChannelContext,
+    listener_bind_port: u16,
+) where
+    H: RecvChannelHandler,
+{
+    while let Some((data, bind_port, addr)) = receiver.recv().await {
+        let recv_handler = recv_handler.clone();
+        let context = context.clone();
+        let bind_port = if let Some(bind_port) = bind_port {
+            bind_port
+        } else {
+            listener_bind_port
+        };
+        tokio::spawn(async move {
+            if let Err(e) = connect_tcp0(data, addr, recv_handler, context, bind_port).await {
+                log::warn!("连接失败,链接终止:{:?},{:?}", addr, e);
+            }
+        });
+    }
+}
 
-                            context.tcp_map.write().insert(addr, packet_sender);
-                            write_map.insert(token, (stream, addr, receiver, None));
-                        }
-                    }
-                }
-                token => {
-                    if event.is_writable() {
-                        if let Err(e) = writable_handle(&token, &mut write_map) {
-                            closed_handle_w(&token, &mut write_map, &context);
-                            log::warn!("{:?}", e);
-                        }
-                    } else {
-                        closed_handle_w(&token, &mut write_map, &context);
-                    }
-                }
+async fn connect_tcp0<H>(
+    data: Vec<u8>,
+    addr: SocketAddr,
+    recv_handler: H,
+    context: ChannelContext,
+    bind_port: u16,
+) -> anyhow::Result<()>
+where
+    H: RecvChannelHandler,
+{
+    let socket = if bind_port != 0 {
+        match create_tcp0(addr.is_ipv4(), bind_port, context.default_interface()) {
+            Ok(socket) => socket,
+            Err(e) => {
+                log::warn!("{:?}", e);
+                create_tcp0(addr.is_ipv4(), 0, context.default_interface())?
             }
         }
+    } else {
+        create_tcp0(addr.is_ipv4(), 0, context.default_interface())?
+    };
+    let mut stream = tokio::time::timeout(Duration::from_secs(3), socket.connect(addr)).await??;
+    tcp_write(&mut stream, &data).await?;
+
+    tcp_stream_handle(stream, addr, recv_handler, context).await;
+    Ok(())
+}
+
+async fn tcp_accept<H>(
+    tcp_server: std::net::TcpListener,
+    recv_handler: H,
+    context: ChannelContext,
+) -> anyhow::Result<()>
+where
+    H: RecvChannelHandler,
+{
+    let tcp_server = TcpListener::from_std(tcp_server)?;
+
+    loop {
+        let (stream, addr) = tcp_server.accept().await?;
+
+        tcp_stream_handle(stream, addr, recv_handler.clone(), context.clone()).await;
     }
 }
 
-fn accept_handle(
+pub async fn tcp_stream_handle<H>(
     stream: TcpStream,
     addr: SocketAddr,
-    init_buf: Option<Vec<u8>>,
-    write_waker: &WritableNotify,
-    read_map: &mut HashMap<Token, (RouteKey, TcpStream, Box<[u8; BUFFER_SIZE]>, usize)>,
-    tcp_sender: &SyncSender<(TcpStream, Token, SocketAddr, Option<Vec<u8>>)>,
-    registry: &Registry,
-) -> io::Result<()> {
+    recv_handler: H,
+    context: ChannelContext,
+) where
+    H: RecvChannelHandler,
+{
+    let _ = stream.set_nodelay(true);
+    let local = stream.local_addr();
     #[cfg(windows)]
-    let (tcp_stream, index) = unsafe {
-        let fd = stream.into_raw_socket();
-        (std::net::TcpStream::from_raw_socket(fd), fd as usize)
-    };
-    #[cfg(any(unix))]
-    let (tcp_stream, index) = unsafe {
-        let fd = stream.into_raw_fd();
-        (std::net::TcpStream::from_raw_fd(fd), fd as usize)
-    };
-    if index == 0 || index == 1 {
-        log::error!("index err={:?}", addr);
-        return Ok(());
-    }
-    let token = Token(index);
-    match tcp_stream.try_clone() {
-        Ok(tcp_writer) => {
-            match tcp_sender.try_send((TcpStream::from_std(tcp_writer), token, addr, init_buf)) {
-                Ok(_) => {
-                    if let Err(e) = write_waker.add_socket() {
-                        log::error!("write_waker,err={:?},addr={:?}", e, addr);
-                        return Ok(());
-                    }
-                }
-                Err(e) => {
-                    return match e {
-                        TrySendError::Full(_) => {
-                            log::error!("Full,addr={:?}", addr);
-                            Ok(())
-                        }
-                        TrySendError::Disconnected(_) => {
-                            Err(io::Error::new(io::ErrorKind::Other, "write thread exit"))
-                        }
-                    };
-                }
+    let index = stream.as_raw_socket() as usize;
+    #[cfg(unix)]
+    let index = stream.as_raw_fd() as usize;
+    let route_key = RouteKey::new(ConnectProtocol::TCP, index, addr);
+    let (r, mut w) = stream.into_split();
+    let (sender, mut receiver) = channel::<Vec<u8>>(100);
+    context
+        .packet_map
+        .write()
+        .insert(route_key, PacketSender::new(sender));
+    tokio::spawn(async move {
+        while let Some(data) = receiver.recv().await {
+            if let Err(e) = tcp_write(&mut w, &data).await {
+                log::info!("发送失败,tcp链接终止:{:?},{:?}", addr, e);
+                break;
             }
         }
-        Err(e) => {
-            log::error!("try_clone err={:?},addr={:?}", e, addr);
-            return Ok(());
+        let _ = w.shutdown().await;
+    });
+    tokio::spawn(async move {
+        if let Err(e) = tcp_read(r, addr, &context, recv_handler, route_key).await {
+            log::warn!("tcp_read {:?} {local:?}-{addr}", e)
         }
+        context.packet_map.write().remove(&route_key);
+    });
+}
+
+async fn tcp_write<W: AsyncWrite + Unpin>(w: &mut W, buf: &[u8]) -> anyhow::Result<()> {
+    let len = buf.len();
+    if len > TCP_MAX_PACKET_SIZE {
+        return Err(anyhow!("超过了tcp的最大长度传输"));
     }
-    let mut stream = TcpStream::from_std(tcp_stream);
-    if let Err(e) = registry.register(&mut stream, token, Interest::READABLE) {
-        log::error!("registry err={:?},addr={:?}", e, addr);
-        return Ok(());
-    }
-    read_map.insert(
-        token,
-        (
-            RouteKey::new(true, index, addr),
-            stream,
-            Box::new([0; BUFFER_SIZE]),
-            0,
-        ),
-    );
+    w.write_all(&[0, (len >> 16) as u8, (len >> 8) as u8, len as u8])
+        .await?;
+    w.write_all(&buf).await?;
     Ok(())
 }
 
-fn readable_handle<H>(
-    token: &Token,
-    map: &mut HashMap<Token, (RouteKey, TcpStream, Box<[u8; BUFFER_SIZE]>, usize)>,
-    recv_handler: &mut H,
-    context: &Context,
-) -> io::Result<()>
+async fn tcp_read<H>(
+    mut read: OwnedReadHalf,
+    addr: SocketAddr,
+    context: &ChannelContext,
+    recv_handler: H,
+    route_key: RouteKey,
+) -> anyhow::Result<()>
 where
     H: RecvChannelHandler,
 {
-    if let Some((route_key, stream, buf, begin)) = map.get_mut(token) {
-        loop {
-            let end = if *begin >= 4 {
-                4 + (((buf[2] as u16) << 8) | buf[3] as u16) as usize
-            } else {
-                4
-            };
-            if end > BUFFER_SIZE {
-                return Err(io::Error::from(io::ErrorKind::InvalidData));
-            }
-            match stream.read(&mut buf[*begin..end]) {
-                Ok(len) => {
-                    if len == 0 {
-                        return Err(io::Error::from(io::ErrorKind::UnexpectedEof));
-                    }
-                    *begin += len;
-                    if end > 4 && *begin == end {
-                        recv_handler.handle(&mut buf[4..end], *route_key, context);
-                        *begin = 0;
-                    }
-                }
-                Err(e) => {
-                    if e.kind() == io::ErrorKind::WouldBlock {
-                        break;
-                    }
-                    return Err(e);
-                }
-            }
+    let mut head = [0; 4];
+    let mut buf = [0; BUFFER_SIZE];
+    let mut extend = [0; BUFFER_SIZE];
+    loop {
+        read.read_exact(&mut head).await?;
+        if head[0] != 0 {
+            return Err(anyhow!("tcp数据流错误 {}", addr));
         }
-    }
-    Ok(())
-}
-
-fn writable_handle(
-    token: &Token,
-    map: &mut HashMap<
-        Token,
-        (
-            TcpStream,
-            SocketAddr,
-            Receiver<Vec<u8>>,
-            Option<(Vec<u8>, usize)>,
-        ),
-    >,
-) -> io::Result<()> {
-    if let Some((stream, _, receiver, last)) = map.get_mut(token) {
-        loop {
-            if let Some((buf, begin)) = last {
-                match stream.write(&buf[*begin..]) {
-                    Ok(len) => {
-                        if len == 0 {
-                            return Err(io::Error::from(io::ErrorKind::WriteZero));
-                        }
-                        if len + *begin == buf.len() {
-                            *last = None;
-                        } else {
-                            *begin += len;
-                            continue;
-                        }
-                    }
-                    Err(e) => {
-                        if e.kind() == io::ErrorKind::WouldBlock {
-                            break;
-                        }
-                        return Err(e);
-                    }
-                }
-            }
-            match receiver.try_recv() {
-                Ok(buf) => *last = Some((buf, 0)),
-                Err(e) => match e {
-                    TryRecvError::Empty => {
-                        break;
-                    }
-                    TryRecvError::Disconnected => {
-                        return Err(io::Error::from(io::ErrorKind::Other));
-                    }
-                },
-            }
+        let len = ((head[1] as usize) << 16) | ((head[2] as usize) << 8) | head[3] as usize;
+        if len < 12 || len > buf.len() {
+            return Err(anyhow!("tcp数据长度无效 {}", addr));
         }
-    }
-    Ok(())
-}
-
-fn closed_handle_r(
-    token: &Token,
-    map: &mut HashMap<Token, (RouteKey, TcpStream, Box<[u8; BUFFER_SIZE]>, usize)>,
-) {
-    if let Some((_, tcp, _, _)) = map.remove(token) {
-        let _ = tcp.shutdown(Shutdown::Both);
-    }
-}
-
-fn closed_handle_w(
-    token: &Token,
-    map: &mut HashMap<
-        Token,
-        (
-            TcpStream,
-            SocketAddr,
-            Receiver<Vec<u8>>,
-            Option<(Vec<u8>, usize)>,
-        ),
-    >,
-    context: &Context,
-) {
-    if let Some((tcp, addr, _, _)) = map.remove(token) {
-        context.tcp_map.write().remove(&addr);
-        let _ = tcp.shutdown(Shutdown::Both);
+        read.read_exact(&mut buf[..len]).await?;
+        recv_handler.handle(&mut buf[..len], &mut extend, route_key, context);
     }
 }

vnt/src/channel/udp_channel.rs

@@ -1,24 +1,22 @@
-use std::collections::HashMap;
 use std::sync::mpsc::{sync_channel, Receiver};
-use std::sync::Arc;
 use std::{io, thread};
 
 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;
-use crate::channel::{RouteKey, BUFFER_SIZE};
+use crate::channel::{ConnectProtocol, RouteKey, BUFFER_SIZE};
 use crate::util::StopManager;
 
 pub fn udp_listen<H>(
     stop_manager: StopManager,
     recv_handler: H,
-    context: Context,
-) -> io::Result<AcceptSocketSender<Option<Vec<UdpSocket>>>>
+    context: ChannelContext,
+) -> anyhow::Result<AcceptSocketSender<Option<Vec<UdpSocket>>>>
 where
     H: RecvChannelHandler,
 {
@@ -31,8 +29,8 @@ const NOTIFY: Token = Token(0);
 fn sub_udp_listen<H>(
     stop_manager: StopManager,
     recv_handler: H,
-    context: Context,
-) -> io::Result<AcceptSocketSender<Option<Vec<UdpSocket>>>>
+    context: ChannelContext,
+) -> anyhow::Result<AcceptSocketSender<Option<Vec<UdpSocket>>>>
 where
     H: RecvChannelHandler,
 {
@@ -61,8 +59,8 @@ where
 
 fn sub_udp_listen0<H>(
     mut poll: Poll,
-    mut recv_handler: H,
-    context: Context,
+    recv_handler: H,
+    context: ChannelContext,
     accept_notify: AcceptNotify,
     accept_receiver: Receiver<Option<Vec<UdpSocket>>>,
 ) -> io::Result<()>
@@ -71,9 +69,14 @@ where
 {
     let mut events = Events::with_capacity(1024);
     let mut buf = [0; BUFFER_SIZE];
-    let mut read_map: HashMap<Token, UdpSocket> = HashMap::with_capacity(32);
+    let mut extend = [0; BUFFER_SIZE];
+    let mut list: Vec<UdpSocket> = Vec::with_capacity(100);
+    let main_len = context.main_len();
     loop {
-        poll.poll(&mut events, None)?;
+        if let Err(e) = poll.poll(&mut events, None) {
+            crate::ignore_io_interrupted(e)?;
+            continue;
+        }
         for event in events.iter() {
             match event.token() {
                 NOTIFY => {
@@ -85,38 +88,43 @@ where
                             match option {
                                 None => {
                                     log::info!("切换成锥形模式");
-                                    for (_, mut udp_socket) in read_map.drain() {
+                                    for mut udp_socket in list.drain(..) {
                                         if let Err(e) = udp_socket.deregister(poll.registry()) {
                                             log::error!("{:?}", e);
                                         }
                                     }
                                 }
                                 Some(socket_list) => {
+                                    for mut udp_socket in list.drain(..) {
+                                        if let Err(e) = udp_socket.deregister(poll.registry()) {
+                                            log::error!("deregister {:?}", e);
+                                        }
+                                    }
                                     log::info!("切换成对称模式 监听端口数：{}", socket_list.len());
                                     for (index, mut udp_socket) in
                                         socket_list.into_iter().enumerate()
                                     {
-                                        let token = Token(index + context.channel_num());
                                         poll.registry().register(
                                             &mut udp_socket,
-                                            token,
+                                            Token(index),
                                             Interest::READABLE,
                                         )?;
-                                        read_map.insert(token, udp_socket);
+                                        list.push(udp_socket);
                                     }
                                 }
                             }
                         }
                     }
                 }
-                token => {
-                    if let Some(udp_socket) = read_map.get(&token) {
+                Token(index) => {
+                    if let Some(udp_socket) = list.get(index) {
                         loop {
                             match udp_socket.recv_from(&mut buf) {
                                 Ok((len, addr)) => {
                                     recv_handler.handle(
                                         &mut buf[..len],
-                                        RouteKey::new(false, token.0, addr),
+                                        &mut extend,
+                                        RouteKey::new(ConnectProtocol::UDP, index + main_len, addr),
                                         &context,
                                     );
                                 }
@@ -135,15 +143,83 @@ where
     }
 }
 
-/// 阻塞监听
+// /// 阻塞
+// fn main_udp_listen<H>(
+//     stop_manager: StopManager,
+//     recv_handler: H,
+//     context: Context,
+// ) -> io::Result<()>
+// where
+//     H: RecvChannelHandler,
+// {
+//     for index in 0..context.main_udp_socket.len() {
+//         let stop_manager = stop_manager.clone();
+//         let context = context.clone();
+//         let recv_handler = recv_handler.clone();
+//         thread::Builder::new()
+//             .name(format!("mainUdp{}", index))
+//             .spawn(move || {
+//                 if let Err(e) = main_udp_listen0(stop_manager, index, recv_handler, context) {
+//                     log::error!("{:?}", e);
+//                 }
+//             })?;
+//     }
+//     Ok(())
+// }
+//
+// pub fn main_udp_listen0<H>(
+//     stop_manager: StopManager,
+//     index: usize,
+//     mut recv_handler: H,
+//     context: Context,
+// ) -> io::Result<()>
+// where
+//     H: RecvChannelHandler,
+// {
+//     use std::time::Duration;
+//     let udp_socket = &context.main_udp_socket[index];
+//     udp_socket.set_read_timeout(Some(Duration::from_secs(5)))?;
+//     udp_socket.set_write_timeout(Some(Duration::from_secs(1)))?;
+//     let local_addr = udp_socket.local_addr()?;
+//     let worker = stop_manager.add_listener(format!("main_udp_{}", index), move || {
+//         if let Ok(udp) = std::net::UdpSocket::bind("0.0.0.0:0") {
+//             let _ = udp.send_to(b"stop", format!("127.0.0.1:{}", local_addr.port()));
+//         }
+//     })?;
+//
+//     let mut buf = [0; BUFFER_SIZE];
+//     loop {
+//         match udp_socket.recv_from(&mut buf) {
+//             Ok((len, addr)) => {
+//                 if &buf[..len] == b"stop" {
+//                     if stop_manager.is_stop() {
+//                         break;
+//                     }
+//                 }
+//                 recv_handler.handle(&mut buf[..len], RouteKey::new(false, index, addr), &context);
+//             }
+//             Err(e) => {
+//                 if stop_manager.is_stop() {
+//                     break;
+//                 }
+//                 log::error!("index={},{:?},{}", index, udp_socket.local_addr(), e)
+//             }
+//         }
+//     }
+//     worker.stop_all();
+//     Ok(())
+// }
+
+/// 非阻塞
 fn main_udp_listen<H>(
     stop_manager: StopManager,
     recv_handler: H,
-    context: Context,
-) -> io::Result<()>
+    context: ChannelContext,
+) -> anyhow::Result<()>
 where
     H: RecvChannelHandler,
 {
+    use std::sync::Arc;
     let poll = Poll::new()?;
     let waker = Arc::new(Waker::new(poll.registry(), NOTIFY)?);
     let _waker = waker.clone();
@@ -164,7 +240,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,
+    recv_handler: H,
+    context: ChannelContext,
+) -> io::Result<()>
 where
     H: RecvChannelHandler,
 {
@@ -181,11 +261,16 @@ where
     }
 
     let mut events = Events::with_capacity(udps.len());
+    let mut extend = [0; BUFFER_SIZE];
     loop {
-        poll.poll(&mut events, None)?;
+        if let Err(e) = poll.poll(&mut events, None) {
+            crate::ignore_io_interrupted(e)?;
+            continue;
+        }
         for x in events.iter() {
             let index = match x.token() {
                 NOTIFY => return Ok(()),
+                // 0的位置留给NOTIFY了，这里要再减回去，因为路由是通过index来找到对应udp的
                 Token(index) => index - 1,
             };
             let udp = if let Some(udp) = udps.get(index) {
@@ -199,7 +284,8 @@ where
                     Ok((len, addr)) => {
                         recv_handler.handle(
                             &mut buf[..len],
-                            RouteKey::new(false, index, addr),
+                            &mut extend,
+                            RouteKey::new(ConnectProtocol::UDP, index, addr),
                             &context,
                         );
                     }

vnt/src/channel/ws_channel.rs

@@ -0,0 +1,173 @@
+use crate::channel::{ConnectProtocol, RouteKey, BUFFER_SIZE};
+use anyhow::Context;
+use futures_util::stream::SplitStream;
+use futures_util::{SinkExt, StreamExt};
+use std::convert::Into;
+use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4};
+use std::thread;
+use std::time::Duration;
+use tokio::net::TcpStream;
+use tokio::sync::mpsc::{channel, Receiver};
+use tokio_tungstenite::tungstenite::http::StatusCode;
+use tokio_tungstenite::tungstenite::{Error, Message};
+use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
+
+use crate::channel::context::ChannelContext;
+use crate::channel::handler::RecvChannelHandler;
+use crate::channel::sender::PacketSender;
+use crate::util::StopManager;
+
+/// ws协议，
+/// 暂时只允许用ws连服务端，不能用ws打洞/连客户端
+pub fn ws_connect_accept<H>(
+    receiver: Receiver<(Vec<u8>, String)>,
+    recv_handler: H,
+    context: ChannelContext,
+    stop_manager: StopManager,
+) -> anyhow::Result<()>
+where
+    H: RecvChannelHandler,
+{
+    let (stop_sender, stop_receiver) = tokio::sync::oneshot::channel::<()>();
+    let worker = stop_manager.add_listener("wsChannel".into(), move || {
+        let _ = stop_sender.send(());
+    })?;
+    let runtime = tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(2)
+        .enable_all()
+        .build()
+        .context("ws tokio runtime build failed")?;
+    thread::Builder::new()
+        .name("wsChannel".into())
+        .spawn(move || {
+            runtime.spawn(async move { connect_ws_handle(receiver, recv_handler, context).await });
+            runtime.block_on(async {
+                let _ = stop_receiver.await;
+            });
+            runtime.shutdown_background();
+            worker.stop_all();
+        })
+        .context("ws thread build failed")?;
+    Ok(())
+}
+
+async fn connect_ws_handle<H>(
+    mut receiver: Receiver<(Vec<u8>, String)>,
+    recv_handler: H,
+    context: ChannelContext,
+) where
+    H: RecvChannelHandler,
+{
+    let mut index = 0;
+    while let Some((data, url)) = receiver.recv().await {
+        let recv_handler = recv_handler.clone();
+        let context = context.clone();
+        tokio::spawn(async move {
+            if let Err(e) = connect_ws(data, url, recv_handler, context, index).await {
+                log::warn!("发送失败,ws链接终止:{:?}", e);
+            }
+        });
+        index += 1;
+    }
+}
+const WS_ADDR: SocketAddr = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0));
+
+async fn connect_ws<H>(
+    data: Vec<u8>,
+    mut url: String,
+    recv_handler: H,
+    context: ChannelContext,
+    index: usize,
+) -> anyhow::Result<()>
+where
+    H: RecvChannelHandler,
+{
+    let mut count = 0;
+    log::info!("尝试建立连接 {:?}", url);
+    let (mut ws, response) = loop {
+        count += 1;
+        if count > 3 {
+            Err(anyhow::anyhow!("发生多次重定向，链接终止"))?
+        }
+        match tokio::time::timeout(Duration::from_secs(3), connect_async(url)).await? {
+            Ok(rs) => break rs,
+            Err(e) => {
+                if let Error::Http(res) = &e {
+                    if res.status() == StatusCode::MOVED_PERMANENTLY
+                        || res.status() == StatusCode::FOUND
+                        || res.status() == StatusCode::SEE_OTHER
+                        || res.status() == StatusCode::TEMPORARY_REDIRECT
+                        || res.status() == StatusCode::PERMANENT_REDIRECT
+                    {
+                        if let Some(v) = res.headers().get("Location") {
+                            if let Ok(redirect) = v.to_str() {
+                                log::info!("url重定向响应头 {:?}", res.headers());
+                                log::info!("url重定向地址 {}", redirect);
+                                // 替换协议前缀
+                                if redirect.starts_with("http://") {
+                                    url = redirect.replacen("http://", "ws://", 1);
+                                } else if redirect.starts_with("https://") {
+                                    url = redirect.replacen("https://", "wss://", 1);
+                                } else {
+                                    url = redirect.to_string();
+                                }
+                                println!("Location：{}", url);
+                                log::info!("修改后的重定向地址: {}", url);
+                                continue;
+                            }
+                        }
+                    }
+                }
+                return Err(e)?;
+            }
+        }
+    };
+    log::info!("ws协议握手 {:?}", response);
+    ws.send(Message::Binary(data)).await?;
+    let (mut ws_write, ws_read) = ws.split();
+    let (sender, mut receiver) = channel::<Vec<u8>>(100);
+    let route_key = RouteKey::new(ConnectProtocol::WS, index, WS_ADDR);
+
+    context
+        .packet_map
+        .write()
+        .insert(route_key, PacketSender::new(sender));
+    tokio::spawn(async move {
+        while let Some(data) = receiver.recv().await {
+            if let Err(e) = ws_write.send(Message::Binary(data)).await {
+                log::warn!("websocket err {:?}", e);
+                break;
+            }
+        }
+        let _ = ws_write.close().await;
+    });
+    if let Err(e) = ws_read_handle(ws_read, recv_handler, &context, route_key).await {
+        log::warn!("{:?}", e);
+    }
+    context.packet_map.write().remove(&route_key);
+    Ok(())
+}
+async fn ws_read_handle<H>(
+    mut ws_read: SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>,
+    recv_handler: H,
+    context: &ChannelContext,
+    route_key: RouteKey,
+) -> anyhow::Result<()>
+where
+    H: RecvChannelHandler,
+{
+    let mut extend = [0; BUFFER_SIZE];
+    while let Some(msg) = ws_read.next().await {
+        let msg = msg.context("Error during WebSocket ")?;
+        match msg {
+            Message::Text(txt) => log::info!("Received text message: {}", txt),
+            Message::Binary(mut data) => {
+                recv_handler.handle(&mut data, &mut extend, route_key, context);
+            }
+            Message::Ping(_) | Message::Pong(_) => (),
+            Message::Close(_) => break,
+            _ => {}
+        }
+    }
+    Ok(())
+}

vnt/src/cipher/aes_cbc/mod.rs

@@ -0,0 +1,2 @@
+mod rs_aes_cbc;
+pub use rs_aes_cbc::*;

vnt/src/cipher/aes_cbc/rs_aes_cbc.rs

@@ -1,6 +1,5 @@
-use std::io;
-
 use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, BlockEncryptMut, KeyIvInit};
+use anyhow::anyhow;
 use rand::RngCore;
 
 use crate::cipher::Finger;
@@ -50,22 +49,17 @@ impl AesCbcCipher {
     pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if !net_packet.is_encrypt() {
             //未加密的数据直接丢弃
-            return Err(io::Error::new(io::ErrorKind::Other, "not encrypt"));
+            return Err(anyhow!("not encrypt"));
         }
         if net_packet.payload().len() < 16 {
             log::error!("数据异常,长度{}小于{}", net_packet.payload().len(), 16);
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("aes_cbc data err"));
         }
         let mut iv = [0; 16];
-        iv[0..4].copy_from_slice(&net_packet.source().octets());
-        iv[4..8].copy_from_slice(&net_packet.destination().octets());
-        iv[8] = net_packet.protocol().into();
-        iv[9] = net_packet.transport_protocol();
-        iv[10] = net_packet.is_gateway() as u8;
-        iv[11] = net_packet.source_ttl();
+        iv[0..12].copy_from_slice(&net_packet.head_tag());
         if let Some(finger) = &self.finger {
             iv[12..16].copy_from_slice(&finger.hash[0..4]);
         }
@@ -75,7 +69,7 @@ impl AesCbcCipher {
         if let Some(finger) = &self.finger {
             let finger = finger.calculate_finger(&iv[..12], secret_body.en_body());
             if &finger != secret_body.finger() {
-                return Err(io::Error::new(io::ErrorKind::Other, "finger err"));
+                return Err(anyhow!("aes_cbc finger err"));
             }
         }
         let rs = match &self.cipher {
@@ -92,10 +86,7 @@ impl AesCbcCipher {
                 net_packet.set_data_len(HEAD_LEN + len - 4)?;
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("解密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("aes_cbc 解密失败:{}", e)),
         }
     }
     /// net_packet 必须预留足够长度
@@ -103,15 +94,10 @@ impl AesCbcCipher {
     pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         let data_len = net_packet.data_len();
         let mut iv = [0; 16];
-        iv[0..4].copy_from_slice(&net_packet.source().octets());
-        iv[4..8].copy_from_slice(&net_packet.destination().octets());
-        iv[8] = net_packet.protocol().into();
-        iv[9] = net_packet.transport_protocol();
-        iv[10] = net_packet.is_gateway() as u8;
-        iv[11] = net_packet.source_ttl();
+        iv[0..12].copy_from_slice(&net_packet.head_tag());
         if let Some(finger) = &self.finger {
             iv[12..16].copy_from_slice(&finger.hash[0..4]);
             net_packet.set_data_len(data_len + 16)?;
@@ -146,10 +132,22 @@ impl AesCbcCipher {
                 net_packet.set_encrypt_flag(true);
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("加密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("aes_cbc 加密失败:{}", e)),
         };
     }
 }
+#[test]
+fn test_aes_cbc() {
+    let d = AesCbcCipher::new_128([0; 16], Some(Finger::new("123")));
+    let mut p = NetPacket::new_encrypt([0; 100]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+    let d = AesCbcCipher::new_128([0; 16], None);
+    let mut p = NetPacket::new_encrypt([0; 100]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+}

vnt/src/cipher/aes_ecb/mod.rs

@@ -0,0 +1,9 @@
+#[cfg(not(any(feature = "openssl-vendored", feature = "openssl")))]
+mod rs_aes_ecb;
+#[cfg(not(any(feature = "openssl-vendored", feature = "openssl")))]
+pub use rs_aes_ecb::*;
+
+#[cfg(any(feature = "openssl-vendored", feature = "openssl"))]
+mod openssl_aes_ecb;
+#[cfg(any(feature = "openssl-vendored", feature = "openssl"))]
+pub use openssl_aes_ecb::*;

vnt/src/cipher/aes_ecb/openssl_aes_ecb.rs

@@ -1,8 +1,11 @@
-use crate::cipher::Finger;
-use crate::protocol::{NetPacket, HEAD_LEN};
+use std::ptr;
+
+use anyhow::anyhow;
 use libc::c_int;
 use openssl_sys::EVP_CIPHER_CTX;
-use std::{io, ptr};
+
+use crate::cipher::Finger;
+use crate::protocol::{NetPacket, HEAD_LEN};
 
 pub struct AesEcbCipher {
     key: Vec<u8>,
@@ -100,34 +103,28 @@ impl AesEcbCipher {
     pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if !net_packet.is_encrypt() {
             //未加密的数据直接丢弃
-            return Err(io::Error::new(io::ErrorKind::Other, "not encrypt"));
+            return Err(anyhow!("not encrypt"));
         }
 
         if let Some(finger) = &self.finger {
-            let mut nonce_raw = [0; 12];
-            nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-            nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-            nonce_raw[8] = net_packet.protocol().into();
-            nonce_raw[9] = net_packet.transport_protocol();
-            nonce_raw[10] = net_packet.is_gateway() as u8;
-            nonce_raw[11] = net_packet.source_ttl();
+            let nonce_raw = net_packet.head_tag();
             let len = net_packet.payload().len();
             if len < 12 {
-                return Err(io::Error::new(io::ErrorKind::Other, "data len err"));
+                return Err(anyhow!("data len err"));
             }
             let secret_body = &net_packet.payload()[..len - 12];
             let finger = finger.calculate_finger(&nonce_raw, secret_body);
             if &finger != &net_packet.payload()[len - 12..] {
-                return Err(io::Error::new(io::ErrorKind::Other, "finger err"));
+                return Err(anyhow!("finger err"));
             }
             net_packet.set_data_len(net_packet.data_len() - finger.len())?;
         }
         if net_packet.payload().len() < 16 {
             log::error!("数据异常,长度{}小于{}", net_packet.payload().len(), 16);
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("data err"));
         }
         let input = net_packet.payload();
         let mut out = [0u8; 1024 * 5];
@@ -147,22 +144,22 @@ impl AesEcbCipher {
             //校验头部
             let src_net_packet = NetPacket::new(text)?;
             if src_net_packet.source() != net_packet.source() {
-                return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                return Err(anyhow!("data err"));
             }
             if src_net_packet.destination() != net_packet.destination() {
-                return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                return Err(anyhow!("data err"));
             }
             if src_net_packet.protocol() != net_packet.protocol() {
-                return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                return Err(anyhow!("data err"));
             }
             if src_net_packet.transport_protocol() != net_packet.transport_protocol() {
-                return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                return Err(anyhow!("data err"));
             }
             if src_net_packet.is_gateway() != net_packet.is_gateway() {
-                return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                return Err(anyhow!("data err"));
             }
             if src_net_packet.source_ttl() != net_packet.source_ttl() {
-                return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                return Err(anyhow!("data err"));
             }
         }
         net_packet.set_encrypt_flag(false);
@@ -175,7 +172,7 @@ impl AesEcbCipher {
     pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         let input = net_packet.buffer();
         let mut out = [0u8; 1024 * 5];
         let mut out_len = 0;
@@ -191,7 +188,7 @@ impl AesEcbCipher {
         }
         let out_len = out_len as usize;
         if out_len == 0 {
-            return Err(io::Error::new(io::ErrorKind::Other, "ciphertext len err"));
+            return Err(anyhow!("ciphertext len err"));
         }
         //密文
         let ciphertext = &out[..out_len];
@@ -199,13 +196,7 @@ impl AesEcbCipher {
         net_packet.payload_mut().copy_from_slice(ciphertext);
         net_packet.set_encrypt_flag(true);
         if let Some(finger) = &self.finger {
-            let mut nonce_raw = [0; 12];
-            nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-            nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-            nonce_raw[8] = net_packet.protocol().into();
-            nonce_raw[9] = net_packet.transport_protocol();
-            nonce_raw[10] = net_packet.is_gateway() as u8;
-            nonce_raw[11] = net_packet.source_ttl();
+            let nonce_raw = net_packet.head_tag();
             let finger = finger.calculate_finger(&nonce_raw, ciphertext);
             let src_data_len = net_packet.data_len();
             //设置实际长度
@@ -221,6 +212,8 @@ impl AesEcbCipher {
 fn test_openssl_aes_ecb() {
     let d = AesEcbCipher::new_128([0; 16], Some(Finger::new("123")));
     let mut p = NetPacket::new_encrypt([0; 100]).unwrap();
+    let src = p.buffer().to_vec();
     d.encrypt_ipv4(&mut p).unwrap();
     d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
 }

vnt/src/cipher/aes_ecb/rs_aes_ecb.rs

@@ -1,7 +1,8 @@
+use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, BlockEncryptMut, KeyInit};
+use anyhow::anyhow;
+
 use crate::cipher::Finger;
 use crate::protocol::{NetPacket, HEAD_LEN};
-use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, BlockEncryptMut, KeyInit};
-use std::io;
 
 type Aes128EcbEnc = ecb::Encryptor<aes::Aes128>;
 type Aes128EcbDec = ecb::Decryptor<aes::Aes128>;
@@ -46,34 +47,28 @@ impl AesEcbCipher {
     pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if !net_packet.is_encrypt() {
             //未加密的数据直接丢弃
-            return Err(io::Error::new(io::ErrorKind::Other, "not encrypt"));
+            return Err(anyhow!("not encrypt"));
         }
 
         if let Some(finger) = &self.finger {
-            let mut nonce_raw = [0; 12];
-            nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-            nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-            nonce_raw[8] = net_packet.protocol().into();
-            nonce_raw[9] = net_packet.transport_protocol();
-            nonce_raw[10] = net_packet.is_gateway() as u8;
-            nonce_raw[11] = net_packet.source_ttl();
+            let nonce_raw = net_packet.head_tag();
             let len = net_packet.payload().len();
             if len < 12 {
-                return Err(io::Error::new(io::ErrorKind::Other, "payload len <12"));
+                return Err(anyhow!("payload len <12"));
             }
             let secret_body = &net_packet.payload()[..len - 12];
             let finger = finger.calculate_finger(&nonce_raw, secret_body);
             if &finger != &net_packet.payload()[len - 12..] {
-                return Err(io::Error::new(io::ErrorKind::Other, "finger err"));
+                return Err(anyhow!("finger err"));
             }
             net_packet.set_data_len(net_packet.data_len() - finger.len())?;
         }
         if net_packet.payload().len() < 16 {
             log::error!("数据异常,长度{}小于{}", net_packet.payload().len(), 16);
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("data err"));
         }
         let mut out = [0u8; 1024 * 5];
         let rs = match self.key {
@@ -87,32 +82,29 @@ impl AesEcbCipher {
                 //校验头部
                 let src_net_packet = NetPacket::new(buf)?;
                 if src_net_packet.source() != net_packet.source() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.destination() != net_packet.destination() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.protocol() != net_packet.protocol() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.transport_protocol() != net_packet.transport_protocol() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.is_gateway() != net_packet.is_gateway() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.source_ttl() != net_packet.source_ttl() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 net_packet.set_data_len(buf.len())?;
                 net_packet.set_payload(src_net_packet.payload())?;
                 net_packet.set_encrypt_flag(false);
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("aes_ecb解密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("aes_ecb解密失败:{}", e)),
         }
     }
     /// net_packet 必须预留足够长度
@@ -120,7 +112,7 @@ impl AesEcbCipher {
     pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         let mut out = [0u8; 1024 * 5];
         let rs = match self.key {
             AesEcbEnum::AES128ECB(key) => Aes128EcbEnc::new(&key.into())
@@ -136,13 +128,7 @@ impl AesEcbCipher {
                 net_packet.set_encrypt_flag(true);
 
                 if let Some(finger) = &self.finger {
-                    let mut nonce_raw = [0; 12];
-                    nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-                    nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-                    nonce_raw[8] = net_packet.protocol().into();
-                    nonce_raw[9] = net_packet.transport_protocol();
-                    nonce_raw[10] = net_packet.is_gateway() as u8;
-                    nonce_raw[11] = net_packet.source_ttl();
+                    let nonce_raw = net_packet.head_tag();
                     let finger = finger.calculate_finger(&nonce_raw, buf);
                     let src_data_len = net_packet.data_len();
                     //设置实际长度
@@ -152,10 +138,7 @@ impl AesEcbCipher {
                 }
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("aes_ecb加密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("aes_ecb加密失败:{}", e)),
         };
     }
 }

vnt/src/cipher/aes_gcm/aes_gcm_cipher.rs

@@ -1,8 +1,7 @@
-use std::io;
-
 use aes_gcm::aead::consts::{U12, U16};
 use aes_gcm::aead::generic_array::GenericArray;
 use aes_gcm::{AeadInPlace, Aes128Gcm, Aes256Gcm, Key, KeyInit, Nonce, Tag};
+use anyhow::anyhow;
 use rand::RngCore;
 
 use crate::cipher::finger::Finger;
@@ -39,22 +38,16 @@ impl AesGcmCipher {
     pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if !net_packet.is_encrypt() {
             //未加密的数据直接丢弃
-            return Err(io::Error::new(io::ErrorKind::Other, "not encrypt"));
+            return Err(anyhow!("not encrypt"));
         }
         if net_packet.payload().len() < AES_GCM_ENCRYPTION_RESERVED {
             log::error!("数据异常,长度小于{}", AES_GCM_ENCRYPTION_RESERVED);
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("data err"));
         }
-        let mut nonce_raw = [0; 12];
-        nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-        nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-        nonce_raw[8] = net_packet.protocol().into();
-        nonce_raw[9] = net_packet.transport_protocol();
-        nonce_raw[10] = net_packet.is_gateway() as u8;
-        nonce_raw[11] = net_packet.source_ttl();
+        let nonce_raw = net_packet.head_tag();
         let nonce: &GenericArray<u8, U12> = Nonce::from_slice(&nonce_raw);
 
         let mut secret_body = SecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
@@ -62,7 +55,7 @@ impl AesGcmCipher {
         if let Some(finger) = &self.finger {
             let finger = finger.calculate_finger(&nonce_raw, secret_body.en_body());
             if &finger != secret_body.finger() {
-                return Err(io::Error::new(io::ErrorKind::Other, "finger err"));
+                return Err(anyhow!("finger err"));
             }
         }
         let tag: GenericArray<u8, U16> = Tag::clone_from_slice(tag);
@@ -75,10 +68,7 @@ impl AesGcmCipher {
             }
         };
         if let Err(e) = rs {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("解密失败:{}", e),
-            ));
+            return Err(anyhow!("解密失败:{}", e));
         }
         net_packet.set_encrypt_flag(false);
         net_packet.set_data_len(net_packet.data_len() - AES_GCM_ENCRYPTION_RESERVED)?;
@@ -89,17 +79,11 @@ impl AesGcmCipher {
     pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if net_packet.reserve() < AES_GCM_ENCRYPTION_RESERVED {
-            return Err(io::Error::new(io::ErrorKind::Other, "too short"));
+            return Err(anyhow!("too short"));
         }
-        let mut nonce_raw = [0; 12];
-        nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-        nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-        nonce_raw[8] = net_packet.protocol().into();
-        nonce_raw[9] = net_packet.transport_protocol();
-        nonce_raw[10] = net_packet.is_gateway() as u8;
-        nonce_raw[11] = net_packet.source_ttl();
+        let nonce_raw = net_packet.head_tag();
         let nonce: &GenericArray<u8, U12> = Nonce::from_slice(&nonce_raw);
         let data_len = net_packet.data_len() + AES_GCM_ENCRYPTION_RESERVED;
         net_packet.set_data_len(data_len)?;
@@ -123,10 +107,26 @@ impl AesGcmCipher {
                 net_packet.set_encrypt_flag(true);
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("加密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("加密失败:{}", e)),
         };
     }
 }
+
+#[test]
+fn test_aes_gcm() {
+    let d = AesGcmCipher::new_256([0; 32], Some(Finger::new("123")));
+    let mut p =
+        NetPacket::new_encrypt([1; 13 + crate::protocol::body::ENCRYPTION_RESERVED]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+
+    let d = AesGcmCipher::new_256([0; 32], None);
+    let mut p =
+        NetPacket::new_encrypt([0; 13 + crate::protocol::body::ENCRYPTION_RESERVED]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+}

vnt/src/cipher/aes_gcm/mod.rs

@@ -0,0 +1,9 @@
+#[cfg(feature = "ring-cipher")]
+mod ring_aes_gcm_cipher;
+#[cfg(feature = "ring-cipher")]
+pub use ring_aes_gcm_cipher::*;
+
+#[cfg(not(feature = "ring-cipher"))]
+mod aes_gcm_cipher;
+#[cfg(not(feature = "ring-cipher"))]
+pub use aes_gcm_cipher::*;

vnt/src/cipher/aes_gcm/ring_aes_gcm_cipher.rs

@@ -1,9 +1,9 @@
-use crate::cipher::Finger;
+use anyhow::anyhow;
 use rand::RngCore;
 use ring::aead;
 use ring::aead::{LessSafeKey, UnboundKey};
-use std::io;
 
+use crate::cipher::Finger;
 use crate::protocol::body::{SecretBody, AES_GCM_ENCRYPTION_RESERVED};
 use crate::protocol::NetPacket;
 
@@ -53,28 +53,22 @@ impl AesGcmCipher {
     pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if !net_packet.is_encrypt() {
             //未加密的数据直接丢弃
-            return Err(io::Error::new(io::ErrorKind::Other, "not encrypt"));
+            return Err(anyhow!("not encrypt"));
         }
         if net_packet.payload().len() < AES_GCM_ENCRYPTION_RESERVED {
             log::error!("数据异常,长度小于{}", AES_GCM_ENCRYPTION_RESERVED);
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("data err"));
         }
-        let mut nonce_raw = [0; 12];
-        nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-        nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-        nonce_raw[8] = net_packet.protocol().into();
-        nonce_raw[9] = net_packet.transport_protocol();
-        nonce_raw[10] = net_packet.is_gateway() as u8;
-        nonce_raw[11] = net_packet.source_ttl();
+        let nonce_raw = net_packet.head_tag();
         let nonce = aead::Nonce::assume_unique_for_key(nonce_raw);
         let mut secret_body = SecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
         if let Some(finger) = &self.finger {
             let finger = finger.calculate_finger(&nonce_raw, secret_body.en_body());
             if &finger != secret_body.finger() {
-                return Err(io::Error::new(io::ErrorKind::Other, "ring aes finger err"));
+                return Err(anyhow!("ring aes finger err"));
             }
         }
 
@@ -87,10 +81,7 @@ impl AesGcmCipher {
             }
         };
         if let Err(e) = rs {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("解密失败:{}", e),
-            ));
+            return Err(anyhow!("解密失败:{}", e));
         }
         net_packet.set_encrypt_flag(false);
         net_packet.set_data_len(net_packet.data_len() - AES_GCM_ENCRYPTION_RESERVED)?;
@@ -102,14 +93,8 @@ impl AesGcmCipher {
     pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
-        let mut nonce_raw = [0; 12];
-        nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-        nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-        nonce_raw[8] = net_packet.protocol().into();
-        nonce_raw[9] = net_packet.transport_protocol();
-        nonce_raw[10] = net_packet.is_gateway() as u8;
-        nonce_raw[11] = net_packet.source_ttl();
+    ) -> anyhow::Result<()> {
+        let nonce_raw = net_packet.head_tag();
         let nonce = aead::Nonce::assume_unique_for_key(nonce_raw);
         let data_len = net_packet.data_len() + AES_GCM_ENCRYPTION_RESERVED;
         net_packet.set_data_len(data_len)?;
@@ -128,10 +113,7 @@ impl AesGcmCipher {
             Ok(tag) => {
                 let tag = tag.as_ref();
                 if tag.len() != 16 {
-                    return Err(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("加密tag长度错误:{}", tag.len()),
-                    ));
+                    return Err(anyhow!("加密tag长度错误:{}", tag.len()));
                 }
                 secret_body.set_tag(tag)?;
                 if let Some(finger) = &self.finger {
@@ -141,10 +123,26 @@ impl AesGcmCipher {
                 net_packet.set_encrypt_flag(true);
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("加密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("加密失败:{}", e)),
         };
     }
 }
+
+#[test]
+fn test_aes_gcm() {
+    let d = AesGcmCipher::new_256([0; 32], Some(Finger::new("123")));
+    let mut p =
+        NetPacket::new_encrypt([0; 13 + crate::protocol::body::ENCRYPTION_RESERVED]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+
+    let d = AesGcmCipher::new_256([0; 32], None);
+    let mut p =
+        NetPacket::new_encrypt([0; 13 + crate::protocol::body::ENCRYPTION_RESERVED]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+}

vnt/src/cipher/chacha20/mod.rs

@@ -0,0 +1,2 @@
+mod rs_chacha20;
+pub use rs_chacha20::*;

vnt/src/cipher/chacha20/rs_chacha20.rs

@@ -0,0 +1,107 @@
+use aes::cipher::Iv;
+use anyhow::anyhow;
+use chacha20::cipher::{Key, KeyIvInit, StreamCipher};
+use chacha20::ChaCha20;
+
+use crate::cipher::finger::{gen_nonce, gen_random_nonce};
+use crate::cipher::Finger;
+use crate::protocol::body::{
+    IVSecretBody, SecretTail, SecretTailMut, FINGER_RESERVED, RANDOM_RESERVED,
+};
+use crate::protocol::NetPacket;
+
+#[derive(Clone)]
+pub struct ChaCha20Cipher {
+    key: [u8; 32],
+    pub(crate) finger: Option<Finger>,
+}
+
+impl ChaCha20Cipher {
+    pub fn new_256(key: [u8; 32], finger: Option<Finger>) -> Self {
+        Self { key, finger }
+    }
+}
+
+impl ChaCha20Cipher {
+    pub fn key(&self) -> &[u8] {
+        &self.key
+    }
+}
+
+impl ChaCha20Cipher {
+    pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        if !net_packet.is_encrypt() {
+            //未加密的数据直接丢弃
+            return Err(anyhow!("not encrypt"));
+        }
+        let mut head_tag = net_packet.head_tag();
+
+        let mut secret_body = IVSecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
+        if let Some(finger) = &self.finger {
+            let finger = finger.calculate_finger(&head_tag, secret_body.data());
+            if &finger != secret_body.finger() {
+                return Err(anyhow!("ChaCha20 finger err"));
+            }
+        }
+        gen_nonce(&mut head_tag, secret_body.random_buf());
+        ChaCha20::new(
+            Key::<ChaCha20>::from_slice(&self.key),
+            Iv::<ChaCha20>::from_slice(&head_tag),
+        )
+        .apply_keystream(secret_body.data_mut());
+        let len = secret_body.data().len();
+        net_packet.set_encrypt_flag(false);
+        net_packet.set_payload_len(len)?;
+        Ok(())
+    }
+    pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        let data_len = net_packet.data_len();
+        let head_tag = net_packet.head_tag();
+        if let Some(_) = &self.finger {
+            net_packet.set_data_len(data_len + RANDOM_RESERVED + FINGER_RESERVED)?;
+        } else {
+            net_packet.set_data_len(data_len + RANDOM_RESERVED)?;
+        }
+        let mut secret_body = IVSecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
+        let mut nonce = head_tag;
+        secret_body.set_random(&gen_random_nonce(&mut nonce));
+
+        ChaCha20::new(
+            Key::<ChaCha20>::from_slice(&self.key),
+            Iv::<ChaCha20>::from_slice(&nonce),
+        )
+        .apply_keystream(secret_body.data_mut());
+        if let Some(finger) = &self.finger {
+            let finger = finger.calculate_finger(&head_tag, secret_body.data());
+            let mut secret_body = IVSecretBody::new(net_packet.payload_mut(), true)?;
+            secret_body.set_finger(&finger)?;
+        }
+        net_packet.set_encrypt_flag(true);
+        Ok(())
+    }
+}
+
+#[test]
+fn test_chacha20() {
+    let d = ChaCha20Cipher::new_256([0; 32], Some(Finger::new("123")));
+    let mut p =
+        NetPacket::new_encrypt([1; 13 + crate::protocol::body::ENCRYPTION_RESERVED]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+
+    let d = ChaCha20Cipher::new_256([0; 32], None);
+    let mut p =
+        NetPacket::new_encrypt([2; 13 + crate::protocol::body::ENCRYPTION_RESERVED]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+}

vnt/src/cipher/chacha20_poly1305/mod.rs

@@ -0,0 +1,9 @@
+#[cfg(feature = "ring-cipher")]
+mod ring_chacha20_poly1305;
+#[cfg(feature = "ring-cipher")]
+pub use ring_chacha20_poly1305::*;
+
+#[cfg(not(feature = "ring-cipher"))]
+mod rs_chacha20_poly1305;
+#[cfg(not(feature = "ring-cipher"))]
+pub use rs_chacha20_poly1305::*;

vnt/src/cipher/chacha20_poly1305/ring_chacha20_poly1305.rs

@@ -0,0 +1,127 @@
+use anyhow::anyhow;
+
+use ring::aead;
+use ring::aead::{LessSafeKey, UnboundKey};
+
+use crate::cipher::finger::{gen_nonce, gen_random_nonce};
+use crate::cipher::Finger;
+use crate::protocol::body::{
+    AEADSecretBody, SecretTail, SecretTailMut, FINGER_RESERVED, RANDOM_RESERVED, TAG_RESERVED,
+};
+use crate::protocol::NetPacket;
+
+#[derive(Clone)]
+pub struct ChaCha20Poly1305Cipher {
+    key: Vec<u8>,
+    pub(crate) cipher: LessSafeKey,
+    pub(crate) finger: Option<Finger>,
+}
+
+impl ChaCha20Poly1305Cipher {
+    pub fn new_256(key: [u8; 32], finger: Option<Finger>) -> Self {
+        let cipher = LessSafeKey::new(UnboundKey::new(&aead::CHACHA20_POLY1305, &key).unwrap());
+        Self {
+            key: key.to_vec(),
+            cipher,
+            finger,
+        }
+    }
+}
+
+impl ChaCha20Poly1305Cipher {
+    pub fn key(&self) -> &[u8] {
+        &self.key
+    }
+}
+
+impl ChaCha20Poly1305Cipher {
+    pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        if !net_packet.is_encrypt() {
+            //未加密的数据直接丢弃
+            return Err(anyhow!("not encrypt"));
+        }
+        if net_packet.payload().len() < TAG_RESERVED {
+            log::error!("数据异常,长度小于{}", TAG_RESERVED);
+            return Err(anyhow!("data err"));
+        }
+        let mut head_tag = net_packet.head_tag();
+        let mut secret_body = AEADSecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
+        if let Some(finger) = &self.finger {
+            let finger = finger.calculate_finger(&head_tag, secret_body.data_tag_mut());
+            if &finger != secret_body.finger() {
+                return Err(anyhow!("ring CHACHA20_POLY1305 finger err"));
+            }
+        }
+        gen_nonce(&mut head_tag, secret_body.random_buf());
+        let nonce = aead::Nonce::assume_unique_for_key(head_tag);
+        let rs = self
+            .cipher
+            .open_in_place(nonce, aead::Aad::empty(), secret_body.data_tag_mut());
+        if let Err(e) = rs {
+            return Err(anyhow!("ring CHACHA20_POLY1305 解密失败:{}", e));
+        }
+        let len = secret_body.data().len();
+        net_packet.set_encrypt_flag(false);
+        net_packet.set_payload_len(len)?;
+        return Ok(());
+    }
+    /// net_packet 必须预留足够长度
+    /// data_len是有效载荷的长度
+    /// 返回加密后载荷的长度
+    pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        let head_tag = net_packet.head_tag();
+        let data_len = net_packet.data_len();
+        if self.finger.is_some() {
+            net_packet.set_data_len(data_len + TAG_RESERVED + RANDOM_RESERVED + FINGER_RESERVED)?;
+        } else {
+            net_packet.set_data_len(data_len + TAG_RESERVED + RANDOM_RESERVED)?;
+        }
+        let mut secret_body = AEADSecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
+        let mut nonce = head_tag;
+        secret_body.set_random(&gen_random_nonce(&mut nonce));
+        let nonce = aead::Nonce::assume_unique_for_key(nonce);
+        let rs = self.cipher.seal_in_place_separate_tag(
+            nonce,
+            aead::Aad::empty(),
+            secret_body.data_mut(),
+        );
+        match rs {
+            Ok(tag) => {
+                let tag = tag.as_ref();
+                if tag.len() != 16 {
+                    return Err(anyhow!("加密tag长度错误:{}", tag.len()));
+                }
+                secret_body.set_tag(tag)?;
+                if let Some(finger) = &self.finger {
+                    let finger = finger.calculate_finger(&head_tag, secret_body.data_tag_mut());
+                    secret_body.set_finger(&finger)?;
+                }
+                net_packet.set_encrypt_flag(true);
+                Ok(())
+            }
+            Err(e) => Err(anyhow!("ring CHACHA20_POLY1305 加密失败:{}", e)),
+        }
+    }
+}
+
+#[test]
+fn test_ring_chacha20_poly1305() {
+    let d = ChaCha20Poly1305Cipher::new_256([0; 32], Some(Finger::new("123")));
+    let mut p = NetPacket::new_encrypt([0; 73]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+    let d = ChaCha20Poly1305Cipher::new_256([0; 32], None);
+    let mut p = NetPacket::new_encrypt([0; 73]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+}

vnt/src/cipher/chacha20_poly1305/rs_chacha20_poly1305.rs

@@ -0,0 +1,126 @@
+use crate::cipher::finger::{gen_nonce, gen_random_nonce};
+use crate::cipher::Finger;
+use crate::protocol::body::{
+    AEADSecretBody, SecretTail, SecretTailMut, FINGER_RESERVED, RANDOM_RESERVED, TAG_RESERVED,
+};
+use crate::protocol::NetPacket;
+use anyhow::anyhow;
+use chacha20poly1305::aead::{Nonce, Tag};
+use chacha20poly1305::{AeadInPlace, ChaCha20Poly1305, Key, KeyInit};
+
+#[derive(Clone)]
+pub struct ChaCha20Poly1305Cipher {
+    key: Vec<u8>,
+    pub(crate) cipher: ChaCha20Poly1305,
+    pub(crate) finger: Option<Finger>,
+}
+
+impl ChaCha20Poly1305Cipher {
+    pub fn new_256(key: [u8; 32], finger: Option<Finger>) -> Self {
+        let key: &Key = &key.into();
+        let cipher = ChaCha20Poly1305::new(key);
+        Self {
+            key: key.to_vec(),
+            cipher,
+            finger,
+        }
+    }
+}
+
+impl ChaCha20Poly1305Cipher {
+    pub fn key(&self) -> &[u8] {
+        &self.key
+    }
+}
+
+impl ChaCha20Poly1305Cipher {
+    pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        if !net_packet.is_encrypt() {
+            //未加密的数据直接丢弃
+            return Err(anyhow!("not encrypt"));
+        }
+        if net_packet.payload().len() < TAG_RESERVED {
+            log::error!("数据异常,长度小于{}", TAG_RESERVED);
+            return Err(anyhow!("data err"));
+        }
+        let mut head_tag = net_packet.head_tag();
+        let mut secret_body = AEADSecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
+        if let Some(finger) = &self.finger {
+            let finger = finger.calculate_finger(&head_tag, secret_body.data_tag_mut());
+            if &finger != secret_body.finger() {
+                return Err(anyhow!("rs CHACHA20_POLY1305 finger err"));
+            }
+        }
+        gen_nonce(&mut head_tag, secret_body.random_buf());
+        let nonce: Nonce<ChaCha20Poly1305> = head_tag.into();
+        let tag: Tag<ChaCha20Poly1305> =
+            Tag::<ChaCha20Poly1305>::from_slice(secret_body.tag()).clone();
+        if let Err(e) =
+            self.cipher
+                .decrypt_in_place_detached(&nonce, &[], secret_body.data_mut(), &tag)
+        {
+            return Err(anyhow!("rs CHACHA20_POLY1305 decrypt_ipv4 {:?}", e));
+        }
+        let len = secret_body.data().len();
+        net_packet.set_encrypt_flag(false);
+        net_packet.set_payload_len(len)?;
+        Ok(())
+    }
+    /// net_packet 必须预留足够长度
+    /// data_len是有效载荷的长度
+    /// 返回加密后载荷的长度
+    pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        let head_tag = net_packet.head_tag();
+        let data_len = net_packet.data_len();
+        if self.finger.is_some() {
+            net_packet.set_data_len(data_len + TAG_RESERVED + RANDOM_RESERVED + FINGER_RESERVED)?;
+        } else {
+            net_packet.set_data_len(data_len + TAG_RESERVED + RANDOM_RESERVED)?;
+        }
+        let mut secret_body = AEADSecretBody::new(net_packet.payload_mut(), self.finger.is_some())?;
+        let mut nonce = head_tag;
+        secret_body.set_random(&gen_random_nonce(&mut nonce));
+        let nonce = nonce.into();
+        let rs = self
+            .cipher
+            .encrypt_in_place_detached(&nonce, &[], secret_body.data_mut());
+        match rs {
+            Ok(tag) => {
+                let tag: &[u8] = tag.as_ref();
+                if tag.len() != 16 {
+                    return Err(anyhow!("加密tag长度错误:{}", tag.len(),));
+                }
+                secret_body.set_tag(tag)?;
+                if let Some(finger) = &self.finger {
+                    let finger = finger.calculate_finger(&head_tag, secret_body.data_tag_mut());
+                    secret_body.set_finger(&finger)?;
+                }
+                net_packet.set_encrypt_flag(true);
+                Ok(())
+            }
+            Err(e) => Err(anyhow!("rs CHACHA20_POLY1305 加密失败:{}", e)),
+        }
+    }
+}
+
+#[test]
+fn test_rs_chacha20_poly1305() {
+    let d = ChaCha20Poly1305Cipher::new_256([0; 32], Some(Finger::new("123")));
+    let mut p = NetPacket::new_encrypt([0; 73]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+    let d = ChaCha20Poly1305Cipher::new_256([0; 32], None);
+    let mut p = NetPacket::new_encrypt([0; 73]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src);
+}

vnt/src/cipher/cipher.rs

@@ -1,97 +1,99 @@
-#[cfg(feature = "aes_ecb")]
-#[cfg(not(any(feature = "openssl-vendored", feature = "openssl")))]
-use crate::cipher::aes_ecb::AesEcbCipher;
+use std::fmt::Display;
+use std::str::FromStr;
+
+use anyhow::anyhow;
+#[cfg(cipher)]
+use sha2::Digest;
 
 #[cfg(feature = "aes_cbc")]
 use crate::cipher::aes_cbc::AesCbcCipher;
-#[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
-#[cfg(not(feature = "ring-cipher"))]
-use crate::cipher::aes_gcm_cipher::AesGcmCipher;
 #[cfg(feature = "aes_ecb")]
-#[cfg(any(feature = "openssl-vendored", feature = "openssl"))]
-use crate::cipher::openssl_aes_ecb::AesEcbCipher;
+use crate::cipher::aes_ecb::AesEcbCipher;
 #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
-#[cfg(feature = "ring-cipher")]
-use crate::cipher::ring_aes_gcm_cipher::AesGcmCipher;
+use crate::cipher::aes_gcm::AesGcmCipher;
+#[cfg(feature = "chacha20_poly1305")]
+use crate::cipher::chacha20::ChaCha20Cipher;
+#[cfg(feature = "chacha20_poly1305")]
+use crate::cipher::chacha20_poly1305::ChaCha20Poly1305Cipher;
 #[cfg(feature = "sm4_cbc")]
 use crate::cipher::sm4_cbc::Sm4CbcCipher;
-#[cfg(any(
-    feature = "aes_gcm",
-    feature = "server_encrypt",
-    feature = "aes_cbc",
-    feature = "aes_ecb",
-    feature = "sm4_cbc"
-))]
+use crate::cipher::xor::XORCipher;
+#[cfg(cipher)]
 use crate::cipher::Finger;
 use crate::protocol::NetPacket;
-#[cfg(any(
-    feature = "aes_gcm",
-    feature = "server_encrypt",
-    feature = "aes_cbc",
-    feature = "aes_ecb",
-    feature = "sm4_cbc"
-))]
-use sha2::Digest;
-use std::io;
-use std::str::FromStr;
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum CipherModel {
     #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
     AesGcm,
+    #[cfg(feature = "chacha20_poly1305")]
+    Chacha20Poly1305,
+    #[cfg(feature = "chacha20_poly1305")]
+    Chacha20,
     #[cfg(feature = "aes_cbc")]
     AesCbc,
     #[cfg(feature = "aes_ecb")]
     AesEcb,
     #[cfg(feature = "sm4_cbc")]
     Sm4Cbc,
+    Xor,
     None,
 }
 
+impl Display for CipherModel {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let str = match self {
+            #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
+            CipherModel::AesGcm => "aes_gcm".to_string(),
+            #[cfg(feature = "chacha20_poly1305")]
+            CipherModel::Chacha20Poly1305 => "chacha20_poly1305".to_string(),
+            #[cfg(feature = "chacha20_poly1305")]
+            CipherModel::Chacha20 => "chacha20".to_string(),
+            #[cfg(feature = "aes_cbc")]
+            CipherModel::AesCbc => "aes_cbc".to_string(),
+            #[cfg(feature = "aes_ecb")]
+            CipherModel::AesEcb => "aes_ecb".to_string(),
+            #[cfg(feature = "sm4_cbc")]
+            CipherModel::Sm4Cbc => "sm4_cbc".to_string(),
+            CipherModel::Xor => "xor".to_string(),
+            CipherModel::None => "none".to_string(),
+        };
+        write!(f, "{}", str)
+    }
+}
+
 impl FromStr for CipherModel {
     type Err = String;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        #[cfg(not(any(
-            feature = "aes_gcm",
-            feature = "server_encrypt",
-            feature = "aes_cbc",
-            feature = "aes_ecb",
-            feature = "sm4_cbc"
-        )))]
-        return Err(format!("not match '{}', no encrypt", s));
-        #[cfg(any(
-            feature = "aes_gcm",
-            feature = "server_encrypt",
-            feature = "aes_cbc",
-            feature = "aes_ecb",
-            feature = "sm4_cbc"
-        ))]
         match s.to_lowercase().trim() {
             #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
             "aes_gcm" => Ok(CipherModel::AesGcm),
+            #[cfg(feature = "chacha20_poly1305")]
+            "chacha20_poly1305" => Ok(CipherModel::Chacha20Poly1305),
+            #[cfg(feature = "chacha20_poly1305")]
+            "chacha20" => Ok(CipherModel::Chacha20),
             #[cfg(feature = "aes_cbc")]
             "aes_cbc" => Ok(CipherModel::AesCbc),
             #[cfg(feature = "aes_ecb")]
             "aes_ecb" => Ok(CipherModel::AesEcb),
             #[cfg(feature = "sm4_cbc")]
             "sm4_cbc" => Ok(CipherModel::Sm4Cbc),
+            "xor" => Ok(CipherModel::Xor),
             _ => {
                 let mut enums = String::new();
                 #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
                 enums.push_str("/aes_gcm");
+                #[cfg(feature = "chacha20_poly1305")]
+                enums.push_str("/chacha20_poly1305/chacha20");
                 #[cfg(feature = "aes_cbc")]
                 enums.push_str("/aes_cbc");
                 #[cfg(feature = "aes_ecb")]
                 enums.push_str("/aes_ecb");
                 #[cfg(feature = "sm4_cbc")]
                 enums.push_str("/sm4_cbc");
-                let str = if enums.is_empty() {
-                    "no encrypt"
-                } else {
-                    &enums[1..]
-                };
-                Err(format!("not match '{}', enum:{}", s, str))
+                enums.push_str("/xor");
+                Err(format!("not match '{}', enum:{}", s, &enums[1..]))
             }
         }
     }
@@ -101,199 +103,176 @@ impl FromStr for CipherModel {
 pub enum Cipher {
     #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
     AesGcm((AesGcmCipher, Vec<u8>)),
+    #[cfg(feature = "chacha20_poly1305")]
+    Chacha20Poly1305(ChaCha20Poly1305Cipher),
+    #[cfg(feature = "chacha20_poly1305")]
+    Chacha20(ChaCha20Cipher),
     #[cfg(feature = "aes_cbc")]
     AesCbc(AesCbcCipher),
     #[cfg(feature = "aes_ecb")]
     AesEcb(AesEcbCipher),
     #[cfg(feature = "sm4_cbc")]
     Sm4Cbc(Sm4CbcCipher),
+    Xor(XORCipher),
     None,
 }
+
 impl Cipher {
-    #[cfg(not(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    )))]
-    pub fn new_password(
-        _model: CipherModel,
-        _password: Option<String>,
-        _token: Option<String>,
-    ) -> Self {
-        Cipher::None
-    }
-    #[cfg(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    ))]
     pub fn new_password(
         model: CipherModel,
         password: Option<String>,
         token: Option<String>,
-    ) -> Self {
-        let finger = token.map(|token| Finger::new(&token));
+    ) -> anyhow::Result<Self> {
         if let Some(password) = password {
-            let mut hasher = sha2::Sha256::new();
-            hasher.update(password.as_bytes());
-            let key: [u8; 32] = hasher.finalize().into();
+            #[cfg(cipher)]
+            let key: [u8; 32] = {
+                let mut hasher = sha2::Sha256::new();
+                hasher.update(password.as_bytes());
+                hasher.finalize().into()
+            };
             match model {
                 #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
                 CipherModel::AesGcm => {
+                    let finger = token.map(|token| Finger::new(&token));
                     if password.len() < 8 {
                         let aes = AesGcmCipher::new_128(key[..16].try_into().unwrap(), finger);
-                        Cipher::AesGcm((aes, key[..16].to_vec()))
+                        Ok(Cipher::AesGcm((aes, key[..16].to_vec())))
                     } else {
                         let aes = AesGcmCipher::new_256(key, finger);
-                        Cipher::AesGcm((aes, key.to_vec()))
+                        Ok(Cipher::AesGcm((aes, key.to_vec())))
                     }
                 }
+                #[cfg(feature = "chacha20_poly1305")]
+                CipherModel::Chacha20Poly1305 => {
+                    let finger = token.map(|token| Finger::new(&token));
+                    let chacha = ChaCha20Poly1305Cipher::new_256(key, finger);
+                    Ok(Cipher::Chacha20Poly1305(chacha))
+                }
+                #[cfg(feature = "chacha20_poly1305")]
+                CipherModel::Chacha20 => {
+                    let finger = token.map(|token| Finger::new(&token));
+                    let chacha = ChaCha20Cipher::new_256(key, finger);
+                    Ok(Cipher::Chacha20(chacha))
+                }
                 #[cfg(feature = "aes_cbc")]
                 CipherModel::AesCbc => {
+                    let finger = token.map(|token| Finger::new(&token));
                     if password.len() < 8 {
                         let aes = AesCbcCipher::new_128(key[..16].try_into().unwrap(), finger);
-                        Cipher::AesCbc(aes)
+                        Ok(Cipher::AesCbc(aes))
                     } else {
                         let aes = AesCbcCipher::new_256(key, finger);
-                        Cipher::AesCbc(aes)
+                        Ok(Cipher::AesCbc(aes))
                     }
                 }
                 #[cfg(feature = "aes_ecb")]
                 CipherModel::AesEcb => {
+                    let finger = token.map(|token| Finger::new(&token));
                     if password.len() < 8 {
                         let aes = AesEcbCipher::new_128(key[..16].try_into().unwrap(), finger);
-                        Cipher::AesEcb(aes)
+                        Ok(Cipher::AesEcb(aes))
                     } else {
                         let aes = AesEcbCipher::new_256(key, finger);
-                        Cipher::AesEcb(aes)
+                        Ok(Cipher::AesEcb(aes))
                     }
                 }
                 #[cfg(feature = "sm4_cbc")]
                 CipherModel::Sm4Cbc => {
+                    let finger = token.map(|token| Finger::new(&token));
                     let aes = Sm4CbcCipher::new_128(key[..16].try_into().unwrap(), finger);
-                    Cipher::Sm4Cbc(aes)
+                    Ok(Cipher::Sm4Cbc(aes))
                 }
-                CipherModel::None => Cipher::None,
+                CipherModel::Xor => {
+                    if token.is_some() {
+                        Err(anyhow::anyhow!(
+                            "'finger' and 'xor' cannot be used simultaneously"
+                        ))?
+                    }
+                    Ok(Cipher::Xor(XORCipher::new_256(
+                        crate::cipher::xor::simple_hash(&password),
+                    )))
+                }
+                CipherModel::None => Ok(Cipher::None),
             }
         } else {
-            Cipher::None
+            Ok(Cipher::None)
         }
     }
-    #[cfg(not(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    )))]
-    pub fn new_key(_key: [u8; 32], _token: String) -> io::Result<Self> {
-        Err(io::Error::new(io::ErrorKind::Other, "key error"))
+    #[cfg(not(any(feature = "aes_gcm", feature = "server_encrypt")))]
+    pub fn new_key(_key: [u8; 32], _token: String) -> anyhow::Result<Self> {
+        Err(anyhow!("key error"))
     }
-    #[cfg(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    ))]
-    pub fn new_key(key: [u8; 32], token: String) -> io::Result<Self> {
+    #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
+    pub fn new_key(key: [u8; 32], token: String) -> anyhow::Result<Self> {
         let finger = Some(Finger::new(&token));
         match key.len() {
-            #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
             16 => {
                 let aes = AesGcmCipher::new_128(key[..16].try_into().unwrap(), finger);
                 Ok(Cipher::AesGcm((aes, key[..16].to_vec())))
             }
-            #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
             32 => {
                 let aes = AesGcmCipher::new_256(key, finger);
                 Ok(Cipher::AesGcm((aes, key.to_vec())))
             }
-            _ => Err(io::Error::new(io::ErrorKind::Other, "key error")),
+            _ => Err(anyhow!("key error")),
         }
     }
     pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         match self {
             #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
             Cipher::AesGcm((aes_gcm, _)) => aes_gcm.decrypt_ipv4(net_packet),
             #[cfg(feature = "aes_cbc")]
             Cipher::AesCbc(aes_cbc) => aes_cbc.decrypt_ipv4(net_packet),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20Poly1305(chacha20poly1305) => chacha20poly1305.decrypt_ipv4(net_packet),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20(chacha20) => chacha20.decrypt_ipv4(net_packet),
             #[cfg(feature = "aes_ecb")]
             Cipher::AesEcb(aes_ecb) => aes_ecb.decrypt_ipv4(net_packet),
             #[cfg(feature = "sm4_cbc")]
             Cipher::Sm4Cbc(sm4_cbc) => sm4_cbc.decrypt_ipv4(net_packet),
+            Cipher::Xor(xor) => xor.decrypt_ipv4(net_packet),
             Cipher::None => {
                 if net_packet.is_encrypt() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "not key"));
+                    return Err(anyhow!("not key"));
                 }
                 Ok(())
             }
         }
     }
-    #[cfg(not(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    )))]
-    pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
-        &self,
-        _net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
-        Ok(())
-    }
-    #[cfg(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    ))]
     pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         match self {
             #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
             Cipher::AesGcm((aes_gcm, _)) => aes_gcm.encrypt_ipv4(net_packet),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20Poly1305(chacha20poly1305) => chacha20poly1305.encrypt_ipv4(net_packet),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20(chacha20) => chacha20.encrypt_ipv4(net_packet),
             #[cfg(feature = "aes_cbc")]
             Cipher::AesCbc(aes_cbc) => aes_cbc.encrypt_ipv4(net_packet),
             #[cfg(feature = "aes_ecb")]
             Cipher::AesEcb(aes_ecb) => aes_ecb.encrypt_ipv4(net_packet),
             #[cfg(feature = "sm4_cbc")]
             Cipher::Sm4Cbc(sm4_cbc) => sm4_cbc.encrypt_ipv4(net_packet),
+            Cipher::Xor(xor) => xor.encrypt_ipv4(net_packet),
             Cipher::None => Ok(()),
         }
     }
-    #[cfg(not(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    )))]
+    #[cfg(not(cipher))]
     pub fn check_finger<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         _net_packet: &NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         Ok(())
     }
-    #[cfg(any(
-        feature = "aes_gcm",
-        feature = "server_encrypt",
-        feature = "aes_cbc",
-        feature = "aes_ecb",
-        feature = "sm4_cbc"
-    ))]
-    pub fn check_finger<B: AsRef<[u8]>>(&self, net_packet: &NetPacket<B>) -> io::Result<()> {
+    #[cfg(cipher)]
+    pub fn check_finger<B: AsRef<[u8]>>(&self, net_packet: &NetPacket<B>) -> anyhow::Result<()> {
         match self {
             #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
             Cipher::AesGcm((aes_gcm, _)) => aes_gcm
@@ -301,6 +280,18 @@ impl Cipher {
                 .as_ref()
                 .map(|f| f.check_finger(net_packet))
                 .unwrap_or(Ok(())),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20Poly1305(chacha20poly1305) => chacha20poly1305
+                .finger
+                .as_ref()
+                .map(|f| f.check_finger(net_packet))
+                .unwrap_or(Ok(())),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20(chacha20) => chacha20
+                .finger
+                .as_ref()
+                .map(|f| f.check_finger(net_packet))
+                .unwrap_or(Ok(())),
             #[cfg(feature = "aes_cbc")]
             Cipher::AesCbc(aes_cbc) => aes_cbc
                 .finger
@@ -319,6 +310,7 @@ impl Cipher {
                 .as_ref()
                 .map(|f| f.check_finger(net_packet))
                 .unwrap_or(Ok(())),
+            Cipher::Xor(_) => Ok(()),
             Cipher::None => Ok(()),
         }
     }
@@ -326,12 +318,17 @@ impl Cipher {
         match self {
             #[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
             Cipher::AesGcm((_, key)) => Some(key),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20Poly1305(chacha20poly1305) => Some(chacha20poly1305.key()),
+            #[cfg(feature = "chacha20_poly1305")]
+            Cipher::Chacha20(chacha20) => Some(chacha20.key()),
             #[cfg(feature = "aes_cbc")]
             Cipher::AesCbc(aes_cbc) => Some(aes_cbc.key()),
             #[cfg(feature = "aes_ecb")]
             Cipher::AesEcb(aes_ecb) => Some(aes_ecb.key()),
             #[cfg(feature = "sm4_cbc")]
             Cipher::Sm4Cbc(sm4_cbc) => Some(sm4_cbc.key()),
+            Cipher::Xor(xor) => Some(xor.key()),
             Cipher::None => None,
         }
     }

vnt/src/cipher/finger.rs

@@ -1,4 +1,5 @@
-use std::io;
+use anyhow::anyhow;
+use rand::RngCore;
 
 use sha2::Digest;
 
@@ -16,15 +17,15 @@ impl Finger {
         let hash: [u8; 32] = hasher.finalize().into();
         Finger { hash }
     }
-    pub fn check_finger<B: AsRef<[u8]>>(&self, net_packet: &NetPacket<B>) -> io::Result<()> {
+    pub fn check_finger<B: AsRef<[u8]>>(&self, net_packet: &NetPacket<B>) -> anyhow::Result<()> {
         if !net_packet.is_encrypt() {
             //未加密的数据直接丢弃
-            return Err(io::Error::new(io::ErrorKind::Other, "not encrypt"));
+            return Err(anyhow!("not encrypt"));
         }
         let payload_len = net_packet.payload().len();
         if payload_len < 12 {
             log::error!("数据异常,长度小于{}", 12);
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("data err"));
         }
         let mut nonce_raw = [0; 12];
         nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
@@ -36,7 +37,7 @@ impl Finger {
         let payload = net_packet.payload();
         let finger = self.calculate_finger(&nonce_raw, &payload[..payload_len - 12]);
         if &finger[..] != &payload[payload_len - 12..] {
-            return Err(io::Error::new(io::ErrorKind::Other, "finger err"));
+            return Err(anyhow!("finger err"));
         }
         Ok(())
     }
@@ -49,3 +50,27 @@ impl Finger {
         return key[20..].try_into().unwrap();
     }
 }
+impl<B: AsRef<[u8]>> NetPacket<B> {
+    pub fn head_tag(&self) -> [u8; 12] {
+        let mut tag = [0; 12];
+        tag[0..4].copy_from_slice(&self.buffer()[4..8]);
+        tag[4..8].copy_from_slice(&self.buffer()[8..12]);
+        tag[8] = self.protocol().into();
+        tag[9] = self.transport_protocol();
+        tag[10] = self.is_gateway() as u8;
+        tag[11] = self.source_ttl();
+        tag
+    }
+}
+pub fn gen_nonce(tag: &mut [u8], random: &[u8]) {
+    tag[8] = random[0] ^ tag[8];
+    tag[9] = random[1] ^ tag[9];
+    tag[10] = random[2] ^ tag[10];
+    tag[11] = random[3] ^ tag[11];
+}
+pub fn gen_random_nonce(tag: &mut [u8; 12]) -> [u8; 4] {
+    let mut random = [0; 4];
+    rand::thread_rng().fill_bytes(&mut random);
+    gen_nonce(tag, &random);
+    random
+}

vnt/src/cipher/mod.rs

@@ -1,40 +1,32 @@
-#[cfg(feature = "aes_cbc")]
-mod aes_cbc;
-#[cfg(feature = "aes_ecb")]
-#[cfg(not(any(feature = "openssl-vendored", feature = "openssl")))]
-mod aes_ecb;
-#[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
-#[cfg(not(feature = "ring-cipher"))]
-mod aes_gcm_cipher;
 mod cipher;
-#[cfg(any(
-    feature = "aes_gcm",
-    feature = "server_encrypt",
-    feature = "aes_cbc",
-    feature = "aes_ecb",
-    feature = "sm4_cbc"
-))]
+#[cfg(cipher)]
 mod finger;
-#[cfg(feature = "aes_ecb")]
-#[cfg(any(feature = "openssl-vendored", feature = "openssl"))]
-mod openssl_aes_ecb;
-#[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
-#[cfg(feature = "ring-cipher")]
-mod ring_aes_gcm_cipher;
 
-#[cfg(feature = "sm4_cbc")]
-mod sm4_cbc;
 pub use cipher::Cipher;
 pub use cipher::CipherModel;
-#[cfg(any(
-    feature = "aes_gcm",
-    feature = "server_encrypt",
-    feature = "aes_cbc",
-    feature = "aes_ecb",
-    feature = "sm4_cbc"
-))]
+#[cfg(cipher)]
 pub use finger::Finger;
 #[cfg(feature = "server_encrypt")]
 mod rsa_cipher;
 #[cfg(feature = "server_encrypt")]
 pub use rsa_cipher::RsaCipher;
+
+#[cfg(any(feature = "aes_gcm", feature = "server_encrypt"))]
+mod aes_gcm;
+
+#[cfg(feature = "chacha20_poly1305")]
+mod chacha20;
+#[cfg(feature = "chacha20_poly1305")]
+mod chacha20_poly1305;
+
+#[cfg(feature = "aes_ecb")]
+mod aes_ecb;
+
+#[cfg(feature = "aes_cbc")]
+mod aes_cbc;
+
+#[cfg(feature = "sm4_cbc")]
+mod sm4_cbc;
+
+mod xor;
+pub use xor::simple_hash;

vnt/src/cipher/rsa_cipher.rs

@@ -1,5 +1,5 @@
-use crate::protocol::NetPacket;
 use std::io;
+
 use {
     crate::protocol::body::{RsaSecretBody, RSA_ENCRYPTION_RESERVED},
     rand::Rng,
@@ -9,6 +9,8 @@ use {
     spki::{DecodePublicKey, EncodePublicKey},
 };
 
+use crate::protocol::NetPacket;
+
 #[derive(Clone)]
 pub struct RsaCipher {
     inner: Inner,
@@ -16,13 +18,15 @@ pub struct RsaCipher {
 #[derive(Clone)]
 struct Inner {
     public_key: RsaPublicKey,
+    finger: String,
 }
 
 impl RsaCipher {
     pub fn new(der: &[u8]) -> io::Result<Self> {
         match RsaPublicKey::from_public_key_der(der) {
             Ok(public_key) => {
-                let inner = Inner { public_key };
+                let finger = finger(&public_key)?;
+                let inner = Inner { public_key, finger };
                 Ok(Self { inner })
             }
             Err(e) => Err(io::Error::new(
@@ -31,30 +35,32 @@ impl RsaCipher {
             )),
         }
     }
-
-    pub fn finger(&self) -> io::Result<String> {
-        match self.inner.public_key.to_public_key_der() {
-            Ok(der) => match rsa::pkcs8::SubjectPublicKeyInfoRef::from_der(der.as_bytes()) {
-                Ok(spki) => match spki.fingerprint_base64() {
-                    Ok(finger) => Ok(finger),
-                    Err(e) => Err(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("fingerprint_base64 error {}", e),
-                    )),
-                },
+    pub fn finger(&self) -> &String {
+        &self.inner.finger
+    }
+    pub fn public_key(&self) -> io::Result<&RsaPublicKey> {
+        return Ok(&self.inner.public_key);
+    }
+}
+pub fn finger(public_key: &RsaPublicKey) -> io::Result<String> {
+    match public_key.to_public_key_der() {
+        Ok(der) => match rsa::pkcs8::SubjectPublicKeyInfoRef::from_der(der.as_bytes()) {
+            Ok(spki) => match spki.fingerprint_base64() {
+                Ok(finger) => Ok(finger),
                 Err(e) => Err(io::Error::new(
                     io::ErrorKind::Other,
-                    format!("from_der error {}", e),
+                    format!("fingerprint_base64 error {}", e),
                 )),
             },
             Err(e) => Err(io::Error::new(
                 io::ErrorKind::Other,
-                format!("to_public_key_der error {}", e),
+                format!("from_der error {}", e),
             )),
-        }
-    }
-    pub fn public_key(&self) -> io::Result<&RsaPublicKey> {
-        return Ok(&self.inner.public_key);
+        },
+        Err(e) => Err(io::Error::new(
+            io::ErrorKind::Other,
+            format!("to_public_key_der error {}", e),
+        )),
     }
 }
 

vnt/src/cipher/sm4_cbc/mod.rs

@@ -0,0 +1,2 @@
+mod rs_sm4_cbc;
+pub use rs_sm4_cbc::*;

vnt/src/cipher/sm4_cbc/rs_sm4_cbc.rs

@@ -1,9 +1,9 @@
 use crate::cipher::Finger;
 use crate::protocol::{NetPacket, HEAD_LEN};
+use anyhow::anyhow;
 use libsm::sm4::cipher_mode::CipherMode;
 use libsm::sm4::Sm4CipherMode;
 use rand::RngCore;
-use std::io;
 
 pub struct Sm4CbcCipher {
     key: [u8; 16],
@@ -41,28 +41,22 @@ impl Sm4CbcCipher {
     pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if !net_packet.is_encrypt() {
             //未加密的数据直接丢弃
-            return Err(io::Error::new(io::ErrorKind::Other, "not encrypt"));
+            return Err(anyhow!("not encrypt"));
         }
 
         if let Some(finger) = &self.finger {
-            let mut nonce_raw = [0; 12];
-            nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-            nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-            nonce_raw[8] = net_packet.protocol().into();
-            nonce_raw[9] = net_packet.transport_protocol();
-            nonce_raw[10] = net_packet.is_gateway() as u8;
-            nonce_raw[11] = net_packet.source_ttl();
+            let nonce_raw = net_packet.head_tag();
             let len = net_packet.payload().len();
             if len < 12 {
-                return Err(io::Error::new(io::ErrorKind::Other, "payload len <12"));
+                return Err(anyhow!("payload len <12"));
             }
             let secret_body = &net_packet.payload()[..len - 12];
             let finger = finger.calculate_finger(&nonce_raw, secret_body);
             if &finger != &net_packet.payload()[len - 12..] {
-                return Err(io::Error::new(io::ErrorKind::Other, "finger err"));
+                return Err(anyhow!("finger err"));
             }
             net_packet.set_data_len(net_packet.data_len() - finger.len())?;
         }
@@ -70,7 +64,7 @@ impl Sm4CbcCipher {
         let len = payload.len();
         if len < 16 || len > 1024 * 4 {
             log::error!("数据异常,长度{}小于16或大于4096", len);
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("data err"));
         }
         let mut out = [0u8; 1024 * 4];
         let data = &payload[..len - 16];
@@ -79,32 +73,29 @@ impl Sm4CbcCipher {
             Ok(len) => {
                 let src_net_packet = NetPacket::new(&out[..len])?;
                 if src_net_packet.source() != net_packet.source() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.destination() != net_packet.destination() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.protocol() != net_packet.protocol() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.transport_protocol() != net_packet.transport_protocol() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.is_gateway() != net_packet.is_gateway() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 if src_net_packet.source_ttl() != net_packet.source_ttl() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+                    return Err(anyhow!("data err"));
                 }
                 net_packet.set_data_len(len)?;
                 net_packet.set_payload(src_net_packet.payload())?;
                 net_packet.set_encrypt_flag(false);
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("sm4_cbc解密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("sm4_cbc解密失败:{}", e)),
         }
     }
     /// net_packet 必须预留足够长度
@@ -112,7 +103,7 @@ impl Sm4CbcCipher {
     pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
         &self,
         net_packet: &mut NetPacket<B>,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         let mut out = [0u8; 1024 * 4];
         let mut iv = [0u8; 16];
         rand::thread_rng().fill_bytes(&mut iv);
@@ -121,7 +112,7 @@ impl Sm4CbcCipher {
                 "数据异常,长度{}大于1024 * 4 - 32",
                 net_packet.buffer().len()
             );
-            return Err(io::Error::new(io::ErrorKind::Other, "data err"));
+            return Err(anyhow!("data err"));
         }
         match self.cipher.encrypt(net_packet.buffer(), &iv, &mut out) {
             Ok(len) => {
@@ -129,13 +120,7 @@ impl Sm4CbcCipher {
                 net_packet.payload_mut()[..len].copy_from_slice(&out[..len]);
                 net_packet.payload_mut()[len..].copy_from_slice(&iv);
                 if let Some(finger) = &self.finger {
-                    let mut nonce_raw = [0; 12];
-                    nonce_raw[0..4].copy_from_slice(&net_packet.source().octets());
-                    nonce_raw[4..8].copy_from_slice(&net_packet.destination().octets());
-                    nonce_raw[8] = net_packet.protocol().into();
-                    nonce_raw[9] = net_packet.transport_protocol();
-                    nonce_raw[10] = net_packet.is_gateway() as u8;
-                    nonce_raw[11] = net_packet.source_ttl();
+                    let nonce_raw = net_packet.head_tag();
                     let finger = finger.calculate_finger(&nonce_raw, net_packet.payload());
                     let src_data_len = net_packet.data_len();
                     //设置实际长度
@@ -146,10 +131,7 @@ impl Sm4CbcCipher {
                 net_packet.set_encrypt_flag(true);
                 Ok(())
             }
-            Err(e) => Err(io::Error::new(
-                io::ErrorKind::Other,
-                format!("sm4_cbc加密失败:{}", e),
-            )),
+            Err(e) => Err(anyhow!("sm4_cbc加密失败:{}", e)),
         }
     }
 }

vnt/src/cipher/xor/mod.rs

@@ -0,0 +1,2 @@
+mod xor;
+pub use xor::*;

vnt/src/cipher/xor/xor.rs

@@ -0,0 +1,84 @@
+use anyhow::anyhow;
+
+use crate::protocol::NetPacket;
+
+pub fn simple_hash(input: &str) -> [u8; 32] {
+    let mut result = [0u8; 32];
+    let bytes = input.as_bytes();
+    for (index, v) in result.iter_mut().enumerate() {
+        *v = bytes[index % bytes.len()];
+    }
+
+    let mut state = 0u8;
+
+    for (i, &byte) in bytes.iter().enumerate() {
+        let combined = byte.wrapping_add(state).rotate_left((i % 8) as u32);
+        result[i % 32] ^= combined;
+        state = state.wrapping_add(byte).rotate_left(3);
+    }
+
+    for i in 0..32 {
+        result[i] = result[i]
+            .rotate_left((result[(i + 1) % 32] % 8) as u32)
+            .wrapping_add(state);
+        state = state.wrapping_add(result[i]).rotate_left(3);
+    }
+
+    result
+}
+
+#[derive(Clone)]
+pub struct XORCipher {
+    key: [u8; 32],
+}
+
+impl XORCipher {
+    pub fn new_256(key: [u8; 32]) -> Self {
+        Self { key }
+    }
+}
+
+impl XORCipher {
+    pub fn key(&self) -> &[u8] {
+        &self.key
+    }
+}
+
+impl XORCipher {
+    pub fn decrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        if !net_packet.is_encrypt() {
+            //未加密的数据直接丢弃
+            return Err(anyhow!("not encrypt"));
+        }
+        let key = &self.key;
+        for (i, byte) in net_packet.payload_mut().iter_mut().enumerate() {
+            *byte ^= key[i & 31];
+        }
+        net_packet.set_encrypt_flag(false);
+        Ok(())
+    }
+    pub fn encrypt_ipv4<B: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        net_packet: &mut NetPacket<B>,
+    ) -> anyhow::Result<()> {
+        net_packet.set_encrypt_flag(true);
+        let key = &self.key;
+        for (i, byte) in net_packet.payload_mut().iter_mut().enumerate() {
+            *byte ^= key[i & 31];
+        }
+        Ok(())
+    }
+}
+
+#[test]
+fn test_xor() {
+    let d = XORCipher::new_256(simple_hash("password"));
+    let mut p = NetPacket::new_encrypt([0; 1000]).unwrap();
+    let src = p.buffer().to_vec();
+    d.encrypt_ipv4(&mut p).unwrap();
+    d.decrypt_ipv4(&mut p).unwrap();
+    assert_eq!(p.buffer(), &src)
+}

vnt/src/compression/lz4_compress.rs

@@ -0,0 +1,33 @@
+use anyhow::anyhow;
+
+use crate::protocol::NetPacket;
+
+#[derive(Clone)]
+pub struct Lz4Compressor;
+
+impl Lz4Compressor {
+    pub fn compress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        in_net_packet: &NetPacket<I>,
+        out: &mut NetPacket<O>,
+    ) -> anyhow::Result<()> {
+        out.set_data_len_max();
+        let len = match lz4_flex::compress_into(in_net_packet.payload(), out.payload_mut()) {
+            Ok(len) => len,
+            Err(e) => Err(anyhow!("Lz4 compress {}", e))?,
+        };
+        out.set_payload_len(len)?;
+        Ok(())
+    }
+    pub fn decompress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        in_net_packet: &NetPacket<I>,
+        out: &mut NetPacket<O>,
+    ) -> anyhow::Result<()> {
+        out.set_data_len_max();
+        let len = match lz4_flex::decompress_into(in_net_packet.payload(), out.payload_mut()) {
+            Ok(len) => len,
+            Err(e) => Err(anyhow!("Lz4 decompress {}", e))?,
+        };
+        out.set_payload_len(len)?;
+        Ok(())
+    }
+}

vnt/src/compression/mod.rs

@@ -0,0 +1,220 @@
+use std::str::FromStr;
+
+use anyhow::anyhow;
+
+#[cfg(feature = "lz4_compress")]
+use crate::compression::lz4_compress::Lz4Compressor;
+#[cfg(feature = "zstd_compress")]
+use crate::compression::zstd_compress::ZstdCompressor;
+use crate::protocol::extension::CompressionAlgorithm;
+#[cfg(feature = "zstd_compress")]
+use zstd::zstd_safe::CompressionLevel;
+
+use crate::protocol::NetPacket;
+
+#[cfg(feature = "lz4_compress")]
+mod lz4_compress;
+#[cfg(feature = "zstd_compress")]
+mod zstd_compress;
+
+#[derive(Clone, Copy, Debug)]
+pub enum Compressor {
+    #[cfg(feature = "lz4_compress")]
+    Lz4,
+    #[cfg(feature = "zstd_compress")]
+    Zstd(CompressionLevel),
+    None,
+}
+
+impl FromStr for Compressor {
+    type Err = String;
+    #[cfg(not(any(feature = "lz4_compress", feature = "zstd_compress")))]
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Err(format!("not match '{}', Compression not supported", s))
+    }
+    #[cfg(any(feature = "lz4_compress", feature = "zstd_compress"))]
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let str = s.trim().to_lowercase();
+        match str.as_str() {
+            #[cfg(feature = "lz4_compress")]
+            "lz4" => Ok(Compressor::Lz4),
+            #[cfg(feature = "zstd_compress")]
+            "zstd" => Ok(Compressor::Zstd(9)),
+            "none" => Ok(Compressor::None),
+            _ => {
+                #[cfg(feature = "zstd_compress")]
+                {
+                    let string_array: Vec<String> = str.split(',').map(|s| s.to_string()).collect();
+                    if string_array.len() != 2 || string_array[0] != "zstd" {
+                        return Err(format!("not match '{}', exp: zstd,10", s));
+                    }
+                    return match CompressionLevel::from_str(&string_array[1]) {
+                        Ok(level) => Ok(Compressor::Zstd(level)),
+                        Err(_) => Err(format!("not match '{}', exp: zstd,10", s)),
+                    };
+                }
+                #[cfg(not(feature = "zstd_compress"))]
+                #[cfg(feature = "lz4_compress")]
+                return Err(format!("not match '{}', exp: lz4", s));
+            }
+        }
+    }
+}
+
+#[cfg(not(any(feature = "lz4_compress", feature = "zstd_compress")))]
+impl Compressor {
+    pub fn compress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        _in_net_packet: &NetPacket<I>,
+        _out: &mut NetPacket<O>,
+    ) -> anyhow::Result<bool> {
+        Ok(false)
+    }
+    pub fn decompress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        _algorithm: CompressionAlgorithm,
+        _in_net_packet: &NetPacket<I>,
+        _out: &mut NetPacket<O>,
+    ) -> anyhow::Result<()> {
+        Err(anyhow!("Unsupported decompress"))
+    }
+}
+
+#[cfg(any(feature = "lz4_compress", feature = "zstd_compress"))]
+impl Compressor {
+    pub fn compress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        &self,
+        in_net_packet: &NetPacket<I>,
+        out: &mut NetPacket<O>,
+    ) -> anyhow::Result<bool> {
+        match self {
+            #[cfg(feature = "lz4_compress")]
+            Compressor::Lz4 => {
+                if in_net_packet.data_len() < 128 {
+                    return Ok(false);
+                }
+                Lz4Compressor::compress(in_net_packet, out)?;
+                let mut compression_extension_tail = out.append_compression_extension_tail()?;
+                compression_extension_tail.set_algorithm(CompressionAlgorithm::Lz4);
+                //压缩没效果，则放弃压缩
+                if out.data_len() >= in_net_packet.data_len() - 16 {
+                    return Ok(false);
+                }
+                return Ok(true);
+            }
+            #[cfg(feature = "zstd_compress")]
+            Compressor::Zstd(level) => {
+                if in_net_packet.data_len() < 128 {
+                    return Ok(false);
+                }
+                ZstdCompressor::compress(*level, in_net_packet, out)?;
+                let mut compression_extension_tail = out.append_compression_extension_tail()?;
+                compression_extension_tail.set_algorithm(CompressionAlgorithm::Zstd);
+                //压缩没效果，则放弃压缩
+                if out.data_len() >= in_net_packet.data_len() - 16 {
+                    return Ok(false);
+                }
+                return Ok(true);
+            }
+            Compressor::None => {}
+        }
+        Ok(false)
+    }
+    pub fn decompress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        algorithm: CompressionAlgorithm,
+        in_net_packet: &NetPacket<I>,
+        out: &mut NetPacket<O>,
+    ) -> anyhow::Result<()> {
+        match algorithm {
+            #[cfg(feature = "lz4_compress")]
+            CompressionAlgorithm::Lz4 => Lz4Compressor::decompress(in_net_packet, out),
+            #[cfg(feature = "zstd_compress")]
+            CompressionAlgorithm::Zstd => ZstdCompressor::decompress(in_net_packet, out),
+            _ => Err(anyhow!("Unknown decompress {:?}", algorithm)),
+        }
+    }
+}
+
+#[test]
+#[cfg(feature = "zstd_compress")]
+fn test_lz4() {
+    use crate::protocol::extension::{CompressionAlgorithm, ExtensionTailPacket};
+    let lz4 = Compressor::Lz4;
+    let in_packet = NetPacket::new([
+        65, 108, 105, 99, 101, 32, 119, 97, 116, 32, 98, 101, 103, 105, 110, 110, 105, 110, 103,
+        32, 116, 111, 32, 103, 101, 116, 32, 118, 101, 114, 121, 32, 116, 105, 114, 101, 100, 32,
+        111, 102, 32, 115, 105, 116, 116, 105, 110, 103, 32, 98, 121, 32, 104, 101, 114, 32, 115,
+        105, 115, 116, 101, 114, 32, 111, 110, 32, 116, 104, 101, 32, 98, 97, 110, 107, 44, 32, 97,
+        110, 100, 32, 111, 102, 32, 104, 97, 118, 105, 110, 103, 32, 110, 111, 116, 104, 105, 110,
+        103, 32, 116, 111, 32, 100, 111, 58, 32, 111, 110, 99, 101, 32, 111, 114, 32, 116, 119,
+        105, 99, 101, 32, 115, 104, 101, 32, 104, 97, 100, 32, 112, 101, 101, 112, 101, 100, 32,
+        105, 110, 116, 111, 32, 116, 104, 101, 32, 98, 111, 111, 107, 32, 104, 101, 114, 32, 115,
+        105, 115, 116, 101, 114, 32, 119, 97, 115, 32, 114, 101, 97, 100, 105, 110, 103, 44, 32,
+        98, 117, 116, 32, 105, 116, 32, 104, 97, 100, 32, 110, 111, 32, 112, 105, 99, 116, 117,
+        114, 101, 115, 32, 111, 114, 32, 99, 111, 110, 118, 101, 114, 115, 97, 116, 105,
+    ])
+    .unwrap();
+    let mut out_packet = NetPacket::new([0; 1000]).unwrap();
+    let mut src_out_packet = NetPacket::new([0; 1000]).unwrap();
+    lz4.compress(&in_packet, &mut out_packet).unwrap();
+    let tail = out_packet.split_tail_packet().unwrap();
+    match tail {
+        ExtensionTailPacket::Compression(c) => match c.algorithm() {
+            CompressionAlgorithm::Lz4 => {
+                Compressor::decompress(CompressionAlgorithm::Lz4, &out_packet, &mut src_out_packet)
+                    .unwrap();
+            }
+            _ => {
+                unimplemented!()
+            }
+        },
+        _ => {
+            unimplemented!()
+        }
+    }
+    assert!(!out_packet.is_extension());
+    assert_eq!(in_packet.payload(), src_out_packet.payload())
+}
+#[test]
+#[cfg(feature = "zstd_compress")]
+fn test_zstd() {
+    use crate::protocol::extension::{CompressionAlgorithm, ExtensionTailPacket};
+    let zstd = Compressor::Zstd(22);
+    let in_packet = NetPacket::new([
+        65, 108, 105, 99, 101, 32, 119, 97, 115, 32, 98, 101, 103, 105, 110, 110, 105, 110, 103,
+        32, 116, 111, 32, 103, 101, 116, 32, 118, 101, 114, 121, 32, 116, 105, 114, 101, 100, 32,
+        111, 102, 32, 115, 105, 116, 116, 105, 110, 103, 32, 98, 121, 32, 104, 101, 114, 32, 115,
+        105, 115, 116, 101, 114, 32, 111, 110, 32, 116, 104, 101, 32, 98, 97, 110, 107, 44, 32, 97,
+        110, 100, 32, 111, 102, 32, 104, 97, 118, 105, 110, 103, 32, 110, 111, 116, 104, 105, 110,
+        103, 32, 116, 111, 32, 100, 111, 58, 32, 111, 110, 99, 101, 32, 111, 114, 32, 116, 119,
+        105, 99, 101, 32, 115, 104, 101, 32, 104, 97, 100, 32, 112, 101, 101, 112, 101, 100, 32,
+        105, 110, 116, 111, 32, 116, 104, 101, 32, 98, 111, 111, 107, 32, 104, 101, 114, 32, 115,
+        105, 115, 116, 101, 114, 32, 119, 97, 115, 32, 114, 101, 97, 100, 105, 110, 103, 44, 32,
+        98, 117, 116, 32, 105, 116, 32, 104, 97, 100, 32, 110, 111, 32, 112, 105, 99, 116, 117,
+        114, 101, 115, 32, 111, 114, 32, 99, 111, 110, 118, 101, 114, 115, 97, 116, 105,
+    ])
+    .unwrap();
+    let mut out_packet = NetPacket::new([0; 1000]).unwrap();
+    let mut src_out_packet = NetPacket::new([0; 1000]).unwrap();
+    zstd.compress(&in_packet, &mut out_packet).unwrap();
+    let tail = out_packet.split_tail_packet().unwrap();
+    match tail {
+        ExtensionTailPacket::Compression(c) => match c.algorithm() {
+            CompressionAlgorithm::Zstd => {
+                Compressor::decompress(
+                    CompressionAlgorithm::Zstd,
+                    &out_packet,
+                    &mut src_out_packet,
+                )
+                .unwrap();
+            }
+            _ => {
+                unimplemented!()
+            }
+        },
+        _ => {
+            unimplemented!()
+        }
+    }
+    assert!(!out_packet.is_extension());
+    assert_eq!(in_packet.payload(), src_out_packet.payload())
+}

vnt/src/compression/zstd_compress.rs

@@ -0,0 +1,38 @@
+use crate::protocol::NetPacket;
+use anyhow::anyhow;
+use zstd::zstd_safe::CompressionLevel;
+
+#[derive(Clone)]
+pub struct ZstdCompressor;
+
+impl ZstdCompressor {
+    pub fn compress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        compression_level: CompressionLevel,
+        in_net_packet: &NetPacket<I>,
+        out: &mut NetPacket<O>,
+    ) -> anyhow::Result<()> {
+        out.set_data_len_max();
+        let len = match zstd::zstd_safe::compress(
+            out.payload_mut(),
+            in_net_packet.payload(),
+            compression_level,
+        ) {
+            Ok(len) => len,
+            Err(e) => Err(anyhow!("zstd compress {}", e))?,
+        };
+        out.set_payload_len(len)?;
+        Ok(())
+    }
+    pub fn decompress<I: AsRef<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+        in_net_packet: &NetPacket<I>,
+        out: &mut NetPacket<O>,
+    ) -> anyhow::Result<()> {
+        out.set_data_len_max();
+        let len = match zstd::zstd_safe::decompress(out.payload_mut(), in_net_packet.payload()) {
+            Ok(len) => len,
+            Err(e) => Err(anyhow!("zstd decompress {}", e))?,
+        };
+        out.set_payload_len(len)?;
+        Ok(())
+    }
+}

vnt/src/core/conn.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
-use std::io;
 use std::net::Ipv4Addr;
+use std::ops::Deref;
 use std::sync::Arc;
 use std::time::Duration;
 
@@ -8,45 +8,104 @@ use crossbeam_utils::atomic::AtomicCell;
 use parking_lot::{Mutex, RwLock};
 use rand::Rng;
 
-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::sender::IpPacketSender;
 use crate::channel::{init_channel, init_context, Route, RouteKey};
 use crate::cipher::Cipher;
 #[cfg(feature = "server_encrypt")]
 use crate::cipher::RsaCipher;
+use crate::compression::Compressor;
 use crate::core::Config;
 use crate::external_route::{AllowExternalRoute, ExternalRoute};
 use crate::handle::handshaker::Handshake;
 use crate::handle::maintain::PunchReceiver;
 use crate::handle::recv_data::RecvDataHandler;
-use crate::handle::{
-    maintain, tun_tap, BaseConfigInfo, ConnectStatus, CurrentDeviceInfo, PeerDeviceInfo,
-};
+use crate::handle::{maintain, BaseConfigInfo, ConnectStatus, CurrentDeviceInfo, PeerDeviceInfo};
 use crate::nat::NatTest;
-use crate::util::{
-    Scheduler, SingleU64Adder, StopManager, U64Adder, WatchSingleU64Adder, WatchU64Adder,
-};
-use crate::{nat, tun_tap_device, DeviceInfo, VntCallback};
+#[cfg(feature = "integrated_tun")]
+use crate::tun_tap_device::tun_create_helper::{DeviceAdapter, TunDeviceHelper};
+use crate::tun_tap_device::vnt_device::DeviceWrite;
+use crate::util::limit::TrafficMeterMultiAddress;
+use crate::util::{Scheduler, StopManager};
+use crate::{nat, VntCallback};
 
 #[derive(Clone)]
 pub struct Vnt {
+    inner: Arc<VntInner>,
+}
+
+impl Vnt {
+    #[cfg(feature = "integrated_tun")]
+    pub fn new<Call: VntCallback>(config: Config, callback: Call) -> anyhow::Result<Self> {
+        let inner = Arc::new(VntInner::new(config, callback)?);
+        Ok(Self { inner })
+    }
+    #[cfg(not(feature = "integrated_tun"))]
+    pub fn new_device<Call: VntCallback, Device: DeviceWrite>(
+        config: Config,
+        callback: Call,
+        device: Device,
+    ) -> anyhow::Result<Self> {
+        let inner = Arc::new(VntInner::new_device(config, callback, device)?);
+        Ok(Self { inner })
+    }
+}
+
+impl Deref for Vnt {
+    type Target = VntInner;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+pub struct VntInner {
     stop_manager: StopManager,
     config: Config,
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
     nat_test: NatTest,
-    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
-    context: Context,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+    context: Arc<Mutex<Option<ChannelContext>>>,
     peer_nat_info_map: Arc<RwLock<HashMap<Ipv4Addr, NatInfo>>>,
-    down_count_watcher: WatchU64Adder,
-    up_count_watcher: WatchSingleU64Adder,
+    client_secret_hash: Option<[u8; 16]>,
+    compressor: Compressor,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    external_route: ExternalRoute,
+    up_traffic_meter: Option<TrafficMeterMultiAddress>,
+    down_traffic_meter: Option<TrafficMeterMultiAddress>,
 }
 
-impl Vnt {
-    pub fn new<Call: VntCallback>(config: Config, callback: Call) -> io::Result<Self> {
-        log::info!("config:{:?}", config);
+impl VntInner {
+    #[cfg(feature = "integrated_tun")]
+    pub fn new<Call: VntCallback>(config: Config, callback: Call) -> anyhow::Result<Self> {
+        VntInner::new_device0(config, callback, DeviceAdapter::default())
+    }
+    #[cfg(not(feature = "integrated_tun"))]
+    pub fn new_device<Call: VntCallback, Device: DeviceWrite>(
+        config: Config,
+        callback: Call,
+        device: Device,
+    ) -> anyhow::Result<Self> {
+        VntInner::new_device0(config, callback, device)
+    }
+    fn new_device0<Call: VntCallback, Device: DeviceWrite>(
+        config: Config,
+        callback: Call,
+        device: Device,
+    ) -> anyhow::Result<Self> {
+        log::info!("config: {:?}", config);
+        let (up_traffic_meter, down_traffic_meter) = if config.enable_traffic {
+            (
+                Some(TrafficMeterMultiAddress::default()),
+                Some(TrafficMeterMultiAddress::default()),
+            )
+        } else {
+            (None, None)
+        };
+
         //服务端非对称加密
         #[cfg(feature = "server_encrypt")]
         let rsa_cipher: Arc<Mutex<Option<RsaCipher>>> = Arc::new(Mutex::new(None));
@@ -65,40 +124,74 @@ impl Vnt {
         };
         //客户端对称加密
         let client_cipher =
-            Cipher::new_password(config.cipher_model, config.password.clone(), finger);
+            Cipher::new_password(config.cipher_model, config.password.clone(), finger)?;
         //当前设备信息
         let current_device = Arc::new(AtomicCell::new(CurrentDeviceInfo::new0(
             config.server_address,
         )));
         //设备列表
-        let device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>> =
-            Arc::new(Mutex::new((0, Vec::with_capacity(16))));
+        let device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>> =
+            Arc::new(Mutex::new((0, HashMap::with_capacity(16))));
+        let local_ipv4 = if let Some(local_ipv4) = config.local_ipv4 {
+            Some(local_ipv4)
+        } else {
+            nat::local_ipv4()
+        };
+        let default_interface = config.local_interface.clone();
+
         //基础信息
         let config_info = BaseConfigInfo::new(
             config.name.clone(),
             config.token.clone(),
             config.ip,
-            config.password.is_some(),
+            config.password_hash(),
+            config.server_encrypt,
             config.device_id.clone(),
             config.server_address_str.clone(),
+            config.name_servers.clone(),
+            config.mtu.unwrap_or(1420),
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(target_os = "windows")]
+            config.tap,
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+            config.device_name.clone(),
+            config.allow_wire_guard,
+            default_interface.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,
             config.use_channel_type,
             config.first_latency,
-            config.tcp,
+            config.protocol,
             config.packet_loss_rate,
             config.packet_delay,
+            default_interface,
+            up_traffic_meter.clone(),
+            down_traffic_meter.clone(),
         )?;
-        let local_ipv4 = nat::local_ipv4();
         let local_ipv6 = nat::local_ipv6();
         let udp_ports = context.main_local_udp_port()?;
         let tcp_port = tcp_listener.local_addr()?.port();
@@ -110,27 +203,19 @@ impl Vnt {
             local_ipv6,
             udp_ports,
             tcp_port,
+            config.local_ipv4.is_none(),
+            config.punch_model,
         );
-
-        // 虚拟网卡
-        let device = tun_tap_device::create_device(&config)?;
-        let tun_info = DeviceInfo::new(device.name()?, device.version()?);
-        callback.create_tun(tun_info);
-        // 服务停止管理器
-        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());
         let out_external_route = AllowExternalRoute::new(config.out_ips.clone());
 
         #[cfg(feature = "ip_proxy")]
+        #[cfg(feature = "integrated_tun")]
         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(),
@@ -141,18 +226,35 @@ impl Vnt {
         let (punch_sender, punch_receiver) = maintain::punch_channel();
         let peer_nat_info_map: Arc<RwLock<HashMap<Ipv4Addr, NatInfo>>> =
             Arc::new(RwLock::new(HashMap::with_capacity(16)));
-        let down_counter =
-            U64Adder::with_capacity(config.ports.as_ref().map(|v| v.len()).unwrap_or_default() + 8);
-        let down_count_watcher = down_counter.watch();
-        let handshake = Handshake::new();
+        let handshake = Handshake::new(
+            #[cfg(feature = "server_encrypt")]
+            rsa_cipher.clone(),
+        );
+        #[cfg(feature = "integrated_tun")]
+        let tun_device_helper = {
+            TunDeviceHelper::new(
+                stop_manager.clone(),
+                context.clone(),
+                current_device.clone(),
+                external_route.clone(),
+                #[cfg(feature = "ip_proxy")]
+                proxy_map.clone(),
+                client_cipher.clone(),
+                server_cipher.clone(),
+                device_map.clone(),
+                config.compressor,
+                device.clone().into_device_adapter(),
+            )
+        };
+
         let handler = RecvDataHandler::new(
             #[cfg(feature = "server_encrypt")]
             rsa_cipher,
             server_cipher.clone(),
             client_cipher.clone(),
             current_device.clone(),
-            device.clone(),
-            device_list.clone(),
+            device,
+            device_map.clone(),
             config_info.clone(),
             nat_test.clone(),
             callback.clone(),
@@ -161,42 +263,34 @@ impl Vnt {
             external_route.clone(),
             out_external_route,
             #[cfg(feature = "ip_proxy")]
+            #[cfg(feature = "integrated_tun")]
             proxy_map.clone(),
-            down_counter,
             handshake.clone(),
+            #[cfg(feature = "integrated_tun")]
+            tun_device_helper,
         );
 
         //初始化网络数据通道
-        let (udp_socket_sender, tcp_socket_sender) =
+        let (udp_socket_sender, connect_util) =
             init_channel(tcp_listener, context.clone(), stop_manager.clone(), handler)?;
         // 打洞逻辑
         let punch = Punch::new(
             context.clone(),
             config.punch_model,
-            config.tcp,
-            tcp_socket_sender.clone(),
-        );
-        let up_counter = SingleU64Adder::new();
-        let up_count_watcher = up_counter.watch();
-        tun_tap::tun_handler::start(
-            stop_manager.clone(),
-            context.clone(),
-            device.clone(),
+            connect_util.clone(),
+            nat_test.clone(),
             current_device.clone(),
-            external_route,
-            #[cfg(feature = "ip_proxy")]
-            proxy_map,
-            client_cipher.clone(),
-            server_cipher.clone(),
-            config.parallel,
-            up_counter,
-        )?;
+        );
+
+        // #[cfg(not(target_os = "android"))]
+        // tun_helper.start(device)?;
+
         maintain::idle_gateway(
             &scheduler,
             context.clone(),
             current_device.clone(),
             config_info.clone(),
-            tcp_socket_sender.clone(),
+            connect_util.clone(),
             callback.clone(),
             0,
             handshake,
@@ -204,9 +298,8 @@ impl Vnt {
         {
             let context = context.clone();
             let nat_test = nat_test.clone();
-            let device_list = device_list.clone();
-            let down_count_watcher = down_count_watcher.clone();
-            let up_count_watcher = up_count_watcher.clone();
+            let device_map = device_map.clone();
+            let config_info = config_info.clone();
             let current_device = current_device.clone();
             if !config.use_channel_type.is_only_relay() {
                 // 定时nat探测
@@ -217,13 +310,15 @@ impl Vnt {
                     udp_socket_sender,
                 );
             }
+            let client_cipher = client_cipher.clone();
+            let server_cipher = server_cipher.clone();
             //延迟启动
-            scheduler.timeout(Duration::from_secs(3), move |scheduler| {
+            scheduler.timeout(Duration::from_secs(1), move |scheduler| {
                 start(
                     scheduler,
                     context,
                     nat_test,
-                    device_list,
+                    device_map,
                     current_device,
                     client_cipher,
                     server_cipher,
@@ -231,31 +326,34 @@ impl Vnt {
                     config_info,
                     punch,
                     callback,
-                    down_count_watcher,
-                    up_count_watcher,
                 );
             });
         }
-
+        let compressor = config.compressor;
         Ok(Self {
             stop_manager,
             config,
             current_device,
             nat_test,
-            device_list,
-            context,
+            device_map,
+            context: Arc::new(Mutex::new(Some(context))),
             peer_nat_info_map,
-            down_count_watcher,
-            up_count_watcher,
+            client_secret_hash: config_info.client_secret_hash,
+            compressor,
+            client_cipher,
+            server_cipher,
+            external_route,
+            up_traffic_meter,
+            down_traffic_meter,
         })
     }
 }
 
 pub fn start<Call: VntCallback>(
     scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
     nat_test: NatTest,
-    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
     client_cipher: Cipher,
     server_cipher: Cipher,
@@ -263,15 +361,13 @@ pub fn start<Call: VntCallback>(
     config_info: BaseConfigInfo,
     punch: Punch,
     callback: Call,
-    down_count_watcher: WatchU64Adder,
-    up_count_watcher: WatchSingleU64Adder,
 ) {
     // 定时心跳
     maintain::heartbeat(
         &scheduler,
         context.clone(),
         current_device.clone(),
-        device_list.clone(),
+        device_map.clone(),
         client_cipher.clone(),
         server_cipher.clone(),
     );
@@ -291,41 +387,36 @@ pub fn start<Call: VntCallback>(
             &scheduler,
             context.clone(),
             current_device.clone(),
-            device_list.clone(),
+            device_map.clone(),
             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(),
+            nat_test.clone(),
+            config_info.clone(),
+        );
         // 定时打洞
         maintain::punch(
             &scheduler,
             context.clone(),
             nat_test.clone(),
-            device_list.clone(),
+            device_map.clone(),
             current_device.clone(),
             client_cipher.clone(),
             punch_receiver,
             punch,
         );
     }
-    maintain::up_status(
-        scheduler,
-        context.clone(),
-        current_device.clone(),
-        down_count_watcher,
-        up_count_watcher,
-    )
+    maintain::up_status(scheduler, context.clone(), current_device.clone())
 }
 
-impl Vnt {
+impl VntInner {
     pub fn name(&self) -> &str {
         &self.config.name
     }
@@ -335,9 +426,15 @@ impl Vnt {
     pub fn client_encrypt(&self) -> bool {
         self.config.password.is_some()
     }
+    pub fn client_encrypt_hash(&self) -> Option<&[u8]> {
+        self.client_secret_hash.as_ref().map(|v| v.as_ref())
+    }
     pub fn current_device(&self) -> CurrentDeviceInfo {
         self.current_device.load()
     }
+    pub fn current_device_info(&self) -> Arc<AtomicCell<CurrentDeviceInfo>> {
+        self.current_device.clone()
+    }
     pub fn peer_nat_info(&self, ip: &Ipv4Addr) -> Option<NatInfo> {
         self.peer_nat_info_map.read().get(ip).cloned()
     }
@@ -348,33 +445,94 @@ impl Vnt {
         self.nat_test.nat_info()
     }
     pub fn device_list(&self) -> Vec<PeerDeviceInfo> {
-        let device_list_lock = self.device_list.lock();
+        let device_list_lock = self.device_map.lock();
         let (_epoch, device_list) = device_list_lock.clone();
         drop(device_list_lock);
-        device_list
+        device_list.into_values().collect()
     }
     pub fn route(&self, ip: &Ipv4Addr) -> Option<Route> {
-        self.context.route_table.route_one(ip)
+        self.context.lock().as_ref()?.route_table.route_one(ip)
     }
     pub fn is_gateway(&self, ip: &Ipv4Addr) -> bool {
         self.current_device.load().is_gateway(ip)
     }
     pub fn route_key(&self, route_key: &RouteKey) -> Option<Ipv4Addr> {
-        self.context.route_table.route_to_id(route_key)
+        self.context
+            .lock()
+            .as_ref()?
+            .route_table
+            .route_to_id(route_key)
     }
     pub fn route_table(&self) -> Vec<(Ipv4Addr, Vec<Route>)> {
-        self.context.route_table.route_table()
+        if let Some(context) = self.context.lock().as_ref() {
+            context.route_table.route_table()
+        } else {
+            vec![]
+        }
     }
     pub fn up_stream(&self) -> u64 {
-        self.up_count_watcher.get()
+        self.up_traffic_meter.as_ref().map_or(0, |v| v.total())
+    }
+    pub fn up_stream_all(&self) -> Option<(u64, HashMap<Ipv4Addr, u64>)> {
+        self.up_traffic_meter.as_ref().map(|v| v.get_all())
+    }
+    pub fn up_stream_history(&self) -> Option<(u64, HashMap<Ipv4Addr, (u64, Vec<usize>)>)> {
+        self.up_traffic_meter.as_ref().map(|v| v.get_all_history())
     }
     pub fn down_stream(&self) -> u64 {
-        self.down_count_watcher.get()
+        self.down_traffic_meter.as_ref().map_or(0, |v| v.total())
+    }
+    pub fn down_stream_all(&self) -> Option<(u64, HashMap<Ipv4Addr, u64>)> {
+        self.down_traffic_meter.as_ref().map(|v| v.get_all())
+    }
+    pub fn down_stream_history(&self) -> Option<(u64, HashMap<Ipv4Addr, (u64, Vec<usize>)>)> {
+        self.down_traffic_meter
+            .as_ref()
+            .map(|v| v.get_all_history())
     }
     pub fn stop(&self) {
+        //退出协助回收资源
+        let _ = self.context.lock().take();
         self.stop_manager.stop()
     }
+    pub fn is_stopped(&self) -> bool {
+        self.stop_manager.is_stopped()
+    }
+    pub fn add_stop_listener<F>(&self, name: String, f: F) -> anyhow::Result<crate::util::Worker>
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        self.stop_manager.add_listener(name, f)
+    }
     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
+    }
+    pub fn ipv4_packet_sender(&self) -> Option<IpPacketSender> {
+        if let Some(c) = self.context.lock().as_ref() {
+            Some(IpPacketSender::new(
+                c.clone(),
+                self.current_device.clone(),
+                self.compressor.clone(),
+                self.client_cipher.clone(),
+                self.server_cipher.clone(),
+                self.external_route.clone(),
+                self.device_map.clone(),
+                self.config.allow_wire_guard,
+            ))
+        } else {
+            None
+        }
+    }
+}
+
+impl Drop for VntInner {
+    fn drop(&mut self) {
+        self.stop();
+    }
 }

vnt/src/core/mod.rs

@@ -1,123 +1,247 @@
-use std::io;
-use std::net::{Ipv4Addr, SocketAddr};
+use anyhow::anyhow;
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr};
+use std::str::FromStr;
 
 pub use conn::Vnt;
 
 use crate::channel::punch::PunchModel;
-use crate::channel::UseChannelType;
+use crate::channel::socket::LocalInterface;
+use crate::channel::{ConnectProtocol, UseChannelType};
 use crate::cipher::CipherModel;
+use crate::compression::Compressor;
+use crate::util::{address_choose, dns_query_all};
 
 mod conn;
 
 #[derive(Clone, Debug)]
 pub struct Config {
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
+    #[cfg(feature = "integrated_tun")]
+    #[cfg(target_os = "windows")]
     pub tap: bool,
     pub token: String,
     pub device_id: String,
     pub name: String,
     pub server_address: SocketAddr,
     pub server_address_str: String,
+    pub name_servers: Vec<String>,
     pub stun_server: Vec<String>,
     pub in_ips: Vec<(u32, u32, Ipv4Addr)>,
     pub out_ips: Vec<(u32, u32)>,
     pub password: Option<String>,
     pub mtu: Option<u32>,
-    pub tcp: bool,
+    pub protocol: ConnectProtocol,
     pub ip: Option<Ipv4Addr>,
     #[cfg(feature = "ip_proxy")]
+    #[cfg(feature = "integrated_tun")]
     pub no_proxy: bool,
     pub server_encrypt: bool,
-    pub parallel: usize,
     pub cipher_model: CipherModel,
     pub finger: bool,
     pub punch_model: PunchModel,
     pub ports: Option<Vec<u16>>,
     pub first_latency: bool,
-    #[cfg(not(target_os = "android"))]
+    #[cfg(feature = "integrated_tun")]
+    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
     pub device_name: Option<String>,
-    #[cfg(target_os = "android")]
-    pub device_fd: i32,
     pub use_channel_type: UseChannelType,
     //控制丢包率
     pub packet_loss_rate: Option<f64>,
     pub packet_delay: u32,
+    // 端口映射
+    #[cfg(feature = "port_mapping")]
+    pub port_mapping_list: Vec<(bool, SocketAddr, String)>,
+    pub compressor: Compressor,
+    pub enable_traffic: bool,
+    pub allow_wire_guard: bool,
+    pub local_ipv4: Option<Ipv4Addr>,
+    pub local_interface: LocalInterface,
 }
 
 impl Config {
     pub fn new(
-        #[cfg(any(target_os = "windows", target_os = "linux"))] tap: bool,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(target_os = "windows")]
+        tap: bool,
         token: String,
         device_id: String,
         name: String,
-        server_address: SocketAddr,
         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>,
-        tcp: bool,
         ip: Option<Ipv4Addr>,
-        #[cfg(feature = "ip_proxy")] no_proxy: bool,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(feature = "ip_proxy")]
+        no_proxy: bool,
         server_encrypt: bool,
-        parallel: usize,
         cipher_model: CipherModel,
         finger: bool,
         punch_model: PunchModel,
         ports: Option<Vec<u16>>,
         first_latency: bool,
-        #[cfg(not(target_os = "android"))] device_name: Option<String>,
-        #[cfg(target_os = "android")] device_fd: i32,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(not(target_os = "android"))]
+        device_name: Option<String>,
         use_channel_type: UseChannelType,
         packet_loss_rate: Option<f64>,
         packet_delay: u32,
-    ) -> io::Result<Self> {
+        // 例如 [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>,
+        compressor: Compressor,
+        enable_traffic: bool,
+        // 允许传递wg流量
+        allow_wire_guard: bool,
+        local_dev: Option<String>,
+    ) -> anyhow::Result<Self> {
         for x in stun_server.iter_mut() {
             if !x.contains(":") {
                 x.push_str(":3478");
             }
         }
+        for x in name_servers.iter_mut() {
+            if Ipv6Addr::from_str(x).is_ok() {
+                x.push_str(":53");
+            } else if !x.contains(":") {
+                x.push_str(":53");
+            }
+        }
         if token.is_empty() || token.len() > 128 {
-            return Err(io::Error::new(io::ErrorKind::Other, "token too long"));
+            return Err(anyhow!("token too long"));
         }
         if device_id.is_empty() || device_id.len() > 128 {
-            return Err(io::Error::new(io::ErrorKind::Other, "device_id too long"));
+            return Err(anyhow!("device_id too long"));
         }
         if name.is_empty() || name.len() > 128 {
-            return Err(io::Error::new(io::ErrorKind::Other, "name too long"));
+            return Err(anyhow!("name too long"));
         }
+        let mut server_address_str = server_address_str.to_lowercase();
+        let mut _query_dns = true;
+        let mut protocol = ConnectProtocol::UDP;
+        if server_address_str.starts_with("ws://") {
+            #[cfg(not(feature = "ws"))]
+            Err(anyhow!("Ws not supported"))?;
+            protocol = ConnectProtocol::WS;
+            _query_dns = false;
+        }
+        if server_address_str.starts_with("wss://") {
+            #[cfg(not(feature = "wss"))]
+            Err(anyhow!("Wss not supported"))?;
+            protocol = ConnectProtocol::WSS;
+            _query_dns = false;
+        }
+
+        let mut server_address = "0.0.0.0:0".parse().unwrap();
+        if _query_dns {
+            if let Some(s) = server_address_str.strip_prefix("udp://") {
+                server_address_str = s.to_string();
+            } else if let Some(s) = server_address_str.strip_prefix("tcp://") {
+                server_address_str = s.to_string();
+                protocol = ConnectProtocol::TCP;
+            }
+            let address_result = dns_query_all(
+                &server_address_str,
+                name_servers.clone(),
+                &LocalInterface::default(),
+            );
+            match address_result {
+                Ok(address) => match address_choose(address) {
+                    Ok(resolved_address) => {
+                        server_address = resolved_address;
+                    }
+                    Err(e) => {
+                        log::error!("Failed to choose address: {}", e);
+                        println!("Failed to choose address: {}", e);
+                    }
+                },
+                Err(e) => {
+                    log::error!("DNS query failed: {}", e);
+                    println!("DNS query failed: {}", e);
+                }
+            }
+        }
+
+        #[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));
+        let (local_interface, local_ipv4) = if let Some(local_dev) = local_dev {
+            let (default_interface, ip) = crate::channel::socket::get_interface(local_dev)?;
+            log::info!("default_interface = {:?} local_ip= {ip}", default_interface);
+            (default_interface, Some(ip))
+        } else {
+            (LocalInterface::default(), None)
+        };
         Ok(Self {
-            #[cfg(any(target_os = "windows", target_os = "linux"))]
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(target_os = "windows")]
             tap,
             token,
             device_id,
             name,
             server_address,
             server_address_str,
+            name_servers,
             stun_server,
             in_ips,
             out_ips,
             password,
             mtu,
-            tcp,
+            protocol,
             ip,
             #[cfg(feature = "ip_proxy")]
+            #[cfg(feature = "integrated_tun")]
             no_proxy,
             server_encrypt,
-            parallel,
             cipher_model,
             finger,
             punch_model,
             ports,
             first_latency,
+            #[cfg(feature = "integrated_tun")]
             #[cfg(not(target_os = "android"))]
             device_name,
-            #[cfg(target_os = "android")]
-            device_fd,
             use_channel_type,
             packet_loss_rate,
             packet_delay,
+            #[cfg(feature = "port_mapping")]
+            port_mapping_list,
+            compressor,
+            enable_traffic,
+            allow_wire_guard,
+            local_ipv4,
+            local_interface,
         })
     }
 }
+
+impl Config {
+    pub fn password_hash(&self) -> Option<[u8; 16]> {
+        if let Some(p) = self.password.as_ref() {
+            match self.cipher_model {
+                CipherModel::Xor => {
+                    let key = crate::cipher::simple_hash(&format!("Xor{}{}", p, self.token));
+                    Some(key[16..].try_into().unwrap())
+                }
+                CipherModel::None => None,
+                #[cfg(cipher)]
+                _ => {
+                    use sha2::Digest;
+                    let mut hasher = sha2::Sha256::new();
+                    hasher.update(self.cipher_model.to_string().as_bytes());
+                    hasher.update(p.as_bytes());
+                    hasher.update(self.token.as_bytes());
+                    let key: [u8; 32] = hasher.finalize().into();
+                    Some(key[16..].try_into().unwrap())
+                }
+            }
+        } else {
+            None
+        }
+    }
+}

vnt/src/external_route/mod.rs

@@ -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),
         }

vnt/src/handle/callback.rs

@@ -1,21 +1,25 @@
+use crate::handle::PeerDeviceStatus;
 #[cfg(feature = "server_encrypt")]
 use rsa::RsaPublicKey;
 use std::fmt::{Display, Formatter};
 use std::io;
 use std::net::{Ipv4Addr, SocketAddr};
 
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 #[derive(Debug)]
 pub struct DeviceInfo {
     pub name: String,
     pub version: String,
 }
 
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 impl Display for DeviceInfo {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.write_str(&format!("name={} ,version={}", self.name, self.version))
     }
 }
 
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 impl DeviceInfo {
     pub fn new(name: String, version: String) -> Self {
         return Self { name, version };
@@ -68,6 +72,7 @@ impl Display for HandshakeInfo {
         f.write_str(&format!("server version={}", self.version))
     }
 }
+
 #[cfg(feature = "server_encrypt")]
 impl HandshakeInfo {
     pub fn new(public_key: RsaPublicKey, finger: String, version: String) -> Self {
@@ -85,6 +90,7 @@ impl HandshakeInfo {
         }
     }
 }
+
 #[cfg(not(feature = "server_encrypt"))]
 impl HandshakeInfo {
     pub fn new_no_secret(version: String) -> Self {
@@ -166,6 +172,8 @@ pub enum ErrorType {
     IpAlreadyExists,
     InvalidIp,
     LocalIpExists,
+    FailedToCrateDevice,
+    Warn,
     Unknown,
 }
 
@@ -178,16 +186,116 @@ impl Into<u8> for ErrorType {
             ErrorType::IpAlreadyExists => 4,
             ErrorType::InvalidIp => 5,
             ErrorType::LocalIpExists => 6,
+            ErrorType::FailedToCrateDevice => 101,
+            ErrorType::Warn => 102,
             ErrorType::Unknown => 255,
         }
     }
 }
 
+#[derive(Clone, Debug)]
+pub struct DeviceConfig {
+    #[cfg(feature = "integrated_tun")]
+    #[cfg(target_os = "windows")]
+    pub tap: bool,
+    #[cfg(feature = "integrated_tun")]
+    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    pub device_name: Option<String>,
+    //虚拟网卡mtu值
+    pub mtu: u32,
+    //本机虚拟IP
+    pub virtual_ip: Ipv4Addr,
+    //子网掩码
+    pub virtual_netmask: Ipv4Addr,
+    //虚拟网关
+    pub virtual_gateway: Ipv4Addr,
+    //虚拟网段
+    pub virtual_network: Ipv4Addr,
+    // 额外的路由
+    pub external_route: Vec<(Ipv4Addr, Ipv4Addr)>,
+}
+
+impl DeviceConfig {
+    pub fn new(
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(target_os = "windows")]
+        tap: bool,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+        device_name: Option<String>,
+        mtu: u32,
+        virtual_ip: Ipv4Addr,
+        virtual_netmask: Ipv4Addr,
+        virtual_gateway: Ipv4Addr,
+        virtual_network: Ipv4Addr,
+        external_route: Vec<(Ipv4Addr, Ipv4Addr)>,
+    ) -> Self {
+        Self {
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(target_os = "windows")]
+            tap,
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+            device_name,
+            mtu,
+            virtual_ip,
+            virtual_netmask,
+            virtual_gateway,
+            virtual_network,
+            external_route,
+        }
+    }
+}
+
+impl Display for DeviceConfig {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&format!(
+            "ip={} ,netmask={} ,gateway={}, external_route={:?}",
+            self.virtual_ip, self.virtual_netmask, self.virtual_gateway, self.external_route
+        ))
+    }
+}
+
+#[derive(Debug)]
+pub struct PeerClientInfo {
+    pub virtual_ip: Ipv4Addr,
+    pub name: String,
+    pub status: PeerDeviceStatus,
+    pub client_secret: bool,
+}
+
+impl PeerClientInfo {
+    pub fn new(
+        virtual_ip: Ipv4Addr,
+        name: String,
+        status: PeerDeviceStatus,
+        client_secret: bool,
+    ) -> Self {
+        Self {
+            virtual_ip,
+            name,
+            status,
+            client_secret,
+        }
+    }
+}
+
+impl Display for PeerClientInfo {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&format!(
+            "ip={} ,name={} ,status={:?}, client_secret={}",
+            self.virtual_ip, self.name, self.status, self.client_secret
+        ))
+    }
+}
+
 pub trait VntCallback: Clone + Send + Sync + 'static {
     /// 启动成功
     fn success(&self) {}
 
     /// 创建网卡的信息
+    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    #[cfg(feature = "integrated_tun")]
     fn create_tun(&self, _info: DeviceInfo) {}
     /// 连接
     fn connect(&self, _info: ConnectInfo) {}
@@ -199,6 +307,14 @@ pub trait VntCallback: Clone + Send + Sync + 'static {
     fn register(&self, _info: RegisterInfo) -> bool {
         true
     }
+    #[cfg(not(feature = "integrated_tun"))]
+    fn create_device(&self, _info: DeviceConfig) {}
+    #[cfg(target_os = "android")]
+    #[cfg(feature = "integrated_tun")]
+    fn generate_tun(&self, _info: DeviceConfig) -> usize {
+        0
+    }
+    fn peer_client_list(&self, _info: Vec<PeerClientInfo>) {}
     /// 异常信息
     fn error(&self, _info: ErrorInfo) {}
     /// 服务停止

vnt/src/handle/extension/mod.rs

@@ -0,0 +1,24 @@
+use crate::compression::Compressor;
+use crate::protocol::extension::ExtensionTailPacket;
+use crate::protocol::NetPacket;
+use anyhow::anyhow;
+
+pub fn handle_extension_tail<I: AsRef<[u8]> + AsMut<[u8]>, O: AsRef<[u8]> + AsMut<[u8]>>(
+    in_net_packet: &mut NetPacket<I>,
+    out: &mut NetPacket<O>,
+) -> anyhow::Result<bool> {
+    if in_net_packet.is_extension() {
+        let tail_packet = in_net_packet.split_tail_packet()?;
+        match tail_packet {
+            ExtensionTailPacket::Compression(extension) => {
+                let compression_algorithm = extension.algorithm();
+                Compressor::decompress(compression_algorithm, &in_net_packet, out)?;
+                out.head_mut().copy_from_slice(in_net_packet.head());
+                Ok(true)
+            }
+            ExtensionTailPacket::Unknown => Err(anyhow!("Unknown decompress")),
+        }
+    } else {
+        Ok(false)
+    }
+}

vnt/src/handle/handshaker.rs

@@ -4,9 +4,11 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use crossbeam_utils::atomic::AtomicCell;
+#[cfg(feature = "server_encrypt")]
+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};
@@ -15,61 +17,67 @@ 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,
-    KeyError,
-    Timeout,
-    ServerError(String),
-    Other(String),
-}
 #[derive(Clone)]
 pub struct Handshake {
     time: Arc<AtomicCell<Instant>>,
+    #[cfg(feature = "server_encrypt")]
+    rsa_cipher: Arc<Mutex<Option<RsaCipher>>>,
 }
 impl Handshake {
-    pub fn new() -> Self {
+    pub fn new(
+        #[cfg(feature = "server_encrypt")] rsa_cipher: Arc<Mutex<Option<RsaCipher>>>,
+    ) -> Self {
         Handshake {
-            time: Arc::new(AtomicCell::new(Instant::now() - Duration::from_secs(60))),
+            time: Arc::new(AtomicCell::new(
+                Instant::now()
+                    .checked_sub(Duration::from_secs(60))
+                    .unwrap_or(Instant::now()),
+            )),
+            #[cfg(feature = "server_encrypt")]
+            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) {
             return Ok(());
         }
-        let request_packet = handshake_request_packet(secret)?;
+        let request_packet = self.handshake_request_packet(secret)?;
         log::info!("发送握手请求,secret={},{:?}", secret, addr);
-        context.send_default(request_packet.buffer(), addr)?;
+        context.send_default(&request_packet, addr)?;
         self.time.store(Instant::now());
         Ok(())
     }
-}
-
-/// 第一次握手数据
-pub fn handshake_request_packet(secret: bool) -> io::Result<NetPacket<Vec<u8>>> {
-    let mut request = HandshakeRequest::new();
-    request.secret = secret;
-    request.version = crate::VNT_VERSION.to_string();
-    let bytes = request.write_to_bytes().map_err(|e| {
-        io::Error::new(
-            io::ErrorKind::Other,
-            format!("handshake_request_packet {:?}", e),
-        )
-    })?;
-    let buf = vec![0u8; 12 + bytes.len()];
-    let mut net_packet = NetPacket::new(buf)?;
-    net_packet.set_version(Version::V1);
-    net_packet.set_gateway_flag(true);
-    net_packet.set_destination(GATEWAY_IP);
-    net_packet.set_source(SELF_IP);
-    net_packet.set_protocol(Protocol::Service);
-    net_packet.set_transport_protocol(service_packet::Protocol::HandshakeRequest.into());
-    net_packet.first_set_ttl(MAX_TTL);
-    net_packet.set_payload(&bytes)?;
-    Ok(net_packet)
+    /// 第一次握手数据
+    pub fn handshake_request_packet(&self, secret: bool) -> io::Result<NetPacket<Vec<u8>>> {
+        let mut request = HandshakeRequest::new();
+        request.secret = secret;
+        request.version = crate::VNT_VERSION.to_string();
+        #[cfg(feature = "server_encrypt")]
+        if let Some(finger) = self.rsa_cipher.lock().as_ref().map(|v| v.finger().clone()) {
+            request.key_finger = finger;
+        }
+        let bytes = request.write_to_bytes().map_err(|e| {
+            io::Error::new(
+                io::ErrorKind::Other,
+                format!("handshake_request_packet {:?}", e),
+            )
+        })?;
+        let buf = vec![0u8; 12 + bytes.len()];
+        let mut net_packet = NetPacket::new(buf)?;
+        net_packet.set_default_version();
+        net_packet.set_gateway_flag(true);
+        net_packet.set_destination(GATEWAY_IP);
+        net_packet.set_source(SELF_IP);
+        net_packet.set_protocol(Protocol::Service);
+        net_packet.set_transport_protocol(service_packet::Protocol::HandshakeRequest.into());
+        net_packet.first_set_ttl(MAX_TTL);
+        net_packet.set_payload(&bytes)?;
+        Ok(net_packet)
+    }
 }
 
 /// 第二次加密握手
@@ -92,7 +100,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);

vnt/src/handle/maintain/addr_request.rs

@@ -3,65 +3,69 @@ use std::time::Duration;
 
 use crossbeam_utils::atomic::AtomicCell;
 
-use crate::channel::context::Context;
-use crate::cipher::Cipher;
+use crate::channel::context::ChannelContext;
+use crate::channel::punch::NatType;
 use crate::handle::{BaseConfigInfo, CurrentDeviceInfo};
-use crate::protocol::body::ENCRYPTION_RESERVED;
-use crate::protocol::{control_packet, NetPacket, Protocol, Version, MAX_TTL};
+use crate::nat::NatTest;
 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(
-        scheduler,
-        context,
-        current_device_info.clone(),
-        server_cipher,
-    );
+    pub_address_request(scheduler, context, current_device_info.clone(), 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);
-    // 17秒发送一次
-    let rs = scheduler.timeout(Duration::from_secs(17), |s| {
-        pub_address_request(s, context, current_device_info, server_cipher)
+    let channel_num = context.channel_num();
+    let index = count % channel_num;
+    if let Err(e) = addr_request0(&context, &current_device_info, &nat_test, index) {
+        log::warn!("{:?}", e);
+    }
+    let nat_info = nat_test.nat_info();
+    let time = if !nat_info.public_ports.contains(&0) && !nat_info.public_ips.is_empty() {
+        //对称网络探测端口没啥作用，把频率放低，（锥形网络也只在打洞前需要探测端口，后续可以改改）
+        if nat_info.nat_type == NatType::Symmetric {
+            600
+        } else {
+            if index == channel_num - 1 {
+                19
+            } else {
+                9
+            }
+        }
+    } else {
+        3
+    };
+
+    let rs = scheduler.timeout(Duration::from_secs(time), move |s| {
+        pub_address_request(s, context, current_device_info, 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() {
-        // 如果连接的是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_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);
-        }
+    if current_dev.status.offline() {
+        return Ok(());
     }
+    let (data, addr) = nat_test.send_data()?;
+    context.send_main_udp(index, &data, addr)?;
+    Ok(())
 }

vnt/src/handle/maintain/heartbeat.rs

@@ -1,4 +1,4 @@
-use std::io;
+use std::collections::HashMap;
 use std::net::Ipv4Addr;
 use std::sync::Arc;
 use std::time::Duration;
@@ -7,27 +7,27 @@ 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>)>>,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     client_cipher: Cipher,
     server_cipher: Cipher,
 ) {
     heartbeat0(
         &context,
         &current_device_info.load(),
-        &device_list,
+        &device_map,
         &client_cipher,
         &server_cipher,
     );
@@ -37,7 +37,7 @@ pub fn heartbeat(
             s,
             context,
             current_device_info,
-            device_list,
+            device_map,
             client_cipher,
             server_cipher,
         )
@@ -48,20 +48,20 @@ pub fn heartbeat(
 }
 
 fn heartbeat0(
-    context: &Context,
+    context: &ChannelContext,
     current_device: &CurrentDeviceInfo,
-    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
+    device_map: &Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>,
     client_cipher: &Cipher,
     server_cipher: &Cipher,
 ) {
     let gateway_ip = current_device.virtual_gateway;
     let src_ip = current_device.virtual_ip;
+    let channel_num = context.channel_num();
     // 可能服务器ip发生变化，导致发送失败
     let mut is_send_gateway = false;
-    match heartbeat_packet_server(device_list, server_cipher, src_ip, gateway_ip) {
+    match heartbeat_packet_server(device_map, server_cipher, src_ip, gateway_ip) {
         Ok(net_packet) => {
-            if let Err(e) = context.send_default(net_packet.buffer(), current_device.connect_server)
-            {
+            if let Err(e) = context.send_default(&net_packet, current_device.connect_server) {
                 log::warn!("heartbeat err={:?}", e)
             } else {
                 is_send_gateway = true
@@ -77,7 +77,7 @@ fn heartbeat0(
             if is_send_gateway {
                 continue;
             }
-            heartbeat_packet_server(device_list, server_cipher, src_ip, gateway_ip)
+            heartbeat_packet_server(device_map, server_cipher, src_ip, gateway_ip)
         } else {
             heartbeat_packet_client(client_cipher, src_ip, dest_ip)
         };
@@ -88,15 +88,24 @@ fn heartbeat0(
                 continue;
             }
         };
-        for route in routes {
-            if let Err(e) = context.send_by_key(net_packet.buffer(), route.route_key()) {
+        for (index, route) in routes.iter().enumerate() {
+            let limit = if context.first_latency() {
+                channel_num + 1
+            } else {
+                channel_num
+            };
+            if index >= limit {
+                // 多余的通道不再发送心跳包,让它自动过期
+                break;
+            }
+            if let Err(e) = context.send_by_key(&net_packet, route.route_key()) {
                 log::warn!("heartbeat err={:?}", e)
             }
         }
     }
-    let peer_list = { device_list.lock().1.clone() };
-    for peer in &peer_list {
-        if !peer.status.is_online() {
+    let peer_list = { device_map.lock().1.clone() };
+    for peer in peer_list.values() {
+        if !peer.status.is_online() || peer.wireguard {
             continue;
         }
         if current_device.is_gateway(&peer.virtual_ip) {
@@ -114,8 +123,7 @@ fn heartbeat0(
                     continue;
                 }
             };
-            if let Err(e) = context.send_default(net_packet.buffer(), current_device.connect_server)
-            {
+            if let Err(e) = context.send_default(&net_packet, current_device.connect_server) {
                 log::error!("heartbeat_packet send_default err={:?}", e);
             }
         }
@@ -125,13 +133,13 @@ fn heartbeat0(
 /// 客户端中继路径探测,延迟启动
 pub fn client_relay(
     scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
-    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     client_cipher: Cipher,
 ) {
     let rs = scheduler.timeout(Duration::from_secs(30), move |s| {
-        client_relay_(s, context, current_device, device_list, client_cipher)
+        client_relay_(s, context, current_device, device_map, client_cipher)
     });
     if !rs {
         log::info!("定时任务停止");
@@ -141,21 +149,21 @@ 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>)>>,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     client_cipher: Cipher,
 ) {
     if let Err(e) = client_relay0(
         &context,
         &current_device.load(),
-        &device_list,
+        &device_map,
         &client_cipher,
     ) {
         log::error!("{:?}", e);
     }
     let rs = scheduler.timeout(Duration::from_secs(30), move |s| {
-        client_relay_(s, context, current_device, device_list, client_cipher)
+        client_relay_(s, context, current_device, device_map, client_cipher)
     });
     if !rs {
         log::info!("定时任务停止");
@@ -163,19 +171,22 @@ fn client_relay_(
 }
 
 fn client_relay0(
-    context: &Context,
+    context: &ChannelContext,
     current_device: &CurrentDeviceInfo,
-    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
+    device_map: &Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>,
     client_cipher: &Cipher,
-) -> io::Result<()> {
+) -> anyhow::Result<()> {
     // 离线了不再探测
     if current_device.status.offline() {
         return Ok(());
     }
-    let peer_list = { device_list.lock().1.clone() };
+    let peer_list = { device_map.lock().1.clone() };
     let mut routes = context.route_table.route_table_p2p();
-    for peer in &peer_list {
-        if !peer.status.is_online() || peer.virtual_ip == current_device.virtual_ip {
+    for peer in peer_list.values() {
+        if peer.wireguard
+            || !peer.status.is_online()
+            || peer.virtual_ip == current_device.virtual_ip
+        {
             continue;
         }
         if context
@@ -196,7 +207,7 @@ fn client_relay0(
             if current_device.is_gateway(ip) {
                 continue;
             }
-            if let Err(e) = context.send_by_key(client_packet.buffer(), route.route_key()) {
+            if let Err(e) = context.send_by_key(&client_packet, route.route_key()) {
                 log::error!("{:?}", e);
             }
             if index >= 2 {
@@ -211,9 +222,9 @@ fn client_relay0(
 fn heartbeat_packet(
     src: Ipv4Addr,
     dest: Ipv4Addr,
-) -> io::Result<NetPacket<[u8; 12 + 4 + ENCRYPTION_RESERVED]>> {
+) -> anyhow::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);
@@ -228,21 +239,21 @@ fn heartbeat_packet_client(
     client_cipher: &Cipher,
     src: Ipv4Addr,
     dest: Ipv4Addr,
-) -> io::Result<NetPacket<[u8; 12 + 4 + ENCRYPTION_RESERVED]>> {
+) -> anyhow::Result<NetPacket<[u8; 12 + 4 + ENCRYPTION_RESERVED]>> {
     let mut net_packet = heartbeat_packet(src, dest)?;
     client_cipher.encrypt_ipv4(&mut net_packet)?;
     Ok(net_packet)
 }
 
 fn heartbeat_packet_server(
-    device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,
+    device_map: &Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>,
     server_cipher: &Cipher,
     src: Ipv4Addr,
     dest: Ipv4Addr,
-) -> io::Result<NetPacket<[u8; 12 + 4 + ENCRYPTION_RESERVED]>> {
+) -> anyhow::Result<NetPacket<[u8; 12 + 4 + ENCRYPTION_RESERVED]>> {
     let mut net_packet = heartbeat_packet(src, dest)?;
     let mut ping = PingPacket::new(net_packet.payload_mut())?;
-    ping.set_epoch(device_list.lock().0);
+    ping.set_epoch(device_map.lock().0);
     net_packet.set_gateway_flag(true);
     server_cipher.encrypt_ipv4(&mut net_packet)?;
     Ok(net_packet)

vnt/src/handle/maintain/idle.rs

@@ -1,24 +1,24 @@
 use std::io;
-use std::net::{SocketAddr, ToSocketAddrs};
 use std::sync::Arc;
-use std::time::{Duration, Instant};
+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::channel::sender::ConnectUtil;
+use crate::channel::socket::LocalInterface;
+use crate::channel::ConnectProtocol;
 use crate::handle::callback::{ConnectInfo, ErrorType};
 use crate::handle::handshaker::Handshake;
-use crate::handle::{handshaker, BaseConfigInfo, ConnectStatus, CurrentDeviceInfo};
-use crate::util::Scheduler;
+use crate::handle::{BaseConfigInfo, ConnectStatus, CurrentDeviceInfo};
+use crate::util::{address_choose, dns_query_all, Scheduler};
 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,
 ) {
@@ -30,86 +30,60 @@ pub fn idle_route<Call: VntCallback>(
         log::info!("定时任务停止");
     }
 }
+
 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>>)>,
-    call: Call,
-    connect_count: usize,
-    handshake: Handshake,
-) {
-    let time = Instant::now();
-    idle_gateway_(
-        scheduler,
-        context,
-        current_device_info,
-        config,
-        tcp_socket_sender,
-        call,
-        connect_count,
-        handshake,
-        time,
-    );
-}
-pub fn idle_gateway_<Call: VntCallback>(
-    scheduler: &Scheduler,
-    context: Context,
-    current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
-    config: BaseConfigInfo,
-    tcp_socket_sender: AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
+    connect_util: ConnectUtil,
     call: Call,
     mut connect_count: usize,
     handshake: Handshake,
-    mut time: Instant,
 ) {
     idle_gateway0(
         &context,
         &current_device_info,
         &config,
-        &tcp_socket_sender,
+        &connect_util,
         &call,
         &mut connect_count,
         &handshake,
-        &mut time,
     );
-    let rs = scheduler.timeout(Duration::from_secs(5), move |s| {
-        idle_gateway_(
+    let rs = scheduler.timeout(Duration::from_secs(8), move |s| {
+        idle_gateway(
             s,
             context,
             current_device_info,
             config,
-            tcp_socket_sender,
+            connect_util,
             call,
             connect_count,
             handshake,
-            time,
         )
     });
     if !rs {
         log::info!("定时任务停止");
     }
 }
+
 fn idle_gateway0<Call: VntCallback>(
-    context: &Context,
+    context: &ChannelContext,
     current_device: &AtomicCell<CurrentDeviceInfo>,
     config: &BaseConfigInfo,
-    tcp_socket_sender: &AcceptSocketSender<(TcpStream, SocketAddr, Option<Vec<u8>>)>,
+    connect_util: &ConnectUtil,
     call: &Call,
     connect_count: &mut usize,
     handshake: &Handshake,
-    time: &mut Instant,
 ) {
     if let Err(e) = check_gateway_channel(
         context,
         current_device,
         config,
-        tcp_socket_sender,
+        connect_util,
         call,
         connect_count,
         handshake,
-        time,
     ) {
         let cur = current_device.load();
         call.error(ErrorInfo::new_msg(
@@ -118,9 +92,10 @@ fn idle_gateway0<Call: VntCallback>(
         ));
     }
 }
+
 fn idle_route0<Call: VntCallback>(
     idle: &Idle,
-    context: &Context,
+    context: &ChannelContext,
     current_device: &AtomicCell<CurrentDeviceInfo>,
     call: &Call,
 ) -> Duration {
@@ -142,70 +117,94 @@ 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>>)>,
+    connect_util: &ConnectUtil,
     call: &Call,
     count: &mut usize,
     handshake: &Handshake,
-    time: &mut Instant,
 ) -> io::Result<()> {
     let mut current_device = current_device_info.load();
     if current_device.status.offline() {
         *count += 1;
-        if time.elapsed() < Duration::from_secs(6 * 60) {
-            // 探测服务器地址
-            current_device = domain_request0(current_device_info, config);
-            *time = Instant::now()
+        let connect_protocol = context.main_protocol();
+        if connect_protocol.is_transport() {
+            // 传输层的协议需要探测服务器地址
+            current_device =
+                domain_request0(current_device_info, config, context.default_interface());
         }
         //需要重连
         call.connect(ConnectInfo::new(*count, current_device.connect_server));
         log::info!("发送握手请求,{:?}", config);
-        if let Err(e) = handshake.send(context, config.client_secret, current_device.connect_server)
+        if let Err(e) = handshake.send(context, config.server_secret, current_device.connect_server)
         {
             log::warn!("{:?}", e);
-            if context.is_main_tcp() {
-                let request_packet = handshaker::handshake_request_packet(config.client_secret)?;
-                //tcp需要重连
-                let tcp_stream = std::net::TcpStream::connect_timeout(
-                    &current_device.connect_server,
-                    Duration::from_secs(5),
-                )?;
-                tcp_stream.set_nonblocking(true)?;
-                if let Err(e) = tcp_socket_sender.try_add_socket((
-                    TcpStream::from_std(tcp_stream),
-                    current_device.connect_server,
-                    Some(request_packet.into_buffer()),
-                )) {
-                    log::warn!("{:?}", e)
+            let request_packet = handshake.handshake_request_packet(config.server_secret)?;
+            match connect_protocol {
+                ConnectProtocol::UDP => {}
+                ConnectProtocol::TCP => {
+                    connect_util.try_connect_tcp(
+                        request_packet.into_buffer(),
+                        current_device.connect_server,
+                    );
+                }
+                ConnectProtocol::WS | ConnectProtocol::WSS => {
+                    connect_util
+                        .try_connect_ws(request_packet.into_buffer(), config.server_addr.clone());
                 }
             }
         }
     }
     Ok(())
 }
+
 pub fn domain_request0(
     current_device: &AtomicCell<CurrentDeviceInfo>,
     config: &BaseConfigInfo,
+    default_interface: &LocalInterface,
 ) -> CurrentDeviceInfo {
     let mut current_dev = current_device.load();
+
     // 探测服务端地址变化
-    if let Ok(mut addr) = config.server_addr.to_socket_addrs() {
-        if let Some(addr) = addr.next() {
-            if addr != current_dev.connect_server {
-                let mut tmp = current_dev.clone();
-                tmp.connect_server = addr;
-                let rs = current_device.compare_exchange(current_dev, tmp);
-                current_dev.connect_server = addr;
-                log::info!(
-                    "服务端地址变化,旧地址:{}，新地址:{},替换结果:{}",
-                    current_dev.connect_server,
-                    addr,
-                    rs.is_ok()
-                );
+    match dns_query_all(
+        &config.server_addr,
+        config.name_servers.clone(),
+        default_interface,
+    ) {
+        Ok(addrs) => {
+            log::info!(
+                "domain {} dns {:?} addr {:?}",
+                config.server_addr,
+                config.name_servers,
+                addrs
+            );
+
+            match address_choose(addrs) {
+                Ok(addr) => {
+                    if addr != current_dev.connect_server {
+                        let mut tmp = current_dev.clone();
+                        tmp.connect_server = addr;
+                        let rs = current_device.compare_exchange(current_dev, tmp);
+                        log::info!(
+                            "服务端地址变化,旧地址:{}，新地址:{},替换结果:{}",
+                            current_dev.connect_server,
+                            addr,
+                            rs.is_ok()
+                        );
+                        if rs.is_ok() {
+                            current_dev.connect_server = addr;
+                        }
+                    }
+                }
+                Err(e) => {
+                    log::error!("域名地址选择失败:{:?},domain={}", e, config.server_addr);
+                }
             }
         }
+        Err(e) => {
+            log::error!("域名解析失败:{:?},domain={}", e, config.server_addr);
+        }
     }
     current_dev
 }

vnt/src/handle/maintain/mod.rs

@@ -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::*;

vnt/src/handle/maintain/punch.rs

@@ -1,22 +1,25 @@
+use std::collections::HashMap;
 use std::net::Ipv4Addr;
+use std::ops::{Div, Mul};
 use std::sync::mpsc::{sync_channel, Receiver, SyncSender};
 use std::sync::Arc;
+use std::thread;
 use std::time::Duration;
-use std::{io, thread};
 
+use anyhow::anyhow;
 use crossbeam_utils::atomic::AtomicCell;
 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)]
@@ -26,6 +29,7 @@ pub struct PunchSender {
     sender_cone_self: SyncSender<(Ipv4Addr, NatInfo)>,
     sender_cone_peer: SyncSender<(Ipv4Addr, NatInfo)>,
 }
+
 impl PunchSender {
     pub fn send(&self, src_peer: bool, ip: Ipv4Addr, info: NatInfo) -> bool {
         log::info!(
@@ -53,17 +57,19 @@ impl PunchSender {
         sender.try_send((ip, info)).is_ok()
     }
 }
+
 pub struct PunchReceiver {
     receiver_peer: Receiver<(Ipv4Addr, NatInfo)>,
     receiver_self: Receiver<(Ipv4Addr, NatInfo)>,
     receiver_cone_peer: Receiver<(Ipv4Addr, NatInfo)>,
     receiver_cone_self: Receiver<(Ipv4Addr, NatInfo)>,
 }
+
 pub fn punch_channel() -> (PunchSender, PunchReceiver) {
-    let (sender_self, receiver_self) = sync_channel(1);
-    let (sender_peer, receiver_peer) = sync_channel(1);
-    let (sender_cone_peer, receiver_cone_peer) = sync_channel(1);
-    let (sender_cone_self, receiver_cone_self) = sync_channel(1);
+    let (sender_self, receiver_self) = sync_channel(0);
+    let (sender_peer, receiver_peer) = sync_channel(0);
+    let (sender_cone_peer, receiver_cone_peer) = sync_channel(0);
+    let (sender_cone_self, receiver_cone_self) = sync_channel(0);
     (
         PunchSender {
             sender_self,
@@ -82,31 +88,36 @@ 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>)>>,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
     client_cipher: Cipher,
     receiver: PunchReceiver,
     punch: Punch,
 ) {
+    let punch_record = Arc::new(Mutex::new(HashMap::new()));
+    let last_punch_record = HashMap::new();
     punch_request(
         scheduler,
         context,
         nat_test,
-        device_list,
+        device_map,
         current_device.clone(),
         client_cipher.clone(),
         0,
+        punch_record.clone(),
+        last_punch_record,
     );
     let f = |receiver: Receiver<(Ipv4Addr, NatInfo)>| {
         let punch = punch.clone();
         let current_device = current_device.clone();
         let client_cipher = client_cipher.clone();
+        let punch_record = punch_record.clone();
         thread::Builder::new()
             .name("punch".into())
             .spawn(move || {
-                punch_start(receiver, punch, current_device, client_cipher);
+                punch_start(receiver, punch, current_device, client_cipher, punch_record);
             })
             .expect("punch");
     };
@@ -122,21 +133,33 @@ fn punch_start(
     mut punch: Punch,
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
     client_cipher: Cipher,
+    punch_record: Arc<Mutex<HashMap<Ipv4Addr, usize>>>,
 ) {
     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());
         packet.set_source(current_device.load().virtual_ip());
         packet.set_destination(peer_ip);
-        log::info!("发起打洞，目标:{:?},{:?}", peer_ip, nat_info);
+        let count = {
+            let mut guard = punch_record.lock();
+            if let Some(v) = guard.get_mut(&peer_ip) {
+                *v += 1;
+                *v
+            } else {
+                guard.insert(peer_ip, 0);
+                0
+            }
+        };
+        log::info!("第{}次发起打洞,目标:{:?},{:?} ", count, peer_ip, nat_info);
+
         if let Err(e) = client_cipher.encrypt_ipv4(&mut packet) {
             log::error!("{:?}", e);
             continue;
         }
-        if let Err(e) = punch.punch(packet.buffer(), peer_ip, nat_info) {
+        if let Err(e) = punch.punch(packet.buffer(), peer_ip, nat_info, count < 2, count) {
             log::warn!("{:?}", e)
         }
     }
@@ -145,94 +168,144 @@ fn punch_start(
 /// 定时发起打洞请求
 fn punch_request(
     scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
     nat_test: NatTest,
-    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
     client_cipher: Cipher,
     count: usize,
+    punch_record: Arc<Mutex<HashMap<Ipv4Addr, usize>>>,
+    mut last_punch_record: HashMap<Ipv4Addr, PunchRecordItem>,
 ) {
     let curr = current_device.load();
     let secs = if curr.status.online() {
-        if let Err(e) = punch0(&context, &nat_test, &device_list, curr, &client_cipher) {
+        if let Err(e) = punch0(
+            &context,
+            &nat_test,
+            &device_map,
+            curr,
+            &client_cipher,
+            &punch_record,
+            &mut last_punch_record,
+            count,
+        ) {
             log::warn!("{:?}", e)
         }
-        let sleep_time = [3, 5, 7, 11, 13, 17, 19, 23, 29];
+        let sleep_time = [6, 7];
         Duration::from_secs(sleep_time[count % sleep_time.len()])
     } else {
-        Duration::from_secs(3)
+        Duration::from_secs(5)
     };
     let rs = scheduler.timeout(secs, move |s| {
         punch_request(
             s,
             context,
             nat_test,
-            device_list,
+            device_map,
             current_device,
             client_cipher,
             count + 1,
+            punch_record,
+            last_punch_record,
         );
     });
     if !rs {
         log::info!("定时任务停止");
     }
 }
+#[derive(Copy, Clone, Default)]
+struct PunchRecordItem {
+    pub punch_record: usize,
+    pub last_p2p_num: usize,
+}
 
 /// 随机对需要打洞的客户端发起打洞请求
 fn punch0(
-    context: &Context,
+    context: &ChannelContext,
     nat_test: &NatTest,
-    device_list: &Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+    device_map: &Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     current_device: CurrentDeviceInfo,
     client_cipher: &Cipher,
-) -> io::Result<()> {
+    punch_record: &Mutex<HashMap<Ipv4Addr, usize>>,
+    last_punch_record: &mut HashMap<Ipv4Addr, PunchRecordItem>,
+    total_count: usize,
+) -> anyhow::Result<()> {
     let nat_info = nat_test.nat_info();
+    if total_count < 10
+        && (nat_info.public_ips.is_empty()
+            || nat_info.public_ports.is_empty()
+            || nat_info.public_ports[0] == 0
+            || nat_info.public_ports.iter().filter(|&&v| v == 0).count()
+                > nat_info.public_ports.len() / 2)
+    {
+        log::info!("未获取到公网地址，暂时放弃打洞,第{}轮", total_count);
+        return Ok(());
+    }
     let current_ip = current_device.virtual_ip;
-    let mut list: Vec<PeerDeviceInfo> = device_list
+    let mut list: Vec<PeerDeviceInfo> = device_map
         .lock()
         .1
-        .iter()
-        .filter(|info| info.status.is_online() && info.virtual_ip > current_ip)
+        .values()
+        .filter(|info| !info.wireguard && info.virtual_ip > current_ip)
         .cloned()
         .collect();
     list.shuffle(&mut rand::thread_rng());
-    let mut count = 0;
-    // // 优先没打洞的 need_punch会过滤掉已经打洞成功的
-    // list.sort_by(|v1, v2| {
-    //     if context.route_table.route_one_p2p(&v1.virtual_ip).is_none() {
-    //         Ordering::Less
-    //     } else if context.route_table.route_one_p2p(&v2.virtual_ip).is_none() {
-    //         Ordering::Greater
-    //     } else {
-    //         Ordering::Equal
-    //     }
-    // });
     for info in list {
-        if !info.status.is_online() {
+        if info.status.is_offline() {
+            // 客户端掉线了要重置打洞记录
+            punch_record.lock().remove(&info.virtual_ip);
             continue;
         }
-        if info.virtual_ip <= current_device.virtual_ip {
-            continue;
+        let mut punch_count = punch_record
+            .lock()
+            .get(&info.virtual_ip)
+            .cloned()
+            .unwrap_or(0)
+            .mul(2)
+            .div(3);
+        let p2p_num = context.route_table.p2p_num(&info.virtual_ip);
+        let mut max_punch_interval = 50;
+        if p2p_num > 0 {
+            if p2p_num >= context.channel_num() {
+                //通道数满足要求，不再打洞
+                if punch_count != 0 {
+                    punch_record.lock().remove(&info.virtual_ip);
+                }
+                continue;
+            }
+            //有p2p通道，但是通道数量不够，则继续打洞
+            // 提高等待上限
+            max_punch_interval = 300;
         }
-        if !context.route_table.need_punch(&info.virtual_ip) {
-            continue;
+        // 能发起打洞的前提是自己空闲，这里会间隔5秒以上发起一次打洞，所以假定上一轮打洞已结束
+        let last_punch = last_punch_record.entry(info.virtual_ip).or_default();
+        if last_punch.last_p2p_num > p2p_num {
+            // 打的洞掉线了,需要重置重新打
+            punch_record.lock().remove(&info.virtual_ip);
+            punch_count = 0;
         }
-        count += 1;
-        if count > 2 {
+
+        // 梯度增加打洞时间间隔
+        if total_count > last_punch.punch_record + punch_count.min(max_punch_interval) {
+            // 记录打洞周期，抑制下一次打洞，从而递减打洞频率
+            last_punch.punch_record = total_count;
+            last_punch.last_p2p_num = p2p_num;
+            let packet = punch_packet(
+                client_cipher,
+                current_device.virtual_ip(),
+                &nat_info,
+                info.virtual_ip,
+            )?;
+            log::info!(
+                "目标:{:?},当前nat:{:?} 第{}次发起打洞协商请求， 第:{}轮",
+                info.virtual_ip,
+                nat_info,
+                punch_count,
+                total_count,
+            );
+            context.send_default(&packet, current_device.connect_server)?;
             break;
         }
-        let packet = punch_packet(
-            client_cipher,
-            current_device.virtual_ip(),
-            &nat_info,
-            info.virtual_ip,
-        )?;
-        log::info!(
-            "发起打洞协商请求，目标:{:?},{:?}",
-            info.virtual_ip,
-            nat_info
-        );
-        context.send_default(packet.buffer(), current_device.connect_server)?;
     }
     Ok(())
 }
@@ -242,7 +315,7 @@ fn punch_packet(
     virtual_ip: Ipv4Addr,
     nat_info: &NatInfo,
     dest: Ipv4Addr,
-) -> io::Result<NetPacket<Vec<u8>>> {
+) -> anyhow::Result<NetPacket<Vec<u8>>> {
     let mut punch_reply = PunchInfo::new();
     punch_reply.reply = false;
     punch_reply.public_ip_list = nat_info
@@ -253,6 +326,7 @@ fn punch_packet(
     punch_reply.public_port = nat_info.public_ports.get(0).map_or(0, |v| *v as u32);
     punch_reply.public_ports = nat_info.public_ports.iter().map(|e| *e as u32).collect();
     punch_reply.public_port_range = nat_info.public_port_range as u32;
+    punch_reply.public_tcp_port = nat_info.public_tcp_port as u32;
     punch_reply.local_ip = u32::from(nat_info.local_ipv4().unwrap_or(Ipv4Addr::UNSPECIFIED));
     punch_reply.local_port = nat_info.udp_ports[0] as u32;
     punch_reply.tcp_port = nat_info.tcp_port as u32;
@@ -262,12 +336,13 @@ fn punch_packet(
         punch_reply.ipv6 = ipv6.octets().to_vec();
     }
     punch_reply.nat_type = protobuf::EnumOrUnknown::new(PunchNatType::from(nat_info.nat_type));
+    punch_reply.punch_model = protobuf::EnumOrUnknown::new(nat_info.punch_model.into());
     log::info!("请求打洞={:?}", punch_reply);
     let bytes = punch_reply
         .write_to_bytes()
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("punch_packet {:?}", e)))?;
+        .map_err(|e| anyhow!("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);

vnt/src/handle/maintain/re_nat_type.rs

@@ -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>>>,
 ) {
@@ -29,9 +29,13 @@ fn retrieve_nat_type0(
         .name("natTest".into())
         .spawn(move || {
             if nat_test.can_update() {
-                let local_ipv4 = nat::local_ipv4();
+                let local_ipv4 = if nat_test.update_local_ipv4 {
+                    nat::local_ipv4()
+                } else {
+                    None
+                };
                 let local_ipv6 = nat::local_ipv6();
-                match nat_test.re_test(local_ipv4, local_ipv6) {
+                match nat_test.re_test(local_ipv4, local_ipv6, context.default_interface()) {
                     Ok(nat_info) => {
                         log::info!("当前nat信息:{:?}", nat_info);
                         if let Err(e) = context.switch(nat_info.nat_type, &udp_socket_sender) {
@@ -42,6 +46,9 @@ fn retrieve_nat_type0(
                         log::warn!("nat re_test {:?}", e);
                     }
                 };
+                #[cfg(feature = "upnp")]
+                nat_test.reset_upnp();
+                log::info!("刷新nat结束")
             }
         })
         .expect("natTest");

vnt/src/handle/maintain/up_status.rs

@@ -1,9 +1,9 @@
-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::util::{Scheduler, WatchSingleU64Adder, WatchU64Adder};
+use crate::protocol::{service_packet, NetPacket, Protocol, HEAD_LEN, MAX_TTL};
+use crate::util::Scheduler;
 use crossbeam_utils::atomic::AtomicCell;
 use protobuf::Message;
 use std::io;
@@ -13,45 +13,24 @@ 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,
 ) {
     let _ = scheduler.timeout(Duration::from_secs(60), move |x| {
-        up_status0(
-            x,
-            context,
-            current_device_info,
-            down_count_watcher,
-            up_count_watcher,
-        )
+        up_status0(x, context, current_device_info)
     });
 }
 
 fn up_status0(
     scheduler: &Scheduler,
-    context: Context,
+    context: ChannelContext,
     current_device_info: Arc<AtomicCell<CurrentDeviceInfo>>,
-    down_count_watcher: WatchU64Adder,
-    up_count_watcher: WatchSingleU64Adder,
 ) {
-    if let Err(e) = send_up_status_packet(
-        &context,
-        &current_device_info,
-        &down_count_watcher,
-        &up_count_watcher,
-    ) {
+    if let Err(e) = send_up_status_packet(&context, &current_device_info) {
         log::warn!("{:?}", e)
     }
     let rs = scheduler.timeout(Duration::from_secs(10 * 60), move |x| {
-        up_status0(
-            x,
-            context,
-            current_device_info,
-            down_count_watcher,
-            up_count_watcher,
-        )
+        up_status0(x, context, current_device_info)
     });
     if !rs {
         log::info!("定时任务停止");
@@ -59,10 +38,8 @@ 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,
 ) -> io::Result<()> {
     let device_info = current_device_info.load();
     if device_info.status.offline() {
@@ -79,8 +56,8 @@ fn send_up_status_packet(
         item.next_ip = ip.into();
         message.p2p_list.push(item);
     }
-    message.up_stream = up_count_watcher.get();
-    message.down_stream = down_count_watcher.get();
+    message.up_stream = context.up_traffic_meter.as_ref().map_or(0, |v| v.total());
+    message.down_stream = context.down_traffic_meter.as_ref().map_or(0, |v| v.total());
     message.nat_type = protobuf::EnumOrUnknown::new(if context.is_cone() {
         PunchNatType::Cone
     } else {
@@ -91,7 +68,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);
@@ -99,6 +76,6 @@ fn send_up_status_packet(
     net_packet.set_source(device_info.virtual_ip);
     net_packet.set_destination(device_info.virtual_gateway);
     net_packet.set_payload(&buf)?;
-    context.send_default(net_packet.buffer(), device_info.connect_server)?;
+    context.send_default(&net_packet, device_info.connect_server)?;
     Ok(())
 }

vnt/src/handle/mod.rs

@@ -1,11 +1,14 @@
+use crate::channel::socket::LocalInterface;
 use crossbeam_utils::atomic::AtomicCell;
-use std::net::{Ipv4Addr, SocketAddr};
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 pub mod callback;
+mod extension;
 pub mod handshaker;
 pub mod maintain;
 pub mod recv_data;
 pub mod registrar;
+#[cfg(feature = "integrated_tun")]
 pub mod tun_tap;
 
 const SELF_IP: Ipv4Addr = Ipv4Addr::new(0, 0, 0, 2);
@@ -20,27 +23,32 @@ pub fn now_time() -> u64 {
     }
 }
 
-/// 是否在一个网段
-fn check_dest(dest: Ipv4Addr, virtual_netmask: Ipv4Addr, virtual_network: Ipv4Addr) -> bool {
-    u32::from_be_bytes(dest.octets()) & u32::from_be_bytes(virtual_netmask.octets())
-        == u32::from_be_bytes(virtual_network.octets())
-}
-
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PeerDeviceInfo {
     pub virtual_ip: Ipv4Addr,
     pub name: String,
     pub status: PeerDeviceStatus,
     pub client_secret: bool,
+    pub client_secret_hash: Vec<u8>,
+    pub wireguard: bool,
 }
 
 impl PeerDeviceInfo {
-    pub fn new(virtual_ip: Ipv4Addr, name: String, status: u8, client_secret: bool) -> Self {
+    pub fn new(
+        virtual_ip: Ipv4Addr,
+        name: String,
+        status: u8,
+        client_secret: bool,
+        client_secret_hash: Vec<u8>,
+        wireguard: bool,
+    ) -> Self {
         Self {
             virtual_ip,
             name,
             status: PeerDeviceStatus::from(status),
             client_secret,
+            client_secret_hash,
+            wireguard,
         }
     }
 }
@@ -50,9 +58,20 @@ pub struct BaseConfigInfo {
     pub name: String,
     pub token: String,
     pub ip: Option<Ipv4Addr>,
-    pub client_secret: bool,
+    pub client_secret_hash: Option<[u8; 16]>,
+    pub server_secret: bool,
     pub device_id: String,
     pub server_addr: String,
+    pub name_servers: Vec<String>,
+    pub mtu: u32,
+    #[cfg(feature = "integrated_tun")]
+    #[cfg(target_os = "windows")]
+    pub tap: bool,
+    #[cfg(feature = "integrated_tun")]
+    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    pub device_name: Option<String>,
+    pub allow_wire_guard: bool,
+    pub default_interface: LocalInterface,
 }
 
 impl BaseConfigInfo {
@@ -60,17 +79,39 @@ impl BaseConfigInfo {
         name: String,
         token: String,
         ip: Option<Ipv4Addr>,
-        client_secret: bool,
+        client_secret_hash: Option<[u8; 16]>,
+        server_secret: bool,
         device_id: String,
         server_addr: String,
+        name_servers: Vec<String>,
+        mtu: u32,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(target_os = "windows")]
+        tap: bool,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+        device_name: Option<String>,
+        allow_wire_guard: bool,
+        default_interface: LocalInterface,
     ) -> Self {
         Self {
             name,
             token,
             ip,
-            client_secret,
+            client_secret_hash,
+            server_secret,
             device_id,
             server_addr,
+            name_servers,
+            mtu,
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(target_os = "windows")]
+            tap,
+            #[cfg(feature = "integrated_tun")]
+            #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+            device_name,
+            allow_wire_guard,
+            default_interface,
         }
     }
 }
@@ -85,6 +126,9 @@ impl PeerDeviceStatus {
     pub fn is_online(&self) -> bool {
         self == &PeerDeviceStatus::Online
     }
+    pub fn is_offline(&self) -> bool {
+        self == &PeerDeviceStatus::Offline
+    }
 }
 
 impl Into<u8> for PeerDeviceStatus {
@@ -179,10 +223,10 @@ impl CurrentDeviceInfo {
         virtual_gateway: Ipv4Addr,
     ) {
         let broadcast_ip = (!u32::from_be_bytes(virtual_netmask.octets()))
-            | u32::from_be_bytes(virtual_gateway.octets());
+            | u32::from_be_bytes(virtual_ip.octets());
         let broadcast_ip = Ipv4Addr::from(broadcast_ip);
-        let virtual_network = u32::from_be_bytes(virtual_netmask.octets())
-            & u32::from_be_bytes(virtual_gateway.octets());
+        let virtual_network =
+            u32::from_be_bytes(virtual_netmask.octets()) & u32::from_be_bytes(virtual_ip.octets());
         let virtual_network = Ipv4Addr::from(virtual_network);
         self.virtual_ip = virtual_ip;
         self.virtual_netmask = virtual_netmask;
@@ -198,9 +242,24 @@ impl CurrentDeviceInfo {
     pub fn virtual_gateway(&self) -> Ipv4Addr {
         self.virtual_gateway
     }
+    #[inline]
     pub fn is_gateway(&self, ip: &Ipv4Addr) -> bool {
         &self.virtual_gateway == ip || ip == &GATEWAY_IP
     }
+    #[inline]
+    pub fn not_in_network(&self, ip: Ipv4Addr) -> bool {
+        u32::from(ip) & u32::from(self.virtual_netmask) != u32::from(self.virtual_network)
+    }
+    pub fn is_server_addr(&self, addr: SocketAddr) -> bool {
+        if self.connect_server == addr {
+            return true;
+        }
+        let f = |ip: IpAddr| match ip {
+            IpAddr::V4(v4) => Some(v4),
+            IpAddr::V6(v6) => v6.to_ipv4(),
+        };
+        addr.port() == self.connect_server.port() && f(addr.ip()) == f(self.connect_server.ip())
+    }
 }
 pub fn change_status(
     current_device: &AtomicCell<CurrentDeviceInfo>,

vnt/src/handle/recv_data/client.rs

@@ -1,5 +1,5 @@
+use anyhow::anyhow;
 use std::collections::HashMap;
-use std::io;
 use std::net::{Ipv4Addr, Ipv6Addr};
 use std::sync::Arc;
 
@@ -9,14 +9,13 @@ use protobuf::Message;
 use packet::icmp::{icmp, Kind};
 use packet::ip::ipv4;
 use packet::ip::ipv4::packet::IpV4Packet;
-use tun::device::IFace;
-use tun::Device;
 
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::punch::NatInfo;
 use crate::channel::{Route, RouteKey};
 use crate::cipher::Cipher;
 use crate::external_route::AllowExternalRoute;
+use crate::handle::extension::handle_extension_tail;
 use crate::handle::maintain::PunchSender;
 use crate::handle::recv_data::PacketHandler;
 use crate::handle::CurrentDeviceInfo;
@@ -27,31 +26,35 @@ 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::vnt_device::DeviceWrite;
 
 /// 处理来源于客户端的包
 #[derive(Clone)]
-pub struct ClientPacketHandler {
-    device: Arc<Device>,
+pub struct ClientPacketHandler<Device> {
+    device: Device,
     client_cipher: Cipher,
     punch_sender: PunchSender,
     peer_nat_info_map: Arc<RwLock<HashMap<Ipv4Addr, NatInfo>>>,
     nat_test: NatTest,
     route: AllowExternalRoute,
     #[cfg(feature = "ip_proxy")]
+    #[cfg(feature = "integrated_tun")]
     ip_proxy_map: Option<IpProxyMap>,
 }
 
-impl ClientPacketHandler {
+impl<Device: DeviceWrite> ClientPacketHandler<Device> {
     pub fn new(
-        device: Arc<Device>,
+        device: Device,
         client_cipher: Cipher,
         punch_sender: PunchSender,
         peer_nat_info_map: Arc<RwLock<HashMap<Ipv4Addr, NatInfo>>>,
         nat_test: NatTest,
         route: AllowExternalRoute,
-        #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(feature = "ip_proxy")]
+        ip_proxy_map: Option<IpProxyMap>,
     ) -> Self {
         Self {
             device,
@@ -60,24 +63,37 @@ impl ClientPacketHandler {
             peer_nat_info_map,
             nat_test,
             route,
+            #[cfg(feature = "integrated_tun")]
             #[cfg(feature = "ip_proxy")]
             ip_proxy_map,
         }
     }
 }
 
-impl PacketHandler for ClientPacketHandler {
+impl<Device: DeviceWrite> PacketHandler for ClientPacketHandler<Device> {
     fn handle(
         &self,
         mut net_packet: NetPacket<&mut [u8]>,
+        mut extend: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         self.client_cipher.decrypt_ipv4(&mut net_packet)?;
         context
             .route_table
             .update_read_time(&net_packet.source(), &route_key);
+        //处理扩展
+        let net_packet = if net_packet.is_extension() {
+            //这样重用数组，减少一次数据拷贝
+            if handle_extension_tail(&mut net_packet, &mut extend)? {
+                extend
+            } else {
+                net_packet
+            }
+        } else {
+            net_packet
+        };
         match net_packet.protocol() {
             Protocol::Service => {}
             Protocol::Error => {}
@@ -96,14 +112,14 @@ impl PacketHandler for ClientPacketHandler {
     }
 }
 
-impl ClientPacketHandler {
+impl<Device: DeviceWrite> ClientPacketHandler<Device> {
     fn ip_turn(
         &self,
         mut net_packet: NetPacket<&mut [u8]>,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
         route_key: RouteKey,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         let destination = net_packet.destination();
         let source = net_packet.source();
         match ip_turn_packet::Protocol::from(net_packet.transport_protocol()) {
@@ -124,7 +140,7 @@ impl ClientPacketHandler {
                                 net_packet.set_destination(source);
                                 //不管加不加密，和接收到的数据长度都一致
                                 self.client_cipher.encrypt_ipv4(&mut net_packet)?;
-                                context.send_by_key(net_packet.buffer(), route_key)?;
+                                context.send_by_key(&net_packet, route_key)?;
                                 return Ok(());
                             }
                         }
@@ -143,7 +159,33 @@ 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")]
+                    #[cfg(feature = "integrated_tun")]
                     if let Some(ip_proxy_map) = &self.ip_proxy_map {
                         if ip_proxy_map.recv_handle(&mut ipv4, source, destination)? {
                             return Ok(());
@@ -152,6 +194,9 @@ impl ClientPacketHandler {
                 }
                 self.device.write(net_packet.payload())?;
             }
+            ip_turn_packet::Protocol::WGIpv4 => {
+                // WG客户端的数据不会直接发过来，不用处理
+            }
             ip_turn_packet::Protocol::Ipv4Broadcast => {
                 //客户端不帮忙转发广播包，所以不会出现这种类型的数据
             }
@@ -161,23 +206,23 @@ impl ClientPacketHandler {
     }
     fn control(
         &self,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
         mut net_packet: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         let metric = net_packet.source_ttl() - net_packet.ttl() + 1;
         let source = net_packet.source();
         match ControlPacket::new(net_packet.transport_protocol(), net_packet.payload())? {
             ControlPacket::PingPacket(_) => {
+                let route = Route::from_default_rt(route_key, metric);
+                context.route_table.add_route_if_absent(source, route);
                 net_packet.set_transport_protocol(control_packet::Protocol::Pong.into());
                 net_packet.set_source(current_device.virtual_ip);
                 net_packet.set_destination(source);
                 net_packet.first_set_ttl(MAX_TTL);
                 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, metric);
-                context.route_table.add_route_if_absent(source, route);
+                context.send_by_key(&net_packet, route_key)?;
             }
             ControlPacket::PongPacket(pong_packet) => {
                 let current_time = crate::handle::now_time() as u16;
@@ -193,28 +238,43 @@ impl ClientPacketHandler {
                 if context.use_channel_type().is_only_relay() {
                     return Ok(());
                 }
+                //忽略掉来源于自己的包
+                if self
+                    .nat_test
+                    .is_local_address(route_key.protocol().is_base_tcp(), route_key.addr)
+                {
+                    return Ok(());
+                }
+
                 //回应
                 net_packet.set_transport_protocol(control_packet::Protocol::PunchResponse.into());
                 net_packet.set_source(current_device.virtual_ip);
                 net_packet.set_destination(source);
                 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);
+                context.send_by_key(&net_packet, route_key)?;
+                // 收到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(());
                 }
-                let route = Route::from_default_rt(route_key, 1);
+                if self
+                    .nat_test
+                    .is_local_address(route_key.protocol().is_base_tcp(), route_key.addr)
+                {
+                    return Ok(());
+                }
+                let route = Route::from_default_rt(route_key, metric);
                 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);
@@ -224,7 +284,7 @@ impl ClientPacketHandler {
                     addr_packet.set_ipv4(ipv4);
                     addr_packet.set_port(route_key.addr.port());
                     self.client_cipher.encrypt_ipv4(&mut packet)?;
-                    context.send_by_key(packet.buffer(), route_key)?;
+                    context.send_by_key(&packet, route_key)?;
                 }
                 std::net::IpAddr::V6(_) => {}
             },
@@ -234,21 +294,19 @@ impl ClientPacketHandler {
     }
     fn other_turn(
         &self,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
         net_packet: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         if context.use_channel_type().is_only_relay() {
             return Ok(());
         }
         let source = net_packet.source();
         match other_turn_packet::Protocol::from(net_packet.transport_protocol()) {
             other_turn_packet::Protocol::Punch => {
-                let mut punch_info =
-                    PunchInfo::parse_from_bytes(net_packet.payload()).map_err(|e| {
-                        io::Error::new(io::ErrorKind::Other, format!("PunchInfo {:?}", e))
-                    })?;
+                let mut punch_info = PunchInfo::parse_from_bytes(net_packet.payload())
+                    .map_err(|e| anyhow!("PunchInfo {:?}", e))?;
                 let public_ips = punch_info
                     .public_ip_list
                     .iter()
@@ -256,6 +314,7 @@ impl ClientPacketHandler {
                     .collect();
                 let local_ipv4 = Some(Ipv4Addr::from(punch_info.local_ip.to_be_bytes()));
                 let tcp_port = punch_info.tcp_port as u16;
+                let public_tcp_port = punch_info.public_tcp_port as u16;
                 let ipv6 = if punch_info.ipv6.len() == 16 {
                     let ipv6: [u8; 16] = punch_info.ipv6.try_into().unwrap();
                     Some(Ipv6Addr::from(ipv6))
@@ -278,7 +337,9 @@ impl ClientPacketHandler {
                     ipv6,
                     punch_info.udp_ports.iter().map(|e| *e as u16).collect(),
                     tcp_port,
+                    public_tcp_port,
                     punch_info.nat_type.enum_value_or_default().into(),
+                    punch_info.punch_model.enum_value_or_default().into(),
                 );
                 {
                     let peer_nat_info = peer_nat_info.clone();
@@ -298,8 +359,11 @@ impl ClientPacketHandler {
                         nat_info.public_ports.iter().map(|e| *e as u32).collect();
                     punch_reply.public_port_range = nat_info.public_port_range as u32;
                     punch_reply.tcp_port = nat_info.tcp_port as u32;
+                    punch_reply.public_tcp_port = nat_info.public_tcp_port as u32;
                     punch_reply.nat_type =
                         protobuf::EnumOrUnknown::new(PunchNatType::from(nat_info.nat_type));
+                    punch_reply.punch_model =
+                        protobuf::EnumOrUnknown::new(nat_info.punch_model.into());
                     punch_reply.local_ip =
                         u32::from(nat_info.local_ipv4().unwrap_or(Ipv4Addr::UNSPECIFIED));
                     punch_reply.local_port = nat_info.udp_ports[0] as u32;
@@ -308,12 +372,12 @@ impl ClientPacketHandler {
                         punch_reply.ipv6 = ipv6.octets().to_vec();
                         punch_reply.ipv6_port = nat_info.udp_ports[0] as u32;
                     }
-                    let bytes = punch_reply.write_to_bytes().map_err(|e| {
-                        io::Error::new(io::ErrorKind::Other, format!("punch_reply {:?}", e))
-                    })?;
+                    let bytes = punch_reply
+                        .write_to_bytes()
+                        .map_err(|e| anyhow!("punch_reply {:?}", e))?;
                     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);
@@ -322,7 +386,7 @@ impl ClientPacketHandler {
                     punch_packet.set_payload(&bytes)?;
                     self.client_cipher.encrypt_ipv4(&mut punch_packet)?;
                     if self.punch_sender.send(true, source, peer_nat_info) {
-                        context.send_by_key(punch_packet.buffer(), route_key)?;
+                        context.send_by_key(&punch_packet, route_key)?;
                     }
                 } else {
                     self.punch_sender.send(false, source, peer_nat_info);

vnt/src/handle/recv_data/mod.rs

@@ -1,14 +1,12 @@
 use std::collections::HashMap;
 use std::net::Ipv4Addr;
 use std::sync::Arc;
-use std::{io, thread};
+use std::thread;
 
 use crossbeam_utils::atomic::AtomicCell;
 use parking_lot::{Mutex, RwLock};
 
-use tun::Device;
-
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::handler::RecvChannelHandler;
 use crate::channel::punch::NatInfo;
 use crate::channel::RouteKey;
@@ -26,38 +24,63 @@ use crate::handle::{BaseConfigInfo, CurrentDeviceInfo, PeerDeviceInfo, SELF_IP};
 #[cfg(feature = "ip_proxy")]
 use crate::ip_proxy::IpProxyMap;
 use crate::nat::NatTest;
-use crate::protocol::NetPacket;
-use crate::util::U64Adder;
+use crate::protocol::{NetPacket, HEAD_LEN};
+use crate::tun_tap_device::vnt_device::DeviceWrite;
 
 mod client;
 mod server;
 mod turn;
 
 #[derive(Clone)]
-pub struct RecvDataHandler<Call> {
+pub struct RecvDataHandler<Call, Device> {
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
     turn: TurnPacketHandler,
-    client: ClientPacketHandler,
-    server: ServerPacketHandler<Call>,
-    counter: U64Adder,
+    client: ClientPacketHandler<Device>,
+    server: ServerPacketHandler<Call, Device>,
+    nat_test: NatTest,
 }
 
-impl<Call: VntCallback> RecvChannelHandler for RecvDataHandler<Call> {
-    fn handle(&mut self, buf: &mut [u8], route_key: RouteKey, context: &Context) {
-        if let Err(e) = self.handle0(buf, route_key, context) {
-            log::error!("[{}]-{:?}", thread::current().name().unwrap_or(""), e);
+impl<Call: VntCallback, Device: DeviceWrite> RecvChannelHandler for RecvDataHandler<Call, Device> {
+    fn handle(
+        &self,
+        buf: &mut [u8],
+        extend: &mut [u8],
+        route_key: RouteKey,
+        context: &ChannelContext,
+    ) {
+        if buf.len() < HEAD_LEN {
+            return;
+        }
+        //判断stun响应包
+        if route_key.protocol().is_udp() {
+            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, extend, route_key, context) {
+            log::error!(
+                "[{}]-{:?}-{:?}",
+                thread::current().name().unwrap_or(""),
+                route_key.addr,
+                e
+            );
         }
     }
 }
 
-impl<Call: VntCallback> RecvDataHandler<Call> {
+impl<Call: VntCallback, Device: DeviceWrite> RecvDataHandler<Call, Device> {
     pub fn new(
         #[cfg(feature = "server_encrypt")] rsa_cipher: Arc<Mutex<Option<RsaCipher>>>,
         server_cipher: Cipher,
         client_cipher: Cipher,
         current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
-        device: Arc<Device>,
-        device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+        device: Device,
+        device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
         config_info: BaseConfigInfo,
         nat_test: NatTest,
         callback: Call,
@@ -65,9 +88,12 @@ impl<Call: VntCallback> RecvDataHandler<Call> {
         peer_nat_info_map: Arc<RwLock<HashMap<Ipv4Addr, NatInfo>>>,
         external_route: ExternalRoute,
         route: AllowExternalRoute,
-        #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
-        counter: U64Adder,
+        #[cfg(feature = "integrated_tun")]
+        #[cfg(feature = "ip_proxy")]
+        ip_proxy_map: Option<IpProxyMap>,
         handshake: Handshake,
+        #[cfg(feature = "integrated_tun")]
+        tun_device_helper: crate::tun_tap_device::tun_create_helper::TunDeviceHelper,
     ) -> Self {
         let server = ServerPacketHandler::new(
             #[cfg(feature = "server_encrypt")]
@@ -75,20 +101,23 @@ impl<Call: VntCallback> RecvDataHandler<Call> {
             server_cipher,
             current_device.clone(),
             device.clone(),
-            device_list,
+            device_map,
             config_info,
             nat_test.clone(),
             callback,
-            external_route,
+            external_route.clone(),
             handshake,
+            #[cfg(feature = "integrated_tun")]
+            tun_device_helper,
         );
         let client = ClientPacketHandler::new(
             device.clone(),
             client_cipher,
             punch_sender,
             peer_nat_info_map,
-            nat_test,
+            nat_test.clone(),
             route,
+            #[cfg(feature = "integrated_tun")]
             #[cfg(feature = "ip_proxy")]
             ip_proxy_map,
         );
@@ -98,19 +127,21 @@ impl<Call: VntCallback> RecvDataHandler<Call> {
             turn,
             client,
             server,
-            counter,
+            nat_test,
         }
     }
     fn handle0(
-        &mut self,
+        &self,
         buf: &mut [u8],
+        extend: &mut [u8],
         route_key: RouteKey,
-        context: &Context,
-    ) -> io::Result<()> {
-        // 统计流量
-        self.counter.add(buf.len() as _);
+        context: &ChannelContext,
+    ) -> anyhow::Result<()> {
         let net_packet = NetPacket::new(buf)?;
+
+        let extend = NetPacket::unchecked(extend);
         if net_packet.ttl() == 0 || net_packet.source_ttl() < net_packet.ttl() {
+            log::warn!("丢弃过时包:{:?} {}", net_packet.head(), route_key.addr);
             return Ok(());
         }
         let current_device = self.current_device.load();
@@ -122,20 +153,24 @@ impl<Call: VntCallback> RecvDataHandler<Call> {
             || dest.is_unspecified()
             || dest == current_device.broadcast_ip
         {
+            // 统计流量
+            if let Some(down_traffic_meter) = &context.down_traffic_meter {
+                down_traffic_meter.add_traffic(net_packet.source(), net_packet.data_len())
+            }
             //发给自己的包
             if net_packet.is_gateway() {
                 //服务端-客户端包
                 self.server
-                    .handle(net_packet, route_key, context, &current_device)
+                    .handle(net_packet, extend, route_key, context, &current_device)
             } else {
                 //客户端-客户端包
                 self.client
-                    .handle(net_packet, route_key, context, &current_device)
+                    .handle(net_packet, extend, route_key, context, &current_device)
             }
         } else {
             //转发包
             self.turn
-                .handle(net_packet, route_key, context, &current_device)
+                .handle(net_packet, extend, route_key, context, &current_device)
         }
     }
 }
@@ -144,8 +179,9 @@ pub trait PacketHandler {
     fn handle(
         &self,
         net_packet: NetPacket<&mut [u8]>,
+        extend: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
-    ) -> io::Result<()>;
+    ) -> anyhow::Result<()>;
 }

vnt/src/handle/recv_data/server.rs

@@ -1,3 +1,5 @@
+use anyhow::anyhow;
+use std::collections::HashMap;
 use std::io;
 use std::net::Ipv4Addr;
 use std::sync::Arc;
@@ -5,16 +7,13 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use crossbeam_utils::atomic::AtomicCell;
-use parking_lot::Mutex;
-use protobuf::Message;
-
 use packet::icmp::{icmp, Kind};
 use packet::ip::ipv4;
 use packet::ip::ipv4::packet::IpV4Packet;
-use tun::device::IFace;
-use tun::Device;
+use parking_lot::Mutex;
+use protobuf::Message;
 
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::{Route, RouteKey};
 use crate::cipher::Cipher;
 #[cfg(feature = "server_encrypt")]
@@ -25,48 +24,50 @@ use crate::handle::callback::{ErrorInfo, ErrorType, HandshakeInfo, RegisterInfo,
 use crate::handle::handshaker;
 use crate::handle::handshaker::Handshake;
 use crate::handle::recv_data::PacketHandler;
-use crate::handle::{
-    registrar, BaseConfigInfo, ConnectStatus, CurrentDeviceInfo, PeerDeviceInfo, GATEWAY_IP,
-};
+use crate::handle::{registrar, BaseConfigInfo, ConnectStatus, CurrentDeviceInfo, PeerDeviceInfo};
 use crate::nat::NatTest;
-use crate::proto;
 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::vnt_device::DeviceWrite;
+use crate::{proto, PeerClientInfo};
 
 /// 处理来源于服务端的包
 #[derive(Clone)]
-pub struct ServerPacketHandler<Call> {
+pub struct ServerPacketHandler<Call, Device> {
     #[cfg(feature = "server_encrypt")]
     rsa_cipher: Arc<Mutex<Option<RsaCipher>>>,
     server_cipher: Cipher,
     current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
-    device: Arc<Device>,
-    device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+    device: Device,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
     config_info: BaseConfigInfo,
     nat_test: NatTest,
     callback: Call,
     #[cfg(feature = "server_encrypt")]
     up_key_time: Arc<AtomicCell<Instant>>,
-    route_record: Arc<Mutex<Vec<(Ipv4Addr, Ipv4Addr)>>>,
     external_route: ExternalRoute,
     handshake: Handshake,
+    #[cfg(feature = "integrated_tun")]
+    tun_device_helper: crate::tun_tap_device::tun_create_helper::TunDeviceHelper,
 }
 
-impl<Call> ServerPacketHandler<Call> {
+impl<Call, Device> ServerPacketHandler<Call, Device> {
     pub fn new(
         #[cfg(feature = "server_encrypt")] rsa_cipher: Arc<Mutex<Option<RsaCipher>>>,
         server_cipher: Cipher,
         current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
-        device: Arc<Device>,
-        device_list: Arc<Mutex<(u16, Vec<PeerDeviceInfo>)>>,
+        device: Device,
+        device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
         config_info: BaseConfigInfo,
         nat_test: NatTest,
         callback: Call,
         external_route: ExternalRoute,
         handshake: Handshake,
+        #[cfg(feature = "integrated_tun")]
+        tun_device_helper: crate::tun_tap_device::tun_create_helper::TunDeviceHelper,
     ) -> Self {
         Self {
             #[cfg(feature = "server_encrypt")]
@@ -74,27 +75,41 @@ impl<Call> ServerPacketHandler<Call> {
             server_cipher,
             current_device,
             device,
-            device_list,
+            device_map,
             config_info,
             nat_test,
             callback,
             #[cfg(feature = "server_encrypt")]
-            up_key_time: Arc::new(AtomicCell::new(Instant::now() - Duration::from_secs(60))),
-            route_record: Arc::new(Mutex::default()),
+            up_key_time: Arc::new(AtomicCell::new(
+                Instant::now()
+                    .checked_sub(Duration::from_secs(60))
+                    .unwrap_or(Instant::now()),
+            )),
             external_route,
             handshake,
+            #[cfg(feature = "integrated_tun")]
+            tun_device_helper,
         }
     }
 }
 
-impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
+impl<Call: VntCallback, Device: DeviceWrite> PacketHandler for ServerPacketHandler<Call, Device> {
     fn handle(
         &self,
         mut net_packet: NetPacket<&mut [u8]>,
+        _extend: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
+        if !current_device.is_server_addr(route_key.addr) {
+            //拦截不是服务端的流量
+            log::warn!(
+                "route_key={:?},不是来源于服务端地址{}",
+                route_key,
+                current_device.connect_server
+            );
+        }
         context
             .route_table
             .update_read_time(&net_packet.source(), &route_key);
@@ -124,7 +139,7 @@ impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
                             self.config_info.token.clone(),
                             key,
                         )?;
-                        context.send_by_key(packet.buffer(), route_key)?;
+                        context.send_by_key(&packet, route_key)?;
                     }
                 }
             }
@@ -132,17 +147,49 @@ impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
         } else if net_packet.protocol() == Protocol::Service
             && net_packet.transport_protocol() == service_packet::Protocol::HandshakeResponse.into()
         {
-            let response =
-                HandshakeResponse::parse_from_bytes(net_packet.payload()).map_err(|e| {
-                    io::Error::new(io::ErrorKind::Other, format!("HandshakeResponse {:?}", e))
-                })?;
+            let response = HandshakeResponse::parse_from_bytes(net_packet.payload())
+                .map_err(|e| anyhow!("HandshakeResponse {:?}", e))?;
+            log::info!("握手响应:{:?},{}", route_key, response);
+            //设置为默认通道
+            context.set_default_route_key(route_key);
             //如果开启了加密，则发送加密握手请求
             #[cfg(feature = "server_encrypt")]
             if let Some(key) = self.server_cipher.key() {
+                {
+                    let guard = self.rsa_cipher.lock();
+                    if let Some(rsa_cipher) = guard.as_ref() {
+                        if rsa_cipher.finger() == &response.key_finger {
+                            let packet = handshaker::secret_handshake_request_packet(
+                                rsa_cipher,
+                                self.config_info.token.clone(),
+                                key,
+                            )?;
+                            drop(guard);
+                            context.send_by_key(&packet, route_key)?;
+                            return Ok(());
+                        }
+                        log::warn!(
+                            "拒绝服务端密钥对变化,原指纹:{:?}，新指纹:{:?}，addr:{:?}",
+                            rsa_cipher.finger(),
+                            response.key_finger,
+                            route_key
+                        );
+                        return Ok(());
+                    }
+                    drop(guard);
+                }
                 let rsa_cipher = RsaCipher::new(&response.public_key)?;
+                if rsa_cipher.finger() != &response.key_finger {
+                    log::info!(
+                        "服务端密钥和指纹不匹 配拒绝握手,指纹1:{:?}，指纹2:{:?}",
+                        rsa_cipher.finger(),
+                        response.key_finger
+                    );
+                    return Ok(());
+                }
                 let handshake_info = HandshakeInfo::new(
                     rsa_cipher.public_key()?.clone(),
-                    rsa_cipher.finger()?,
+                    response.key_finger,
                     response.version,
                 );
                 log::info!("加密握手请求:{:?}", handshake_info);
@@ -153,16 +200,19 @@ impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
                         self.config_info.token.clone(),
                         key,
                     )?;
-                    context.send_by_key(packet.buffer(), route_key)?;
+                    context.send_by_key(&packet, route_key)?;
                     self.rsa_cipher.lock().replace(rsa_cipher);
                 }
                 return Ok(());
             }
-
+            #[cfg(feature = "server_encrypt")]
+            if let Ok(rsa_cipher) = RsaCipher::new(&response.public_key) {
+                self.rsa_cipher.lock().replace(rsa_cipher);
+            }
             let handshake_info = HandshakeInfo::new_no_secret(response.version);
             if self.callback.handshake(handshake_info) {
                 //没有加密，则发送注册请求
-                self.register(current_device, context)?;
+                self.register(current_device, context, route_key)?;
             }
 
             return Ok(());
@@ -197,6 +247,11 @@ impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
                             _ => {}
                         }
                     }
+                    ip_turn_packet::Protocol::WGIpv4 => {
+                        if self.config_info.allow_wire_guard {
+                            self.device.write(net_packet.payload())?;
+                        }
+                    }
                     ip_turn_packet::Protocol::Ipv4Broadcast => {}
                     ip_turn_packet::Protocol::Unknown(_) => {}
                 }
@@ -208,14 +263,14 @@ impl<Call: VntCallback> PacketHandler for ServerPacketHandler<Call> {
     }
 }
 
-impl<Call: VntCallback> ServerPacketHandler<Call> {
+impl<Call: VntCallback, Device: DeviceWrite> ServerPacketHandler<Call, Device> {
     fn service(
         &self,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
         net_packet: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         match service_packet::Protocol::from(net_packet.transport_protocol()) {
             service_packet::Protocol::RegistrationResponse => {
                 let response = RegistrationResponse::parse_from_bytes(net_packet.payload())
@@ -237,6 +292,14 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                     context
                         .route_table
                         .add_route_if_absent(virtual_gateway, route);
+                    let public_ip = response.public_ip.into();
+                    let public_port = response.public_port as u16;
+                    self.nat_test
+                        .update_addr(route_key.index(), public_ip, public_port);
+                    if route_key.protocol().is_tcp() {
+                        log::info!("更新公网tcp端口 {public_port}");
+                        self.nat_test.update_tcp_port(public_port);
+                    }
                     let old = current_device;
                     let mut cur = *current_device;
                     loop {
@@ -245,7 +308,7 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                         new_current_device.virtual_ip = virtual_ip;
                         new_current_device.virtual_netmask = virtual_netmask;
                         new_current_device.virtual_gateway = virtual_gateway;
-                        new_current_device.status = crate::handle::ConnectStatus::Connected;
+                        new_current_device.status = ConnectStatus::Connected;
                         if let Err(c) = self
                             .current_device
                             .compare_exchange(cur, new_current_device)
@@ -256,10 +319,6 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                         }
                     }
 
-                    let public_ip = response.public_ip.into();
-                    let public_port = response.public_port as u16;
-                    self.nat_test
-                        .update_addr(route_key.index(), public_ip, public_port);
                     if old.virtual_ip != virtual_ip
                         || old.virtual_gateway != virtual_gateway
                         || old.virtual_netmask != virtual_netmask
@@ -267,57 +326,89 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                         if old.virtual_ip != Ipv4Addr::UNSPECIFIED {
                             log::info!("ip发生变化,old:{:?},response={:?}", old, response);
                         }
-                        if let Err(e) = self.device.set_ip(virtual_ip, virtual_netmask) {
-                            log::error!("LocalIpExists {:?}", e);
-                            self.callback.error(ErrorInfo::new_msg(
-                                ErrorType::LocalIpExists,
-                                format!("set_ip {:?}", e),
-                            ));
-                            return Ok(());
-                        }
-                        let mut guard = self.route_record.lock();
-                        for (dest, mask) in guard.drain(..) {
-                            if let Err(e) = self.device.delete_route(dest, mask) {
-                                log::warn!("删除路由失败 ={:?}", e);
-                            }
-                        }
-                        if let Err(e) = self.device.add_route(virtual_network, virtual_netmask, 1) {
-                            log::warn!("添加默认路由失败 ={:?}", e);
-                        } else {
-                            guard.push((virtual_network, virtual_netmask));
-                        }
-                        if let Err(e) =
-                            self.device
-                                .add_route(Ipv4Addr::BROADCAST, Ipv4Addr::BROADCAST, 1)
+                        let device_config = crate::handle::callback::DeviceConfig::new(
+                            #[cfg(feature = "integrated_tun")]
+                            #[cfg(target_os = "windows")]
+                            self.config_info.tap,
+                            #[cfg(feature = "integrated_tun")]
+                            #[cfg(any(
+                                target_os = "windows",
+                                target_os = "linux",
+                                target_os = "macos"
+                            ))]
+                            self.config_info.device_name.clone(),
+                            self.config_info.mtu,
+                            virtual_ip,
+                            virtual_netmask,
+                            virtual_gateway,
+                            virtual_network,
+                            self.external_route.to_route(),
+                        );
+                        #[cfg(not(feature = "integrated_tun"))]
+                        self.callback.create_device(device_config);
+                        #[cfg(feature = "integrated_tun")]
                         {
-                            log::warn!("添加广播路由失败 ={:?}", e);
-                        } else {
-                            guard.push((Ipv4Addr::BROADCAST, Ipv4Addr::BROADCAST));
-                        }
-
-                        if let Err(e) = self.device.add_route(
-                            Ipv4Addr::from([224, 0, 0, 0]),
-                            Ipv4Addr::from([240, 0, 0, 0]),
-                            1,
-                        ) {
-                            log::warn!("添加组播路由失败 ={:?}", e);
-                        } else {
-                            guard.push((
-                                Ipv4Addr::from([224, 0, 0, 0]),
-                                Ipv4Addr::from([240, 0, 0, 0]),
-                            ));
-                        }
-
-                        for (dest, mask) in self.external_route.to_route() {
-                            if let Err(e) = self.device.add_route(dest, mask, 1) {
-                                log::warn!("添加路由失败 ={:?}", e);
-                            } else {
-                                guard.push((dest, mask));
+                            self.tun_device_helper.stop();
+                            #[cfg(any(
+                                target_os = "windows",
+                                target_os = "linux",
+                                target_os = "macos"
+                            ))]
+                            match crate::tun_tap_device::create_device(
+                                device_config,
+                                &self.callback,
+                            ) {
+                                Ok(device) => {
+                                    let tun_info = crate::handle::callback::DeviceInfo::new(
+                                        device.name().unwrap_or("unknown".into()),
+                                        "".into(),
+                                    );
+                                    log::info!("tun信息{:?}", tun_info);
+                                    self.callback.create_tun(tun_info);
+                                    self.tun_device_helper
+                                        .start(device, self.config_info.allow_wire_guard)?;
+                                }
+                                Err(e) => {
+                                    log::error!("{:?}", e);
+                                    self.callback.error(e);
+                                }
+                            }
+                            #[cfg(target_os = "android")]
+                            {
+                                let device_config = crate::handle::callback::DeviceConfig::new(
+                                    self.config_info.mtu,
+                                    virtual_ip,
+                                    virtual_netmask,
+                                    virtual_gateway,
+                                    virtual_network,
+                                    self.external_route.to_route(),
+                                );
+                                let device_fd = self.callback.generate_tun(device_config);
+                                if device_fd == 0 {
+                                    self.callback.error(ErrorInfo::new_msg(
+                                        ErrorType::FailedToCrateDevice,
+                                        "device_fd == 0".into(),
+                                    ));
+                                } else {
+                                    let device =
+                                        unsafe { tun_rs::SyncDevice::from_fd(device_fd as _) };
+                                    if let Err(e) = self
+                                        .tun_device_helper
+                                        .start(Arc::new(device), self.config_info.allow_wire_guard)
+                                    {
+                                        self.callback.error(ErrorInfo::new_msg(
+                                            ErrorType::FailedToCrateDevice,
+                                            format!("{:?}", e),
+                                        ));
+                                    }
+                                }
                             }
                         }
-                        self.callback.success();
                     }
                     self.set_device_info_list(response.device_info_list, response.epoch as _);
+                    if old.status.offline() {
+                        self.callback.success();
+                    }
                 }
             }
             service_packet::Protocol::PushDeviceList => {
@@ -329,7 +420,7 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
             service_packet::Protocol::SecretHandshakeResponse => {
                 log::info!("SecretHandshakeResponse");
                 //加密握手结束，发送注册数据
-                self.register(current_device, context)?;
+                self.register(current_device, context, route_key)?;
             }
             _ => {
                 log::warn!(
@@ -349,23 +440,47 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                     info.name,
                     info.device_status as u8,
                     info.client_secret,
+                    info.client_secret_hash,
+                    info.wireguard,
                 )
             })
             .collect();
-        let mut dev = self.device_list.lock();
-        //这里可能会收到旧的消息，但是随着时间推移总会收到新的
-        dev.0 = epoch;
-        dev.1 = ip_list;
+        {
+            let mut dev = self.device_map.lock();
+            //这里可能会收到旧的消息，但是随着时间推移总会收到新的
+            dev.0 = epoch;
+            dev.1.clear();
+            for info in ip_list.clone() {
+                dev.1.insert(info.virtual_ip, info);
+            }
+        }
+        self.callback.peer_client_list(
+            ip_list
+                .into_iter()
+                .map(|v| PeerClientInfo::new(v.virtual_ip, v.name, v.status, v.client_secret))
+                .collect(),
+        );
     }
-    fn register(&self, current_device: &CurrentDeviceInfo, context: &Context) -> io::Result<()> {
+    fn register(
+        &self,
+        current_device: &CurrentDeviceInfo,
+        context: &ChannelContext,
+        route_key: RouteKey,
+    ) -> anyhow::Result<()> {
         if current_device.status.online() {
-            //已连接的不需要注册
+            log::info!("已连接的不需要注册，{:?}", self.config_info);
             return Ok(());
         }
+        //设置为默认通道
+        context.set_default_route_key(route_key);
         let token = self.config_info.token.clone();
         let device_id = self.config_info.device_id.clone();
         let name = self.config_info.name.clone();
-        let client_secret = self.config_info.client_secret;
+        let client_secret = self
+            .config_info
+            .client_secret_hash
+            .as_ref()
+            .map(|v| v.as_ref());
         let mut ip = self.config_info.ip;
         if ip.is_none() {
             ip = Some(current_device.virtual_ip)
@@ -382,11 +497,12 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
         )?;
         log::info!("发送注册请求，{:?}", self.config_info);
         //注册请求只发送到默认通道
-        context.send_default(response.buffer(), current_device.connect_server)
+        context.send_default(&response, current_device.connect_server)?;
+        Ok(())
     }
     fn error(
         &self,
-        context: &Context,
+        context: &ChannelContext,
         _current_device: &CurrentDeviceInfo,
         net_packet: NetPacket<&mut [u8]>,
         route_key: RouteKey,
@@ -403,12 +519,12 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                 self.callback.error(err);
                 //掉线epoch要归零
                 {
-                    let mut dev = self.device_list.lock();
+                    let mut dev = self.device_map.lock();
                     dev.0 = 0;
                     drop(dev);
                 }
                 self.handshake
-                    .send(context, self.config_info.client_secret, route_key.addr)?;
+                    .send(context, self.config_info.server_secret, route_key.addr)?;
                 // self.register(current_device, context, route_key)?;
             }
             InErrorPacket::AddressExhausted => {
@@ -436,11 +552,11 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
     }
     fn control(
         &self,
-        context: &Context,
+        context: &ChannelContext,
         current_device: &CurrentDeviceInfo,
         net_packet: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-    ) -> io::Result<()> {
+    ) -> anyhow::Result<()> {
         match ControlPacket::new(net_packet.transport_protocol(), net_packet.payload())? {
             ControlPacket::PongPacket(pong_packet) => {
                 let current_time = crate::handle::now_time() as u16;
@@ -451,21 +567,21 @@ impl<Call: VntCallback> ServerPacketHandler<Call> {
                 let rt = (current_time - pong_packet.time()) as i64;
                 let route = Route::from(route_key, metric, rt);
                 context.route_table.add_route(net_packet.source(), route);
-                let epoch = self.device_list.lock().0;
+                let epoch = self.device_map.lock().0;
                 if pong_packet.epoch() != epoch {
                     //纪元不一致，可能有新客户端连接，向服务端拉取客户端列表
                     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_destination(current_device.virtual_gateway);
+                    poll_device.set_default_version();
                     poll_device.set_gateway_flag(true);
                     poll_device.first_set_ttl(MAX_TTL);
                     poll_device.set_protocol(Protocol::Service);
                     poll_device
-                        .set_transport_protocol(service_packet::Protocol::PollDeviceList.into());
+                        .set_transport_protocol(service_packet::Protocol::PullDeviceList.into());
                     self.server_cipher.encrypt_ipv4(&mut poll_device)?;
                     //发送到默认服务端即可
-                    context.send_default(poll_device.buffer(), current_device.connect_server)?;
+                    context.send_default(&poll_device, current_device.connect_server)?;
                 }
             }
             ControlPacket::AddrResponse(addr_packet) => {

vnt/src/handle/recv_data/turn.rs

@@ -1,8 +1,9 @@
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
 use crate::channel::RouteKey;
 use crate::handle::recv_data::PacketHandler;
 use crate::handle::CurrentDeviceInfo;
 use crate::protocol::NetPacket;
+use anyhow::Context;
 
 /// 处理客户端中转包
 #[derive(Clone)]
@@ -18,13 +19,18 @@ impl PacketHandler for TurnPacketHandler {
     fn handle(
         &self,
         mut net_packet: NetPacket<&mut [u8]>,
+        _extend: NetPacket<&mut [u8]>,
         route_key: RouteKey,
-        context: &Context,
+        context: &ChannelContext,
         _current_device: &CurrentDeviceInfo,
-    ) -> std::io::Result<()> {
+    ) -> anyhow::Result<()> {
         // ttl减一
         let ttl = net_packet.incr_ttl();
         if ttl > 0 {
+            if net_packet.is_gateway() {
+                // 暂时不转发服务端包
+                return Ok(());
+            }
             let destination = net_packet.destination();
             if let Some(route) = context.route_table.route_one(&destination) {
                 if route.addr == route_key.addr {
@@ -33,12 +39,14 @@ impl PacketHandler for TurnPacketHandler {
                     return Ok(());
                 }
                 if route.metric <= ttl {
-                    context.send_by_key(net_packet.buffer(), route.route_key())?;
+                    return context
+                        .send_by_key(&net_packet, route.route_key())
+                        .context("转发失败");
                 }
             }
             //其他没有路由的不转发
         }
-
+        log::info!("没有路由 {:?},{:?}", route_key, net_packet.head());
         Ok(())
     }
 }

vnt/src/handle/registrar.rs

@@ -1,4 +1,4 @@
-use std::io;
+use anyhow::anyhow;
 use std::net::Ipv4Addr;
 
 use protobuf::Message;
@@ -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(
@@ -18,8 +18,8 @@ pub fn registration_request_packet(
     ip: Option<Ipv4Addr>,
     is_fast: bool,
     allow_ip_change: bool,
-    client_secret: bool,
-) -> io::Result<NetPacket<Vec<u8>>> {
+    client_secret_hash: Option<&[u8]>,
+) -> anyhow::Result<NetPacket<Vec<u8>>> {
     let mut request = RegistrationRequest::new();
     request.token = token;
     request.device_id = device_id;
@@ -30,15 +30,20 @@ pub fn registration_request_packet(
     request.allow_ip_change = allow_ip_change;
     request.is_fast = is_fast;
     request.version = crate::VNT_VERSION.to_string();
-    request.client_secret = client_secret;
-    let bytes = request.write_to_bytes().map_err(|e| {
-        io::Error::new(io::ErrorKind::Other, format!("RegistrationRequest {:?}", e))
-    })?;
+    if let Some(client_secret_hash) = client_secret_hash {
+        request.client_secret = true;
+        request
+            .client_secret_hash
+            .extend_from_slice(client_secret_hash);
+    }
+    let bytes = request
+        .write_to_bytes()
+        .map_err(|e| anyhow!("RegistrationRequest {:?}", e))?;
     let buf = vec![0u8; 12 + bytes.len() + ENCRYPTION_RESERVED];
     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());

vnt/src/handle/tun_tap/channel_group.rs

@@ -1,30 +0,0 @@
-use std::sync::mpsc::{sync_channel, Receiver, SendError, SyncSender};
-
-pub fn channel_group<T>(size: usize, bound: usize) -> (GroupSyncSender<T>, Vec<Receiver<T>>) {
-    let mut senders = Vec::with_capacity(size);
-    let mut receivers = Vec::with_capacity(size);
-    for _ in 0..size {
-        let (s, r) = sync_channel(bound);
-        senders.push(s);
-        receivers.push(r);
-    }
-    (
-        GroupSyncSender {
-            count: 0,
-            base: senders,
-        },
-        receivers,
-    )
-}
-
-pub struct GroupSyncSender<T> {
-    count: usize,
-    base: Vec<SyncSender<T>>,
-}
-
-impl<T> GroupSyncSender<T> {
-    pub fn send(&mut self, t: T) -> Result<(), SendError<T>> {
-        self.count += 1;
-        self.base[self.count % self.base.len()].send(t)
-    }
-}

vnt/src/handle/tun_tap/mod.rs

@@ -1,153 +1,35 @@
-use std::io;
-use std::net::Ipv4Addr;
-
-use crate::channel::context::Context;
-use packet::ip::ipv4::packet::IpV4Packet;
-use packet::ip::ipv4::protocol::Protocol;
-
-use crate::cipher::Cipher;
-use crate::external_route::ExternalRoute;
-use crate::handle::{check_dest, CurrentDeviceInfo};
-#[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,
-) -> io::Result<()> {
-    let mut peer_ips = Vec::with_capacity(8);
-    let vec = sender.route_table.route_table_one();
-    let mut relay_count = 0;
-    const MAX_COUNT: usize = 8;
-    for (peer_ip, route) in vec {
-        if peer_ip == current_device.virtual_gateway {
-            continue;
-        }
-        if peer_ips.len() == MAX_COUNT {
-            relay_count += 1;
-            break;
-        }
-        if route.is_p2p()
-            && sender
-                .send_by_key(net_packet.buffer(), route.route_key())
-                .is_ok()
-        {
-            peer_ips.push(peer_ip);
-        } else {
-            relay_count += 1;
-        }
-    }
-    if (relay_count == 0 && !peer_ips.is_empty()) || current_device.status.offline() {
-        //不需要转发
-        return Ok(());
-    }
-    //转发到服务端的可选择广播，还要进行服务端加密
-    if peer_ips.is_empty() {
-        sender.send_default(net_packet.buffer(), current_device.connect_server)?;
-    } else {
-        let buf =
-            vec![0u8; 12 + 1 + peer_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());
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use std::sync::Arc;
+mod platform;
 
-        let mut broadcast = BroadcastPacket::unchecked(server_packet.payload_mut());
-        broadcast.set_address(&peer_ips)?;
-        broadcast.set_data(net_packet.buffer())?;
-        server_cipher.encrypt_ipv4(&mut server_packet)?;
-        sender.send_default(server_packet.buffer(), current_device.connect_server)?;
-    }
-    Ok(())
+pub(crate) use platform::*;
+
+/// 仅仅是停止tun，不停止vnt
+#[derive(Clone, Default)]
+pub struct DeviceStop {
+    f: Arc<Mutex<Option<Box<dyn FnOnce() + Send>>>>,
+    stopped: Arc<AtomicCell<bool>>,
 }
 
-/// 实现一个原地发送，必须保证是如下结构
-/// |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,
-) -> 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(());
+impl DeviceStop {
+    pub fn set_stop_fn<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        self.f.lock().replace(Box::new(f));
     }
-    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)?;
-        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(());
+    pub fn stop(&self) {
+        if let Some(f) = self.f.lock().take() {
+            f()
         }
     }
-    #[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)?;
+    pub fn stopped(&self) {
+        self.stopped.store(true);
+    }
+    pub fn is_stopped(&self) -> bool {
+        self.stopped.load()
     }
-    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(),
-    )
 }

vnt/src/handle/tun_tap/platform.rs

@@ -0,0 +1,115 @@
+use crate::channel::context::ChannelContext;
+use crate::channel::BUFFER_SIZE;
+use crate::cipher::Cipher;
+use crate::compression::Compressor;
+use crate::external_route::ExternalRoute;
+use crate::handle::tun_tap::DeviceStop;
+use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
+#[cfg(feature = "ip_proxy")]
+use crate::ip_proxy::IpProxyMap;
+use crate::util::StopManager;
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use std::collections::HashMap;
+use std::net::Ipv4Addr;
+use std::sync::Arc;
+use tun_rs::{InterruptEvent, SyncDevice};
+
+pub(crate) fn start_simple(
+    stop_manager: StopManager,
+    context: &ChannelContext,
+    device: Arc<SyncDevice>,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+    compressor: Compressor,
+    device_stop: DeviceStop,
+    allow_wire_guard: bool,
+) -> anyhow::Result<()> {
+    let event = Arc::new(InterruptEvent::new()?);
+    let worker = {
+        let event = event.clone();
+        stop_manager.add_listener("tun_device".into(), move || {
+            if let Err(e) = event.trigger() {
+                log::warn!("{:?}", e);
+            }
+        })?
+    };
+    let worker_cell = Arc::new(AtomicCell::new(Some(worker)));
+
+    {
+        let worker_cell = worker_cell.clone();
+        device_stop.set_stop_fn(move || {
+            if let Some(worker) = worker_cell.take() {
+                worker.stop_self()
+            }
+        });
+    }
+    if let Err(e) = start_simple0(
+        context,
+        device,
+        event,
+        current_device,
+        ip_route,
+        #[cfg(feature = "ip_proxy")]
+        ip_proxy_map,
+        client_cipher,
+        server_cipher,
+        device_map,
+        compressor,
+        allow_wire_guard,
+    ) {
+        log::error!("{:?}", e);
+    }
+    device_stop.stopped();
+    if let Some(worker) = worker_cell.take() {
+        worker.stop_all();
+    }
+    Ok(())
+}
+
+fn start_simple0(
+    context: &ChannelContext,
+    device: Arc<SyncDevice>,
+    event: Arc<InterruptEvent>,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+    compressor: Compressor,
+    allow_wire_guard: bool,
+) -> anyhow::Result<()> {
+    let mut buf = [0; BUFFER_SIZE];
+    let mut extend = [0; BUFFER_SIZE];
+    loop {
+        let len = device.recv_intr(&mut buf[12..],&event)? + 12;
+        // buf是重复利用的，需要重置头部
+        buf[..12].fill(0);
+        match crate::handle::tun_tap::tun_handler::handle(
+            context,
+            &mut buf,
+            len,
+            &mut extend,
+            &device,
+            current_device.load(),
+            &ip_route,
+            #[cfg(feature = "ip_proxy")]
+            &ip_proxy_map,
+            &client_cipher,
+            &server_cipher,
+            &device_map,
+            &compressor,
+            allow_wire_guard,
+        ) {
+            Ok(_) => {}
+            Err(e) => {
+                log::warn!("tun/tap {:?}", e)
+            }
+        }
+    }
+}

vnt/src/handle/tun_tap/tun_handler.rs

@@ -1,26 +1,33 @@
-use std::sync::Arc;
-use std::{io, thread};
-
 use crossbeam_utils::atomic::AtomicCell;
-
 use packet::icmp::icmp::IcmpPacket;
 use packet::icmp::Kind;
-use packet::ip::ipv4;
 use packet::ip::ipv4::packet::IpV4Packet;
-use tun::device::IFace;
-use tun::Device;
+use packet::ip::ipv4::protocol::Protocol;
+use parking_lot::Mutex;
+use std::collections::HashMap;
+use std::net::Ipv4Addr;
+use std::sync::Arc;
+use std::{io, thread};
+use tun_rs::SyncDevice;
 
-use crate::channel::context::Context;
+use crate::channel::context::ChannelContext;
+use crate::channel::sender::{send_to_wg, send_to_wg_broadcast};
 use crate::cipher::Cipher;
+use crate::compression::Compressor;
 use crate::external_route::ExternalRoute;
-use crate::handle::tun_tap::channel_group::{channel_group, GroupSyncSender};
-use crate::handle::CurrentDeviceInfo;
+use crate::handle::tun_tap::DeviceStop;
+use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
 #[cfg(feature = "ip_proxy")]
 use crate::ip_proxy::IpProxyMap;
-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 {
+#[cfg(feature = "ip_proxy")]
+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::StopManager;
+fn icmp(device_writer: &SyncDevice, mut ipv4_packet: IpV4Packet<&mut [u8]>) -> anyhow::Result<()> {
+    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);
@@ -29,26 +36,140 @@ fn icmp(device_writer: &Device, mut ipv4_packet: IpV4Packet<&mut [u8]>) -> io::R
             ipv4_packet.set_source_ip(ipv4_packet.destination_ip());
             ipv4_packet.set_destination_ip(src);
             ipv4_packet.update_checksum();
-            device_writer.write(ipv4_packet.buffer)?;
+            device_writer.send(ipv4_packet.buffer)?;
         }
     }
     Ok(())
 }
 
+pub fn start(
+    stop_manager: StopManager,
+    context: ChannelContext,
+    device: Arc<SyncDevice>,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+    compressor: Compressor,
+    device_stop: DeviceStop,
+    allow_wire_guard: bool,
+) -> io::Result<()> {
+    thread::Builder::new()
+        .name("tunHandlerS".into())
+        .spawn(move || {
+            if let Err(e) = crate::handle::tun_tap::start_simple(
+                stop_manager,
+                &context,
+                device,
+                current_device,
+                ip_route,
+                #[cfg(feature = "ip_proxy")]
+                ip_proxy_map,
+                client_cipher,
+                server_cipher,
+                device_map,
+                compressor,
+                device_stop,
+                allow_wire_guard,
+            ) {
+                log::warn!("stop:{}", e);
+            }
+        })?;
+
+    Ok(())
+}
+
+fn broadcast(
+    server_cipher: &Cipher,
+    sender: &ChannelContext,
+    net_packet: &mut NetPacket<&mut [u8]>,
+    current_device: &CurrentDeviceInfo,
+    device_map: &Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>,
+) -> anyhow::Result<()> {
+    let list: Vec<Ipv4Addr> = device_map
+        .lock()
+        .1
+        .values()
+        .filter(|info| !info.wireguard && info.status.is_online())
+        .map(|info| info.virtual_ip)
+        .collect();
+    if list.is_empty() {
+        return Ok(());
+    }
+    const MAX_COUNT: usize = 8;
+    let mut p2p_ips = Vec::with_capacity(8);
+    let mut relay = false;
+    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, route.route_key()).is_ok() {
+                p2p_ips.push(peer_ip);
+                continue;
+            }
+        }
+        relay = true;
+    }
+    if !overflow && !relay {
+        //全部p2p,不需要服务器中转
+        return Ok(());
+    }
+    if current_device.status.offline() {
+        //离线的不再转发
+        return Ok(());
+    }
+    if p2p_ips.is_empty() {
+        //都没有p2p则直接由服务器转发
+        sender.send_default(&net_packet, current_device.connect_server)?;
+        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, current_device.connect_server)?;
+    Ok(())
+}
+
 /// 接收tun数据，并且转发到udp上
-fn handle(
-    context: &Context,
-    data: &mut [u8],
-    len: usize,
-    device_writer: &Device,
+/// 实现一个原地发送，必须保证是如下结构
+/// |12字节开头|ip报文|至少1024字节结尾|
+///
+pub(crate) fn handle(
+    context: &ChannelContext,
+    buf: &mut [u8],
+    data_len: usize, //数据总长度=12+ip包长度
+    extend: &mut [u8],
+    device_writer: &SyncDevice,
     current_device: CurrentDeviceInfo,
     ip_route: &ExternalRoute,
     #[cfg(feature = "ip_proxy")] proxy_map: &Option<IpProxyMap>,
     client_cipher: &Cipher,
     server_cipher: &Cipher,
-) -> io::Result<()> {
+    device_map: &Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>,
+    compressor: &Compressor,
+    allow_wire_guard: bool,
+) -> anyhow::Result<()> {
     //忽略掉结构不对的情况（ipv6数据、win tap会读到空数据），不然日志打印太多了
-    let ipv4_packet = match IpV4Packet::new(&mut data[12..len]) {
+    let ipv4_packet = match IpV4Packet::new(&mut buf[12..data_len]) {
         Ok(packet) => packet,
         Err(_) => return Ok(()),
     };
@@ -57,178 +178,111 @@ fn handle(
     if src_ip == dest_ip {
         return icmp(&device_writer, ipv4_packet);
     }
-    return crate::handle::tun_tap::base_handle(
-        context,
-        data,
-        len,
-        current_device,
-        ip_route,
-        #[cfg(feature = "ip_proxy")]
-        proxy_map,
-        client_cipher,
-        server_cipher,
-    );
-}
-
-pub fn start(
-    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,
-    parallel: usize,
-    mut up_counter: SingleU64Adder,
-) -> io::Result<()> {
-    let worker = {
-        #[cfg(target_os = "macos")]
-        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(target_os = "macos")]
-            {
-                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() {
-            let context = context.clone();
-            let device = device.clone();
-            let current_device = current_device.clone();
-            let ip_route = ip_route.clone();
-            #[cfg(feature = "ip_proxy")]
-            let ip_proxy_map = ip_proxy_map.clone();
-            let client_cipher = client_cipher.clone();
-            let server_cipher = server_cipher.clone();
-            thread::Builder::new()
-                .name(format!("tunHandler-{}", index))
-                .spawn(move || {
-                    while let Ok((mut buf, len)) = receiver.recv() {
-                        #[cfg(not(target_os = "macos"))]
-                        let start = 0;
-                        #[cfg(target_os = "macos")]
-                        let start = 4;
-                        match handle(
-                            &context,
-                            &mut buf[start..],
-                            len,
-                            &device,
-                            current_device.load(),
-                            &ip_route,
-                            #[cfg(feature = "ip_proxy")]
-                            &ip_proxy_map,
-                            &client_cipher,
-                            &server_cipher,
-                        ) {
-                            Ok(_) => {}
-                            Err(e) => {
-                                log::warn!("{:?}", e)
-                            }
-                        }
-                    }
-                })?;
+    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)?;
+    let mut out = NetPacket::unchecked(extend);
+    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, current_device.connect_server)?;
         }
-        thread::Builder::new()
-            .name("tunHandlerM".into())
-            .spawn(move || {
-                if let Err(e) = 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(
-                    stop_manager,
-                    &context,
-                    device,
-                    current_device,
-                    ip_route,
-                    #[cfg(feature = "ip_proxy")]
-                    ip_proxy_map,
-                    client_cipher,
-                    server_cipher,
-                    &mut up_counter,
-                ) {
-                    log::warn!("stop:{}", e);
-                }
-                worker.stop_all();
-            })?;
+        return Ok(());
     }
+    if !dest_ip.is_multicast() && !dest_ip.is_broadcast() && current_device.broadcast_ip != dest_ip
+    {
+        if current_device.not_in_network(dest_ip) {
+            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)?;
+        }
+    }
+
+    if dest_ip.is_multicast() {
+        //当作广播处理
+        dest_ip = Ipv4Addr::BROADCAST;
+        net_packet.set_destination(Ipv4Addr::BROADCAST);
+    }
+    let is_broadcast = dest_ip.is_broadcast() || current_device.broadcast_ip == dest_ip;
+    if allow_wire_guard {
+        if is_broadcast {
+            // wg客户端和vnt客户端分开广播
+            let exists_wg = device_map
+                .lock()
+                .1
+                .values()
+                .any(|v| v.status.is_online() && v.wireguard);
+            if exists_wg {
+                send_to_wg_broadcast(context, &net_packet, server_cipher, &current_device)?;
+            }
+        } else {
+            // 如果是wg客户端则发到vnts转发
+            let guard = device_map.lock();
+            if let Some(peer_info) = guard.1.get(&dest_ip) {
+                if peer_info.status.is_offline() {
+                    return Ok(());
+                }
+                if peer_info.wireguard {
+                    drop(guard);
+                    send_to_wg(context, &mut net_packet, server_cipher, &current_device)?;
+                    return Ok(());
+                }
+            }
+        }
+    }
+
+    let mut net_packet = if compressor.compress(&net_packet, &mut out)? {
+        out.set_default_version();
+        out.set_protocol(protocol::Protocol::IpTurn);
+        out.set_transport_protocol(ip_turn_packet::Protocol::Ipv4.into());
+        out.first_set_ttl(6);
+        out.set_source(src_ip);
+        out.set_destination(dest_ip);
+        out
+    } else {
+        net_packet
+    };
+    if is_broadcast {
+        // 广播 发送到直连目标
+        client_cipher.encrypt_ipv4(&mut net_packet)?;
+        broadcast(
+            server_cipher,
+            context,
+            &mut net_packet,
+            &current_device,
+            device_map,
+        )?;
+        return Ok(());
+    }
+
+    client_cipher.encrypt_ipv4(&mut net_packet)?;
+    context.send_ipv4_by_id(
+        &net_packet,
+        &dest_ip,
+        current_device.connect_server,
+        current_device.status.online(),
+    )?;
     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,
-) -> io::Result<()> {
-    let mut buf = [0; 1024 * 16];
-    loop {
-        if stop_manager.is_stop() {
-            return Ok(());
-        }
-        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,
-        ) {
-            Ok(_) => {}
-            Err(e) => {
-                log::warn!("{:?}", e)
-            }
-        }
-    }
-}
-
-fn start_multi(
-    stop_manager: StopManager,
-    device: Arc<Device>,
-    mut group_sync_sender: GroupSyncSender<(Vec<u8>, usize)>,
-    up_counter: &mut SingleU64Adder,
-) -> io::Result<()> {
-    loop {
-        if stop_manager.is_stop() {
-            return Ok(());
-        }
-        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(());
-        }
-    }
-}

vnt/src/ip_proxy/icmp_proxy.rs

@@ -1,24 +1,24 @@
+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::channel::socket::{LocalInterface, VntSocketTrait};
 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 +27,54 @@ 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> {
+        default_interface: &LocalInterface,
+    ) -> 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)?;
+        if let Err(e) = icmp_socket.set_ip_unicast_if(default_interface) {
+            log::warn!("set_ip_unicast_if {:?}", e)
+        }
         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,78 +83,39 @@ 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];
+    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    let start = 12;
+    #[cfg(target_os = "android")]
+    let start = 12 + 20;
     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,
-                    &mut buf,
-                    &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;
-            }
-        };
+        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(
-                buf,
-                12 + len,
+                &mut buf,
+                start + len,
                 peer_ip,
                 &nat_map,
                 &context,
@@ -151,12 +125,13 @@ fn readable_handle(
         }
     }
 }
+
 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 +147,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(),
@@ -185,7 +160,7 @@ fn recv_handle(
                             return;
                         }
                         if let Err(e) = context.send_ipv4_by_id(
-                            net_packet.buffer(),
+                            &net_packet,
                             &dest_ip,
                             current_device.connect_server,
                             current_device.status.online(),
@@ -194,11 +169,17 @@ fn recv_handle(
                         }
                     }
                 }
-                _ => {}
+                h => {
+                    log::debug!("不支持的icmp代理 {:?},{:?}", peer_ip, h)
+                }
             },
-            Err(_) => {}
+            Err(e) => {
+                log::warn!("icmp {:?}", e)
+            }
         },
-        Err(_) => {}
+        Err(e) => {
+            log::warn!("icmp {:?}", e)
+        }
     }
 }
 
@@ -225,12 +206,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
                 );
             }
         }

vnt/src/ip_proxy/mod.rs

@@ -1,20 +1,22 @@
-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;
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 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;
 
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 pub mod icmp_proxy;
 pub mod tcp_proxy;
 pub mod udp_proxy;
@@ -31,23 +33,54 @@ pub trait ProxyHandler {
 
 #[derive(Clone)]
 pub struct IpProxyMap {
+    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
     icmp_proxy: IcmpProxy,
     tcp_proxy: TcpProxy,
     udp_proxy: UdpProxy,
 }
 
 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 default_interface = context.default_interface().clone();
+    #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+    let icmp_proxy =
+        IcmpProxy::new(context, _current_device, _client_cipher, &default_interface).await?;
+    let tcp_proxy = TcpProxy::new(default_interface.clone()).await?;
+    let udp_proxy = UdpProxy::new(default_interface.clone()).await?;
 
     Ok(IpProxyMap {
+        #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
         icmp_proxy,
         tcp_proxy,
         udp_proxy,
@@ -64,6 +97,7 @@ impl ProxyHandler for IpProxyMap {
         match ipv4.protocol() {
             ipv4::protocol::Protocol::Tcp => self.tcp_proxy.recv_handle(ipv4, source, destination),
             ipv4::protocol::Protocol::Udp => self.udp_proxy.recv_handle(ipv4, source, destination),
+            #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
             ipv4::protocol::Protocol::Icmp => {
                 self.icmp_proxy.recv_handle(ipv4, source, destination)
             }
@@ -84,6 +118,7 @@ impl ProxyHandler for IpProxyMap {
         match ipv4.protocol() {
             ipv4::protocol::Protocol::Tcp => self.tcp_proxy.send_handle(ipv4),
             ipv4::protocol::Protocol::Udp => self.udp_proxy.send_handle(ipv4),
+            #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
             ipv4::protocol::Protocol::Icmp => self.icmp_proxy.send_handle(ipv4),
             _ => Ok(()),
         }

vnt/src/ip_proxy/tcp_proxy.rs

@@ -1,29 +1,17 @@
-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, TcpStream};
 
+use crate::channel::socket::{create_tcp, LocalInterface};
+use crate::ip_proxy::ProxyHandler;
 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 {
     port: u16,
@@ -31,21 +19,16 @@ pub struct TcpProxy {
 }
 
 impl TcpProxy {
-    pub fn new(stop_manager: StopManager) -> io::Result<Self> {
+    pub async fn new(default_interface: LocalInterface) -> 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, default_interface));
         }
         Ok(Self { port, nat_map })
     }
@@ -93,365 +76,85 @@ 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>,
+    default_interface: LocalInterface,
 ) {
     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() {
+                        let default_interface = default_interface.clone();
+                        tokio::spawn(async move {
+                            let peer_tcp_stream = match tcp_connect(
+                                sender_addr.port(),
+                                dest_addr.into(),
+                                &default_interface,
+                            )
+                            .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,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<TcpStream> {
+    let socket = create_tcp(true, default_interface)?;
     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())?;
+        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);
-    }
-    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 _ = socket.set_nodelay(true);
+    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
-}

vnt/src/ip_proxy/udp_proxy.rs

@@ -1,31 +1,18 @@
+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 crate::channel::socket::{bind_udp, LocalInterface};
+use crate::ip_proxy::ProxyHandler;
 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 {
     port: u16,
@@ -33,21 +20,20 @@ pub struct UdpProxy {
 }
 
 impl UdpProxy {
-    pub fn new(scheduler: Scheduler, stop_manager: StopManager) -> io::Result<Self> {
+    pub async fn new(default_interface: LocalInterface) -> 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 move {
+                if let Err(e) = udp_proxy(udp, nat_map, default_interface).await {
+                    log::warn!("udp_proxy:{:?}", e);
+                }
+            });
         }
         Ok(Self { port, nat_map })
     }
@@ -95,218 +81,112 @@ 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()?;
+    default_interface: LocalInterface,
+) -> anyhow::Result<()> {
+    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,
+                        &default_interface,
+                    )
+                    .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>,
+    default_interface: &LocalInterface,
+) -> anyhow::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 bind_udp(
+                format!("0.0.0.0:{}", sender_addr.port()).parse().unwrap(),
+                default_interface,
+            ) {
+                Ok(udp) => udp,
+                Err(_) => bind_udp("0.0.0.0:0".parse().unwrap(), default_interface)?,
+            };
+            let peer_udp_socket = UdpSocket::from_std(peer_udp_socket.into())?;
+            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(())
 }

vnt/src/lib.rs

@@ -3,14 +3,29 @@ pub const VNT_VERSION: &'static str = env!("CARGO_PKG_VERSION");
 pub mod channel;
 pub mod cipher;
 pub mod core;
-pub mod external_route;
+mod external_route;
 pub mod handle;
 #[cfg(feature = "ip_proxy")]
-pub mod ip_proxy;
+mod ip_proxy;
 pub mod nat;
-pub mod proto;
+#[cfg(feature = "port_mapping")]
+mod port_mapping;
+mod proto;
 pub mod protocol;
-pub mod tun_tap_device;
+mod tun_tap_device;
+pub use tun_tap_device::*;
 pub mod util;
 
-pub use handle::callback::{DeviceInfo, ErrorInfo, HandshakeInfo, RegisterInfo, VntCallback};
+pub use handle::callback::*;
+
+pub mod compression;
+pub use packet;
+
+pub(crate) fn ignore_io_interrupted(e: std::io::Error) -> std::io::Result<()> {
+    if e.kind() == std::io::ErrorKind::Interrupted {
+        log::warn!("ignore_io_interrupted");
+        Ok(())
+    } else {
+        Err(e)
+    }
+}

vnt/src/nat/mod.rs

@@ -1,15 +1,19 @@
+use anyhow::{anyhow, Context};
 use std::io;
-use std::net::UdpSocket;
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-use std::ops::Sub;
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, ToSocketAddrs};
+use std::net::{SocketAddr, UdpSocket};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
 use crossbeam_utils::atomic::AtomicCell;
 use parking_lot::Mutex;
+use rand::prelude::SliceRandom;
+use rand::Rng;
 
-use crate::channel::punch::{NatInfo, NatType};
-use crate::proto::message::PunchNatType;
+use crate::channel::punch::{NatInfo, NatType, PunchModel};
+use crate::channel::socket::LocalInterface;
+#[cfg(feature = "upnp")]
+use crate::util::UPnP;
 
 mod stun;
 
@@ -22,6 +26,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,14 +46,65 @@ 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),
+        Ok(ipv6) => {
+            if is_ipv6_global(&ipv6) {
+                return Some(ipv6);
+            }
+        }
         Err(e) => {
             log::warn!("获取ipv6失败：{:?}", e);
-            None
         }
     }
+    None
+}
+
+pub const fn is_ipv4_global(ipv4: &Ipv4Addr) -> bool {
+    !(ipv4.octets()[0] == 0 // "This network"
+        || ipv4.is_private()
+        || ipv4.octets()[0] == 100 && (ipv4.octets()[1] & 0b1100_0000 == 0b0100_0000)//ipv4.is_shared()
+        || ipv4.is_loopback()
+        || ipv4.is_link_local()
+        // addresses reserved for future protocols (`192.0.0.0/24`)
+        // .9 and .10 are documented as globally reachable so they're excluded
+        || (
+        ipv4.octets()[0] == 192 && ipv4.octets()[1] == 0 && ipv4.octets()[2] == 0
+            && ipv4.octets()[3] != 9 && ipv4.octets()[3] != 10
+    )
+        || ipv4.is_documentation()
+        || ipv4.octets()[0] == 198 && (ipv4.octets()[1] & 0xfe) == 18//ipv4.is_benchmarking()
+        || ipv4.octets()[0] & 240 == 240 && !ipv4.is_broadcast()//ipv4.is_reserved()
+        || ipv4.is_broadcast())
+}
+
+pub const fn is_ipv6_global(ipv6addr: &Ipv6Addr) -> bool {
+    !(ipv6addr.is_unspecified()
+        || ipv6addr.is_loopback()
+        // IPv4-mapped Address (`::ffff:0:0/96`)
+        || matches!(ipv6addr.segments(), [0, 0, 0, 0, 0, 0xffff, _, _])
+        // IPv4-IPv6 Translat. (`64:ff9b:1::/48`)
+        || matches!(ipv6addr.segments(), [0x64, 0xff9b, 1, _, _, _, _, _])
+        // Discard-Only Address Block (`100::/64`)
+        || matches!(ipv6addr.segments(), [0x100, 0, 0, 0, _, _, _, _])
+        // IETF Protocol Assignments (`2001::/23`)
+        || (matches!(ipv6addr.segments(), [0x2001, b, _, _, _, _, _, _] if b < 0x200)
+        && !(
+        // Port Control Protocol Anycast (`2001:1::1`)
+        u128::from_be_bytes(ipv6addr.octets()) == 0x2001_0001_0000_0000_0000_0000_0000_0001
+            // Traversal Using Relays around NAT Anycast (`2001:1::2`)
+            || u128::from_be_bytes(ipv6addr.octets()) == 0x2001_0001_0000_0000_0000_0000_0000_0002
+            // AMT (`2001:3::/32`)
+            || matches!(ipv6addr.segments(), [0x2001, 3, _, _, _, _, _, _])
+            // AS112-v6 (`2001:4:112::/48`)
+            || matches!(ipv6addr.segments(), [0x2001, 4, 0x112, _, _, _, _, _])
+            // ORCHIDv2 (`2001:20::/28`)
+            || matches!(ipv6addr.segments(), [0x2001, b, _, _, _, _, _, _] if b >= 0x20 && b <= 0x2F)
+    ))
+        || (ipv6addr.segments()[0] == 0x2001) && (ipv6addr.segments()[1] == 0xdb8)//ipv6addr.is_documentation()
+        || (ipv6addr.segments()[0] & 0xfe00) == 0xfc00//ipv6addr.is_unique_local()
+        || (ipv6addr.segments()[0] & 0xffc0) == 0xfe80) //ipv6addr.is_unicast_link_local())
 }
 
 #[derive(Clone)]
@@ -56,56 +112,60 @@ pub struct NatTest {
     stun_server: Vec<String>,
     info: Arc<Mutex<NatInfo>>,
     time: Arc<AtomicCell<Instant>>,
-}
-
-impl From<NatType> for PunchNatType {
-    fn from(value: NatType) -> Self {
-        match value {
-            NatType::Symmetric => PunchNatType::Symmetric,
-            NatType::Cone => PunchNatType::Cone,
-        }
-    }
-}
-
-impl Into<NatType> for PunchNatType {
-    fn into(self) -> NatType {
-        match self {
-            PunchNatType::Symmetric => NatType::Symmetric,
-            PunchNatType::Cone => NatType::Cone,
-        }
-    }
+    udp_ports: Vec<u16>,
+    tcp_port: u16,
+    #[cfg(feature = "upnp")]
+    upnp: UPnP,
+    pub(crate) update_local_ipv4: bool,
 }
 
 impl NatTest {
     pub fn new(
-        channel_num: usize,
-        mut stun_server: Vec<String>,
+        _channel_num: usize,
+        stun_server: Vec<String>,
         local_ipv4: Option<Ipv4Addr>,
         ipv6: Option<Ipv6Addr>,
         udp_ports: Vec<u16>,
         tcp_port: u16,
+        update_local_ipv4: bool,
+        punch_model: PunchModel,
     ) -> NatTest {
-        let server = stun_server[0].clone();
-        stun_server.resize(3, server);
-        let mut ports = udp_ports.clone();
-        ports.resize(channel_num, 0);
+        let ports = vec![0; udp_ports.len()];
         let nat_info = NatInfo::new(
             Vec::new(),
             ports,
             0,
             local_ipv4,
             ipv6,
-            udp_ports,
+            udp_ports.clone(),
             tcp_port,
+            0,
             NatType::Cone,
+            punch_model,
         );
         let info = Arc::new(Mutex::new(nat_info));
+        #[cfg(feature = "upnp")]
+        let upnp = UPnP::default();
+        #[cfg(feature = "upnp")]
+        for port in &udp_ports {
+            upnp.add_udp_port(*port);
+        }
+        #[cfg(feature = "upnp")]
+        upnp.add_tcp_port(tcp_port);
+        let instant = Instant::now();
         NatTest {
             stun_server,
             info,
             time: Arc::new(AtomicCell::new(
-                Instant::now().sub(Duration::from_secs(100)),
+                instant
+                    .checked_sub(Duration::from_secs(100))
+                    .unwrap_or(instant),
             )),
+            udp_ports,
+            tcp_port,
+            #[cfg(feature = "upnp")]
+            upnp,
+            update_local_ipv4,
         }
     }
     pub fn can_update(&self) -> bool {
@@ -117,23 +177,178 @@ impl NatTest {
     pub fn nat_info(&self) -> NatInfo {
         self.info.lock().clone()
     }
-    pub fn update_addr(&self, index: usize, ip: Ipv4Addr, port: u16) {
+    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) -> bool {
         let mut guard = self.info.lock();
         guard.update_addr(index, ip, port)
     }
+    pub fn update_tcp_port(&self, port: u16) {
+        let mut guard = self.info.lock();
+        guard.update_tcp_port(port)
+    }
     pub fn re_test(
         &self,
         local_ipv4: Option<Ipv4Addr>,
         ipv6: Option<Ipv6Addr>,
-    ) -> io::Result<NatInfo> {
-        let (nat_type, public_ips, port_range) = stun::stun_test_nat(self.stun_server.clone())?;
+        default_interface: &LocalInterface,
+    ) -> anyhow::Result<NatInfo> {
+        let mut stun_server = self.stun_server.clone();
+        if stun_server.len() > 5 {
+            stun_server.shuffle(&mut rand::thread_rng());
+            stun_server.truncate(5);
+            log::info!("stun_server truncate {:?}", stun_server);
+        }
+        let (nat_type, public_ips, port_range) =
+            stun::stun_test_nat(stun_server, default_interface)?;
+        if public_ips.is_empty() {
+            Err(anyhow!("public_ips.is_empty"))?
+        }
         let mut guard = self.info.lock();
         guard.nat_type = nat_type;
         guard.public_ips = public_ips;
         guard.public_port_range = port_range;
-        guard.local_ipv4 = local_ipv4;
+        if local_ipv4.is_some() {
+            guard.local_ipv4 = local_ipv4;
+        }
         guard.ipv6 = ipv6;
 
         Ok(guard.clone())
     }
+    #[cfg(feature = "upnp")]
+    pub fn reset_upnp(&self) {
+        let local_ipv4 = self.info.lock().local_ipv4.clone();
+        if let Some(local_ipv4) = local_ipv4 {
+            self.upnp.reset(local_ipv4)
+        }
+    }
+    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 buf[0] == 0x01 && buf[1] == 0x01 {
+            if let Some(addr) = stun::recv_stun_response(buf) {
+                if let Err(e) = self.recv_data_(index, source_addr, addr) {
+                    log::warn!("{:?}", e);
+                }
+            }
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+    fn recv_data_(
+        &self,
+        index: usize,
+        source_addr: SocketAddr,
+        addr: SocketAddr,
+    ) -> anyhow::Result<()> {
+        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() {
+                        ip
+                    } else {
+                        return Ok(());
+                    }
+                }
+            };
+            '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 {
+                if is_ipv4_global(addr.ip()) {
+                    if self.update_addr(index, *addr.ip(), addr.port()) {
+                        log::info!("回应地址{:?},来源stun {:?}", addr, source_addr)
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
 }

vnt/src/nat/stun.rs

@@ -1,24 +1,25 @@
 use std::collections::HashSet;
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+use std::io;
+use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::time::Duration;
-use std::{io, thread};
 
 use crate::channel::punch::NatType;
+use crate::channel::socket::{bind_udp, LocalInterface};
+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 h = Vec::new();
-    for x in stun_servers {
-        let handle = thread::spawn(move || test_nat(x));
-        h.push(handle);
-    }
+pub fn stun_test_nat(
+    stun_servers: Vec<String>,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<(NatType, Vec<Ipv4Addr>, u16)> {
     let mut nat_type = NatType::Cone;
     let mut port_range = 0;
     let mut hash_set = HashSet::new();
-    for x in h {
-        if let Ok(rs) = x.join() {
-            if let Ok((nat_type_t, ip_list_t, port_range_t)) = rs {
+    for _ in 0..2 {
+        let stun_servers = stun_servers.clone();
+        match stun_test_nat0(stun_servers, default_interface) {
+            Ok((nat_type_t, ip_list_t, port_range_t)) => {
                 if nat_type_t == NatType::Symmetric {
                     nat_type = NatType::Symmetric;
                 }
@@ -29,66 +30,116 @@ pub fn stun_test_nat(stun_servers: Vec<String>) -> io::Result<(NatType, Vec<Ipv4
                     port_range = port_range_t;
                 }
             }
+            Err(e) => {
+                log::warn!("{:?}", e);
+            }
         }
     }
     Ok((nat_type, hash_set.into_iter().collect(), port_range))
 }
 
-fn test_nat(stun_server: 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.connect(stun_server)?;
-    let mut port_range = 0;
-    let mut hash_set = HashSet::new();
+pub fn stun_test_nat0(
+    stun_servers: Vec<String>,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<(NatType, Vec<Ipv4Addr>, u16)> {
+    let udp = bind_udp("0.0.0.0:0".parse().unwrap(), default_interface)?;
+    udp.set_nonblocking(false)?;
+    let udp: UdpSocket = udp.into();
+    udp.set_read_timeout(Some(Duration::from_millis(500)))?;
     let mut nat_type = NatType::Cone;
-    match test_nat_(&udp, true, true) {
-        Ok((mapped_addr1, changed_addr1)) => {
-            match mapped_addr1.ip() {
-                IpAddr::V4(ip) => {
-                    hash_set.insert(ip);
-                }
-                IpAddr::V6(_) => {}
+    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) => {
+                pub_addrs.extend(addr);
             }
-            if udp.connect(changed_addr1).is_ok() {
-                if let Ok((mapped_addr2, _)) = test_nat_(&udp, false, false) {
-                    match mapped_addr2.ip() {
-                        IpAddr::V4(ip) => {
-                            hash_set.insert(ip);
-                            if mapped_addr1 != mapped_addr2 {
-                                nat_type = NatType::Symmetric;
-                            }
-                        }
-                        IpAddr::V6(_) => {}
+            Err(e) => {
+                log::warn!("stun {} error {:?} ", x, e);
+            }
+        }
+    }
+    if pub_addrs.len() > 1 {
+        nat_type = NatType::Symmetric;
+    }
+    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()
+            }
+            if max_port < addr.port() {
+                max_port = addr.port()
+            }
+        }
+    }
+    if hash_set.is_empty() {
+        Ok((nat_type, vec![], 0))
+    } else {
+        Ok((
+            nat_type,
+            hash_set.into_iter().collect(),
+            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, stun_server, 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, stun_server, false, false, tid + 1) {
+                Ok((mapped_addr2, _)) => {
+                    if mapped_addr2.is_ipv4() {
+                        addr.insert(mapped_addr1);
                     }
-                    port_range = mapped_addr2.port().abs_diff(mapped_addr1.port());
+                }
+                Err(e) => {
+                    log::warn!("stun {} error {:?} ", stun_server, e);
                 }
             }
         }
-        Err(_) => {}
     }
-    Ok((nat_type, hash_set.into_iter().collect(), port_range))
+    log::info!(
+        "stun {} mapped_addr {:?}  changed_addr {:?}",
+        stun_server,
+        addr,
+        changed_addr1,
+    );
+
+    Ok(addr)
 }
 
 fn test_nat_(
     udp: &UdpSocket,
+    stun_server: &String,
     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) {
             Ok(rs) => rs,
-            Err(_) => {
+            Err(e) => {
+                log::warn!("stun {} error {:?}", stun_server, e);
                 continue;
             }
         };
@@ -115,11 +166,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"))
@@ -135,3 +186,39 @@ 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> {
+    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
+}

vnt/src/port_mapping/mod.rs

@@ -0,0 +1,101 @@
+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 (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 || {
+            let runtime = tokio::runtime::Builder::new_multi_thread()
+                .enable_all()
+                .thread_name("portMapping")
+                .build().unwrap();
+            runtime.block_on(start_port_mapping0(vec)).unwrap();
+            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(())
+}

vnt/src/port_mapping/tcp_mapping.rs

@@ -0,0 +1,54 @@
+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(async move {
+        if let Err(e) = tcp_mapping_(bind_addr, tcp_listener, destination).await {
+            log::warn!("tcp_mapping {:?}", e);
+        }
+    });
+    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(())
+}

vnt/src/port_mapping/udp_mapping.rs

@@ -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(())
+}

vnt/src/proto/message.rs

@@ -1,2080 +0,0 @@
-// This file is generated by rust-protobuf 3.2.0. Do not edit
-// .proto file is parsed by pure
-// @generated
-
-// https://github.com/rust-lang/rust-clippy/issues/702
-#![allow(unknown_lints)]
-#![allow(clippy::all)]
-
-#![allow(unused_attributes)]
-#![cfg_attr(rustfmt, rustfmt::skip)]
-
-#![allow(box_pointers)]
-#![allow(dead_code)]
-#![allow(missing_docs)]
-#![allow(non_camel_case_types)]
-#![allow(non_snake_case)]
-#![allow(non_upper_case_globals)]
-#![allow(trivial_casts)]
-#![allow(unused_results)]
-#![allow(unused_mut)]
-
-//! Generated file from `message.proto`
-
-/// Generated files are compatible only with the same version
-/// of protobuf runtime.
-const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_3_2_0;
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:HandshakeRequest)
-pub struct HandshakeRequest {
-    // message fields
-    // @@protoc_insertion_point(field:HandshakeRequest.version)
-    pub version: ::std::string::String,
-    // @@protoc_insertion_point(field:HandshakeRequest.secret)
-    pub secret: bool,
-    // special fields
-    // @@protoc_insertion_point(special_field:HandshakeRequest.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a HandshakeRequest {
-    fn default() -> &'a HandshakeRequest {
-        <HandshakeRequest as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl HandshakeRequest {
-    pub fn new() -> HandshakeRequest {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(2);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "version",
-            |m: &HandshakeRequest| { &m.version },
-            |m: &mut HandshakeRequest| { &mut m.version },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "secret",
-            |m: &HandshakeRequest| { &m.secret },
-            |m: &mut HandshakeRequest| { &mut m.secret },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<HandshakeRequest>(
-            "HandshakeRequest",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for HandshakeRequest {
-    const NAME: &'static str = "HandshakeRequest";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                10 => {
-                    self.version = is.read_string()?;
-                },
-                16 => {
-                    self.secret = is.read_bool()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if !self.version.is_empty() {
-            my_size += ::protobuf::rt::string_size(1, &self.version);
-        }
-        if self.secret != false {
-            my_size += 1 + 1;
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if !self.version.is_empty() {
-            os.write_string(1, &self.version)?;
-        }
-        if self.secret != false {
-            os.write_bool(2, self.secret)?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> HandshakeRequest {
-        HandshakeRequest::new()
-    }
-
-    fn clear(&mut self) {
-        self.version.clear();
-        self.secret = false;
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static HandshakeRequest {
-        static instance: HandshakeRequest = HandshakeRequest {
-            version: ::std::string::String::new(),
-            secret: false,
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for HandshakeRequest {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("HandshakeRequest").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for HandshakeRequest {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for HandshakeRequest {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:HandshakeResponse)
-pub struct HandshakeResponse {
-    // message fields
-    // @@protoc_insertion_point(field:HandshakeResponse.version)
-    pub version: ::std::string::String,
-    // @@protoc_insertion_point(field:HandshakeResponse.secret)
-    pub secret: bool,
-    // @@protoc_insertion_point(field:HandshakeResponse.public_key)
-    pub public_key: ::std::vec::Vec<u8>,
-    // @@protoc_insertion_point(field:HandshakeResponse.key_finger)
-    pub key_finger: ::std::string::String,
-    // special fields
-    // @@protoc_insertion_point(special_field:HandshakeResponse.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a HandshakeResponse {
-    fn default() -> &'a HandshakeResponse {
-        <HandshakeResponse as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl HandshakeResponse {
-    pub fn new() -> HandshakeResponse {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(4);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "version",
-            |m: &HandshakeResponse| { &m.version },
-            |m: &mut HandshakeResponse| { &mut m.version },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "secret",
-            |m: &HandshakeResponse| { &m.secret },
-            |m: &mut HandshakeResponse| { &mut m.secret },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "public_key",
-            |m: &HandshakeResponse| { &m.public_key },
-            |m: &mut HandshakeResponse| { &mut m.public_key },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "key_finger",
-            |m: &HandshakeResponse| { &m.key_finger },
-            |m: &mut HandshakeResponse| { &mut m.key_finger },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<HandshakeResponse>(
-            "HandshakeResponse",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for HandshakeResponse {
-    const NAME: &'static str = "HandshakeResponse";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                10 => {
-                    self.version = is.read_string()?;
-                },
-                16 => {
-                    self.secret = is.read_bool()?;
-                },
-                26 => {
-                    self.public_key = is.read_bytes()?;
-                },
-                34 => {
-                    self.key_finger = is.read_string()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if !self.version.is_empty() {
-            my_size += ::protobuf::rt::string_size(1, &self.version);
-        }
-        if self.secret != false {
-            my_size += 1 + 1;
-        }
-        if !self.public_key.is_empty() {
-            my_size += ::protobuf::rt::bytes_size(3, &self.public_key);
-        }
-        if !self.key_finger.is_empty() {
-            my_size += ::protobuf::rt::string_size(4, &self.key_finger);
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if !self.version.is_empty() {
-            os.write_string(1, &self.version)?;
-        }
-        if self.secret != false {
-            os.write_bool(2, self.secret)?;
-        }
-        if !self.public_key.is_empty() {
-            os.write_bytes(3, &self.public_key)?;
-        }
-        if !self.key_finger.is_empty() {
-            os.write_string(4, &self.key_finger)?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> HandshakeResponse {
-        HandshakeResponse::new()
-    }
-
-    fn clear(&mut self) {
-        self.version.clear();
-        self.secret = false;
-        self.public_key.clear();
-        self.key_finger.clear();
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static HandshakeResponse {
-        static instance: HandshakeResponse = HandshakeResponse {
-            version: ::std::string::String::new(),
-            secret: false,
-            public_key: ::std::vec::Vec::new(),
-            key_finger: ::std::string::String::new(),
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for HandshakeResponse {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("HandshakeResponse").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for HandshakeResponse {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for HandshakeResponse {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:SecretHandshakeRequest)
-pub struct SecretHandshakeRequest {
-    // message fields
-    // @@protoc_insertion_point(field:SecretHandshakeRequest.token)
-    pub token: ::std::string::String,
-    // @@protoc_insertion_point(field:SecretHandshakeRequest.key)
-    pub key: ::std::vec::Vec<u8>,
-    // special fields
-    // @@protoc_insertion_point(special_field:SecretHandshakeRequest.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a SecretHandshakeRequest {
-    fn default() -> &'a SecretHandshakeRequest {
-        <SecretHandshakeRequest as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl SecretHandshakeRequest {
-    pub fn new() -> SecretHandshakeRequest {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(2);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "token",
-            |m: &SecretHandshakeRequest| { &m.token },
-            |m: &mut SecretHandshakeRequest| { &mut m.token },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "key",
-            |m: &SecretHandshakeRequest| { &m.key },
-            |m: &mut SecretHandshakeRequest| { &mut m.key },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<SecretHandshakeRequest>(
-            "SecretHandshakeRequest",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for SecretHandshakeRequest {
-    const NAME: &'static str = "SecretHandshakeRequest";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                10 => {
-                    self.token = is.read_string()?;
-                },
-                18 => {
-                    self.key = is.read_bytes()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if !self.token.is_empty() {
-            my_size += ::protobuf::rt::string_size(1, &self.token);
-        }
-        if !self.key.is_empty() {
-            my_size += ::protobuf::rt::bytes_size(2, &self.key);
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if !self.token.is_empty() {
-            os.write_string(1, &self.token)?;
-        }
-        if !self.key.is_empty() {
-            os.write_bytes(2, &self.key)?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> SecretHandshakeRequest {
-        SecretHandshakeRequest::new()
-    }
-
-    fn clear(&mut self) {
-        self.token.clear();
-        self.key.clear();
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static SecretHandshakeRequest {
-        static instance: SecretHandshakeRequest = SecretHandshakeRequest {
-            token: ::std::string::String::new(),
-            key: ::std::vec::Vec::new(),
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for SecretHandshakeRequest {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("SecretHandshakeRequest").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for SecretHandshakeRequest {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for SecretHandshakeRequest {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:RegistrationRequest)
-pub struct RegistrationRequest {
-    // message fields
-    // @@protoc_insertion_point(field:RegistrationRequest.token)
-    pub token: ::std::string::String,
-    // @@protoc_insertion_point(field:RegistrationRequest.device_id)
-    pub device_id: ::std::string::String,
-    // @@protoc_insertion_point(field:RegistrationRequest.name)
-    pub name: ::std::string::String,
-    // @@protoc_insertion_point(field:RegistrationRequest.is_fast)
-    pub is_fast: bool,
-    // @@protoc_insertion_point(field:RegistrationRequest.version)
-    pub version: ::std::string::String,
-    // @@protoc_insertion_point(field:RegistrationRequest.virtual_ip)
-    pub virtual_ip: u32,
-    // @@protoc_insertion_point(field:RegistrationRequest.allow_ip_change)
-    pub allow_ip_change: bool,
-    // @@protoc_insertion_point(field:RegistrationRequest.client_secret)
-    pub client_secret: bool,
-    // special fields
-    // @@protoc_insertion_point(special_field:RegistrationRequest.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a RegistrationRequest {
-    fn default() -> &'a RegistrationRequest {
-        <RegistrationRequest as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl RegistrationRequest {
-    pub fn new() -> RegistrationRequest {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(8);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "token",
-            |m: &RegistrationRequest| { &m.token },
-            |m: &mut RegistrationRequest| { &mut m.token },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "device_id",
-            |m: &RegistrationRequest| { &m.device_id },
-            |m: &mut RegistrationRequest| { &mut m.device_id },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "name",
-            |m: &RegistrationRequest| { &m.name },
-            |m: &mut RegistrationRequest| { &mut m.name },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "is_fast",
-            |m: &RegistrationRequest| { &m.is_fast },
-            |m: &mut RegistrationRequest| { &mut m.is_fast },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "version",
-            |m: &RegistrationRequest| { &m.version },
-            |m: &mut RegistrationRequest| { &mut m.version },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "virtual_ip",
-            |m: &RegistrationRequest| { &m.virtual_ip },
-            |m: &mut RegistrationRequest| { &mut m.virtual_ip },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "allow_ip_change",
-            |m: &RegistrationRequest| { &m.allow_ip_change },
-            |m: &mut RegistrationRequest| { &mut m.allow_ip_change },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "client_secret",
-            |m: &RegistrationRequest| { &m.client_secret },
-            |m: &mut RegistrationRequest| { &mut m.client_secret },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<RegistrationRequest>(
-            "RegistrationRequest",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for RegistrationRequest {
-    const NAME: &'static str = "RegistrationRequest";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                10 => {
-                    self.token = is.read_string()?;
-                },
-                18 => {
-                    self.device_id = is.read_string()?;
-                },
-                26 => {
-                    self.name = is.read_string()?;
-                },
-                32 => {
-                    self.is_fast = is.read_bool()?;
-                },
-                42 => {
-                    self.version = is.read_string()?;
-                },
-                53 => {
-                    self.virtual_ip = is.read_fixed32()?;
-                },
-                56 => {
-                    self.allow_ip_change = is.read_bool()?;
-                },
-                64 => {
-                    self.client_secret = is.read_bool()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if !self.token.is_empty() {
-            my_size += ::protobuf::rt::string_size(1, &self.token);
-        }
-        if !self.device_id.is_empty() {
-            my_size += ::protobuf::rt::string_size(2, &self.device_id);
-        }
-        if !self.name.is_empty() {
-            my_size += ::protobuf::rt::string_size(3, &self.name);
-        }
-        if self.is_fast != false {
-            my_size += 1 + 1;
-        }
-        if !self.version.is_empty() {
-            my_size += ::protobuf::rt::string_size(5, &self.version);
-        }
-        if self.virtual_ip != 0 {
-            my_size += 1 + 4;
-        }
-        if self.allow_ip_change != false {
-            my_size += 1 + 1;
-        }
-        if self.client_secret != false {
-            my_size += 1 + 1;
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if !self.token.is_empty() {
-            os.write_string(1, &self.token)?;
-        }
-        if !self.device_id.is_empty() {
-            os.write_string(2, &self.device_id)?;
-        }
-        if !self.name.is_empty() {
-            os.write_string(3, &self.name)?;
-        }
-        if self.is_fast != false {
-            os.write_bool(4, self.is_fast)?;
-        }
-        if !self.version.is_empty() {
-            os.write_string(5, &self.version)?;
-        }
-        if self.virtual_ip != 0 {
-            os.write_fixed32(6, self.virtual_ip)?;
-        }
-        if self.allow_ip_change != false {
-            os.write_bool(7, self.allow_ip_change)?;
-        }
-        if self.client_secret != false {
-            os.write_bool(8, self.client_secret)?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> RegistrationRequest {
-        RegistrationRequest::new()
-    }
-
-    fn clear(&mut self) {
-        self.token.clear();
-        self.device_id.clear();
-        self.name.clear();
-        self.is_fast = false;
-        self.version.clear();
-        self.virtual_ip = 0;
-        self.allow_ip_change = false;
-        self.client_secret = false;
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static RegistrationRequest {
-        static instance: RegistrationRequest = RegistrationRequest {
-            token: ::std::string::String::new(),
-            device_id: ::std::string::String::new(),
-            name: ::std::string::String::new(),
-            is_fast: false,
-            version: ::std::string::String::new(),
-            virtual_ip: 0,
-            allow_ip_change: false,
-            client_secret: false,
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for RegistrationRequest {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("RegistrationRequest").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for RegistrationRequest {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for RegistrationRequest {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:RegistrationResponse)
-pub struct RegistrationResponse {
-    // message fields
-    // @@protoc_insertion_point(field:RegistrationResponse.virtual_ip)
-    pub virtual_ip: u32,
-    // @@protoc_insertion_point(field:RegistrationResponse.virtual_gateway)
-    pub virtual_gateway: u32,
-    // @@protoc_insertion_point(field:RegistrationResponse.virtual_netmask)
-    pub virtual_netmask: u32,
-    // @@protoc_insertion_point(field:RegistrationResponse.epoch)
-    pub epoch: u32,
-    // @@protoc_insertion_point(field:RegistrationResponse.device_info_list)
-    pub device_info_list: ::std::vec::Vec<DeviceInfo>,
-    // @@protoc_insertion_point(field:RegistrationResponse.public_ip)
-    pub public_ip: u32,
-    // @@protoc_insertion_point(field:RegistrationResponse.public_port)
-    pub public_port: u32,
-    // @@protoc_insertion_point(field:RegistrationResponse.public_ipv6)
-    pub public_ipv6: ::std::vec::Vec<u8>,
-    // special fields
-    // @@protoc_insertion_point(special_field:RegistrationResponse.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a RegistrationResponse {
-    fn default() -> &'a RegistrationResponse {
-        <RegistrationResponse as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl RegistrationResponse {
-    pub fn new() -> RegistrationResponse {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(8);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "virtual_ip",
-            |m: &RegistrationResponse| { &m.virtual_ip },
-            |m: &mut RegistrationResponse| { &mut m.virtual_ip },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "virtual_gateway",
-            |m: &RegistrationResponse| { &m.virtual_gateway },
-            |m: &mut RegistrationResponse| { &mut m.virtual_gateway },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "virtual_netmask",
-            |m: &RegistrationResponse| { &m.virtual_netmask },
-            |m: &mut RegistrationResponse| { &mut m.virtual_netmask },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "epoch",
-            |m: &RegistrationResponse| { &m.epoch },
-            |m: &mut RegistrationResponse| { &mut m.epoch },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
-            "device_info_list",
-            |m: &RegistrationResponse| { &m.device_info_list },
-            |m: &mut RegistrationResponse| { &mut m.device_info_list },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "public_ip",
-            |m: &RegistrationResponse| { &m.public_ip },
-            |m: &mut RegistrationResponse| { &mut m.public_ip },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "public_port",
-            |m: &RegistrationResponse| { &m.public_port },
-            |m: &mut RegistrationResponse| { &mut m.public_port },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "public_ipv6",
-            |m: &RegistrationResponse| { &m.public_ipv6 },
-            |m: &mut RegistrationResponse| { &mut m.public_ipv6 },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<RegistrationResponse>(
-            "RegistrationResponse",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for RegistrationResponse {
-    const NAME: &'static str = "RegistrationResponse";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                13 => {
-                    self.virtual_ip = is.read_fixed32()?;
-                },
-                21 => {
-                    self.virtual_gateway = is.read_fixed32()?;
-                },
-                29 => {
-                    self.virtual_netmask = is.read_fixed32()?;
-                },
-                32 => {
-                    self.epoch = is.read_uint32()?;
-                },
-                42 => {
-                    self.device_info_list.push(is.read_message()?);
-                },
-                53 => {
-                    self.public_ip = is.read_fixed32()?;
-                },
-                56 => {
-                    self.public_port = is.read_uint32()?;
-                },
-                66 => {
-                    self.public_ipv6 = is.read_bytes()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if self.virtual_ip != 0 {
-            my_size += 1 + 4;
-        }
-        if self.virtual_gateway != 0 {
-            my_size += 1 + 4;
-        }
-        if self.virtual_netmask != 0 {
-            my_size += 1 + 4;
-        }
-        if self.epoch != 0 {
-            my_size += ::protobuf::rt::uint32_size(4, self.epoch);
-        }
-        for value in &self.device_info_list {
-            let len = value.compute_size();
-            my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len;
-        };
-        if self.public_ip != 0 {
-            my_size += 1 + 4;
-        }
-        if self.public_port != 0 {
-            my_size += ::protobuf::rt::uint32_size(7, self.public_port);
-        }
-        if !self.public_ipv6.is_empty() {
-            my_size += ::protobuf::rt::bytes_size(8, &self.public_ipv6);
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if self.virtual_ip != 0 {
-            os.write_fixed32(1, self.virtual_ip)?;
-        }
-        if self.virtual_gateway != 0 {
-            os.write_fixed32(2, self.virtual_gateway)?;
-        }
-        if self.virtual_netmask != 0 {
-            os.write_fixed32(3, self.virtual_netmask)?;
-        }
-        if self.epoch != 0 {
-            os.write_uint32(4, self.epoch)?;
-        }
-        for v in &self.device_info_list {
-            ::protobuf::rt::write_message_field_with_cached_size(5, v, os)?;
-        };
-        if self.public_ip != 0 {
-            os.write_fixed32(6, self.public_ip)?;
-        }
-        if self.public_port != 0 {
-            os.write_uint32(7, self.public_port)?;
-        }
-        if !self.public_ipv6.is_empty() {
-            os.write_bytes(8, &self.public_ipv6)?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> RegistrationResponse {
-        RegistrationResponse::new()
-    }
-
-    fn clear(&mut self) {
-        self.virtual_ip = 0;
-        self.virtual_gateway = 0;
-        self.virtual_netmask = 0;
-        self.epoch = 0;
-        self.device_info_list.clear();
-        self.public_ip = 0;
-        self.public_port = 0;
-        self.public_ipv6.clear();
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static RegistrationResponse {
-        static instance: RegistrationResponse = RegistrationResponse {
-            virtual_ip: 0,
-            virtual_gateway: 0,
-            virtual_netmask: 0,
-            epoch: 0,
-            device_info_list: ::std::vec::Vec::new(),
-            public_ip: 0,
-            public_port: 0,
-            public_ipv6: ::std::vec::Vec::new(),
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for RegistrationResponse {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("RegistrationResponse").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for RegistrationResponse {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for RegistrationResponse {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:DeviceInfo)
-pub struct DeviceInfo {
-    // message fields
-    // @@protoc_insertion_point(field:DeviceInfo.name)
-    pub name: ::std::string::String,
-    // @@protoc_insertion_point(field:DeviceInfo.virtual_ip)
-    pub virtual_ip: u32,
-    // @@protoc_insertion_point(field:DeviceInfo.device_status)
-    pub device_status: u32,
-    // @@protoc_insertion_point(field:DeviceInfo.client_secret)
-    pub client_secret: bool,
-    // special fields
-    // @@protoc_insertion_point(special_field:DeviceInfo.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a DeviceInfo {
-    fn default() -> &'a DeviceInfo {
-        <DeviceInfo as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl DeviceInfo {
-    pub fn new() -> DeviceInfo {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(4);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "name",
-            |m: &DeviceInfo| { &m.name },
-            |m: &mut DeviceInfo| { &mut m.name },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "virtual_ip",
-            |m: &DeviceInfo| { &m.virtual_ip },
-            |m: &mut DeviceInfo| { &mut m.virtual_ip },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "device_status",
-            |m: &DeviceInfo| { &m.device_status },
-            |m: &mut DeviceInfo| { &mut m.device_status },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "client_secret",
-            |m: &DeviceInfo| { &m.client_secret },
-            |m: &mut DeviceInfo| { &mut m.client_secret },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<DeviceInfo>(
-            "DeviceInfo",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for DeviceInfo {
-    const NAME: &'static str = "DeviceInfo";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                10 => {
-                    self.name = is.read_string()?;
-                },
-                21 => {
-                    self.virtual_ip = is.read_fixed32()?;
-                },
-                24 => {
-                    self.device_status = is.read_uint32()?;
-                },
-                32 => {
-                    self.client_secret = is.read_bool()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if !self.name.is_empty() {
-            my_size += ::protobuf::rt::string_size(1, &self.name);
-        }
-        if self.virtual_ip != 0 {
-            my_size += 1 + 4;
-        }
-        if self.device_status != 0 {
-            my_size += ::protobuf::rt::uint32_size(3, self.device_status);
-        }
-        if self.client_secret != false {
-            my_size += 1 + 1;
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if !self.name.is_empty() {
-            os.write_string(1, &self.name)?;
-        }
-        if self.virtual_ip != 0 {
-            os.write_fixed32(2, self.virtual_ip)?;
-        }
-        if self.device_status != 0 {
-            os.write_uint32(3, self.device_status)?;
-        }
-        if self.client_secret != false {
-            os.write_bool(4, self.client_secret)?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> DeviceInfo {
-        DeviceInfo::new()
-    }
-
-    fn clear(&mut self) {
-        self.name.clear();
-        self.virtual_ip = 0;
-        self.device_status = 0;
-        self.client_secret = false;
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static DeviceInfo {
-        static instance: DeviceInfo = DeviceInfo {
-            name: ::std::string::String::new(),
-            virtual_ip: 0,
-            device_status: 0,
-            client_secret: false,
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for DeviceInfo {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("DeviceInfo").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for DeviceInfo {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for DeviceInfo {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:DeviceList)
-pub struct DeviceList {
-    // message fields
-    // @@protoc_insertion_point(field:DeviceList.epoch)
-    pub epoch: u32,
-    // @@protoc_insertion_point(field:DeviceList.device_info_list)
-    pub device_info_list: ::std::vec::Vec<DeviceInfo>,
-    // special fields
-    // @@protoc_insertion_point(special_field:DeviceList.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a DeviceList {
-    fn default() -> &'a DeviceList {
-        <DeviceList as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl DeviceList {
-    pub fn new() -> DeviceList {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(2);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "epoch",
-            |m: &DeviceList| { &m.epoch },
-            |m: &mut DeviceList| { &mut m.epoch },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
-            "device_info_list",
-            |m: &DeviceList| { &m.device_info_list },
-            |m: &mut DeviceList| { &mut m.device_info_list },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<DeviceList>(
-            "DeviceList",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for DeviceList {
-    const NAME: &'static str = "DeviceList";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                8 => {
-                    self.epoch = is.read_uint32()?;
-                },
-                18 => {
-                    self.device_info_list.push(is.read_message()?);
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if self.epoch != 0 {
-            my_size += ::protobuf::rt::uint32_size(1, self.epoch);
-        }
-        for value in &self.device_info_list {
-            let len = value.compute_size();
-            my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len;
-        };
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if self.epoch != 0 {
-            os.write_uint32(1, self.epoch)?;
-        }
-        for v in &self.device_info_list {
-            ::protobuf::rt::write_message_field_with_cached_size(2, v, os)?;
-        };
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> DeviceList {
-        DeviceList::new()
-    }
-
-    fn clear(&mut self) {
-        self.epoch = 0;
-        self.device_info_list.clear();
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static DeviceList {
-        static instance: DeviceList = DeviceList {
-            epoch: 0,
-            device_info_list: ::std::vec::Vec::new(),
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for DeviceList {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("DeviceList").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for DeviceList {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for DeviceList {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:PunchInfo)
-pub struct PunchInfo {
-    // message fields
-    // @@protoc_insertion_point(field:PunchInfo.public_ip_list)
-    pub public_ip_list: ::std::vec::Vec<u32>,
-    // @@protoc_insertion_point(field:PunchInfo.public_port)
-    pub public_port: u32,
-    // @@protoc_insertion_point(field:PunchInfo.public_port_range)
-    pub public_port_range: u32,
-    // @@protoc_insertion_point(field:PunchInfo.nat_type)
-    pub nat_type: ::protobuf::EnumOrUnknown<PunchNatType>,
-    // @@protoc_insertion_point(field:PunchInfo.reply)
-    pub reply: bool,
-    // @@protoc_insertion_point(field:PunchInfo.local_ip)
-    pub local_ip: u32,
-    // @@protoc_insertion_point(field:PunchInfo.local_port)
-    pub local_port: u32,
-    // @@protoc_insertion_point(field:PunchInfo.ipv6)
-    pub ipv6: ::std::vec::Vec<u8>,
-    // @@protoc_insertion_point(field:PunchInfo.ipv6_port)
-    pub ipv6_port: u32,
-    // @@protoc_insertion_point(field:PunchInfo.tcp_port)
-    pub tcp_port: u32,
-    // @@protoc_insertion_point(field:PunchInfo.udp_ports)
-    pub udp_ports: ::std::vec::Vec<u32>,
-    // @@protoc_insertion_point(field:PunchInfo.public_ports)
-    pub public_ports: ::std::vec::Vec<u32>,
-    // special fields
-    // @@protoc_insertion_point(special_field:PunchInfo.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a PunchInfo {
-    fn default() -> &'a PunchInfo {
-        <PunchInfo as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl PunchInfo {
-    pub fn new() -> PunchInfo {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(12);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
-            "public_ip_list",
-            |m: &PunchInfo| { &m.public_ip_list },
-            |m: &mut PunchInfo| { &mut m.public_ip_list },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "public_port",
-            |m: &PunchInfo| { &m.public_port },
-            |m: &mut PunchInfo| { &mut m.public_port },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "public_port_range",
-            |m: &PunchInfo| { &m.public_port_range },
-            |m: &mut PunchInfo| { &mut m.public_port_range },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "nat_type",
-            |m: &PunchInfo| { &m.nat_type },
-            |m: &mut PunchInfo| { &mut m.nat_type },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "reply",
-            |m: &PunchInfo| { &m.reply },
-            |m: &mut PunchInfo| { &mut m.reply },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "local_ip",
-            |m: &PunchInfo| { &m.local_ip },
-            |m: &mut PunchInfo| { &mut m.local_ip },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "local_port",
-            |m: &PunchInfo| { &m.local_port },
-            |m: &mut PunchInfo| { &mut m.local_port },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "ipv6",
-            |m: &PunchInfo| { &m.ipv6 },
-            |m: &mut PunchInfo| { &mut m.ipv6 },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "ipv6_port",
-            |m: &PunchInfo| { &m.ipv6_port },
-            |m: &mut PunchInfo| { &mut m.ipv6_port },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "tcp_port",
-            |m: &PunchInfo| { &m.tcp_port },
-            |m: &mut PunchInfo| { &mut m.tcp_port },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
-            "udp_ports",
-            |m: &PunchInfo| { &m.udp_ports },
-            |m: &mut PunchInfo| { &mut m.udp_ports },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
-            "public_ports",
-            |m: &PunchInfo| { &m.public_ports },
-            |m: &mut PunchInfo| { &mut m.public_ports },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<PunchInfo>(
-            "PunchInfo",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for PunchInfo {
-    const NAME: &'static str = "PunchInfo";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                18 => {
-                    is.read_repeated_packed_fixed32_into(&mut self.public_ip_list)?;
-                },
-                21 => {
-                    self.public_ip_list.push(is.read_fixed32()?);
-                },
-                24 => {
-                    self.public_port = is.read_uint32()?;
-                },
-                32 => {
-                    self.public_port_range = is.read_uint32()?;
-                },
-                40 => {
-                    self.nat_type = is.read_enum_or_unknown()?;
-                },
-                48 => {
-                    self.reply = is.read_bool()?;
-                },
-                61 => {
-                    self.local_ip = is.read_fixed32()?;
-                },
-                64 => {
-                    self.local_port = is.read_uint32()?;
-                },
-                74 => {
-                    self.ipv6 = is.read_bytes()?;
-                },
-                80 => {
-                    self.ipv6_port = is.read_uint32()?;
-                },
-                88 => {
-                    self.tcp_port = is.read_uint32()?;
-                },
-                98 => {
-                    is.read_repeated_packed_uint32_into(&mut self.udp_ports)?;
-                },
-                96 => {
-                    self.udp_ports.push(is.read_uint32()?);
-                },
-                106 => {
-                    is.read_repeated_packed_uint32_into(&mut self.public_ports)?;
-                },
-                104 => {
-                    self.public_ports.push(is.read_uint32()?);
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        my_size += 5 * self.public_ip_list.len() as u64;
-        if self.public_port != 0 {
-            my_size += ::protobuf::rt::uint32_size(3, self.public_port);
-        }
-        if self.public_port_range != 0 {
-            my_size += ::protobuf::rt::uint32_size(4, self.public_port_range);
-        }
-        if self.nat_type != ::protobuf::EnumOrUnknown::new(PunchNatType::Symmetric) {
-            my_size += ::protobuf::rt::int32_size(5, self.nat_type.value());
-        }
-        if self.reply != false {
-            my_size += 1 + 1;
-        }
-        if self.local_ip != 0 {
-            my_size += 1 + 4;
-        }
-        if self.local_port != 0 {
-            my_size += ::protobuf::rt::uint32_size(8, self.local_port);
-        }
-        if !self.ipv6.is_empty() {
-            my_size += ::protobuf::rt::bytes_size(9, &self.ipv6);
-        }
-        if self.ipv6_port != 0 {
-            my_size += ::protobuf::rt::uint32_size(10, self.ipv6_port);
-        }
-        if self.tcp_port != 0 {
-            my_size += ::protobuf::rt::uint32_size(11, self.tcp_port);
-        }
-        for value in &self.udp_ports {
-            my_size += ::protobuf::rt::uint32_size(12, *value);
-        };
-        for value in &self.public_ports {
-            my_size += ::protobuf::rt::uint32_size(13, *value);
-        };
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        for v in &self.public_ip_list {
-            os.write_fixed32(2, *v)?;
-        };
-        if self.public_port != 0 {
-            os.write_uint32(3, self.public_port)?;
-        }
-        if self.public_port_range != 0 {
-            os.write_uint32(4, self.public_port_range)?;
-        }
-        if self.nat_type != ::protobuf::EnumOrUnknown::new(PunchNatType::Symmetric) {
-            os.write_enum(5, ::protobuf::EnumOrUnknown::value(&self.nat_type))?;
-        }
-        if self.reply != false {
-            os.write_bool(6, self.reply)?;
-        }
-        if self.local_ip != 0 {
-            os.write_fixed32(7, self.local_ip)?;
-        }
-        if self.local_port != 0 {
-            os.write_uint32(8, self.local_port)?;
-        }
-        if !self.ipv6.is_empty() {
-            os.write_bytes(9, &self.ipv6)?;
-        }
-        if self.ipv6_port != 0 {
-            os.write_uint32(10, self.ipv6_port)?;
-        }
-        if self.tcp_port != 0 {
-            os.write_uint32(11, self.tcp_port)?;
-        }
-        for v in &self.udp_ports {
-            os.write_uint32(12, *v)?;
-        };
-        for v in &self.public_ports {
-            os.write_uint32(13, *v)?;
-        };
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> PunchInfo {
-        PunchInfo::new()
-    }
-
-    fn clear(&mut self) {
-        self.public_ip_list.clear();
-        self.public_port = 0;
-        self.public_port_range = 0;
-        self.nat_type = ::protobuf::EnumOrUnknown::new(PunchNatType::Symmetric);
-        self.reply = false;
-        self.local_ip = 0;
-        self.local_port = 0;
-        self.ipv6.clear();
-        self.ipv6_port = 0;
-        self.tcp_port = 0;
-        self.udp_ports.clear();
-        self.public_ports.clear();
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static PunchInfo {
-        static instance: PunchInfo = PunchInfo {
-            public_ip_list: ::std::vec::Vec::new(),
-            public_port: 0,
-            public_port_range: 0,
-            nat_type: ::protobuf::EnumOrUnknown::from_i32(0),
-            reply: false,
-            local_ip: 0,
-            local_port: 0,
-            ipv6: ::std::vec::Vec::new(),
-            ipv6_port: 0,
-            tcp_port: 0,
-            udp_ports: ::std::vec::Vec::new(),
-            public_ports: ::std::vec::Vec::new(),
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for PunchInfo {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("PunchInfo").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for PunchInfo {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for PunchInfo {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:ClientStatusInfo)
-pub struct ClientStatusInfo {
-    // message fields
-    // @@protoc_insertion_point(field:ClientStatusInfo.source)
-    pub source: u32,
-    // @@protoc_insertion_point(field:ClientStatusInfo.p2p_list)
-    pub p2p_list: ::std::vec::Vec<RouteItem>,
-    // @@protoc_insertion_point(field:ClientStatusInfo.up_stream)
-    pub up_stream: u64,
-    // @@protoc_insertion_point(field:ClientStatusInfo.down_stream)
-    pub down_stream: u64,
-    // @@protoc_insertion_point(field:ClientStatusInfo.nat_type)
-    pub nat_type: ::protobuf::EnumOrUnknown<PunchNatType>,
-    // special fields
-    // @@protoc_insertion_point(special_field:ClientStatusInfo.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a ClientStatusInfo {
-    fn default() -> &'a ClientStatusInfo {
-        <ClientStatusInfo as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl ClientStatusInfo {
-    pub fn new() -> ClientStatusInfo {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(5);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "source",
-            |m: &ClientStatusInfo| { &m.source },
-            |m: &mut ClientStatusInfo| { &mut m.source },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_vec_simpler_accessor::<_, _>(
-            "p2p_list",
-            |m: &ClientStatusInfo| { &m.p2p_list },
-            |m: &mut ClientStatusInfo| { &mut m.p2p_list },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "up_stream",
-            |m: &ClientStatusInfo| { &m.up_stream },
-            |m: &mut ClientStatusInfo| { &mut m.up_stream },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "down_stream",
-            |m: &ClientStatusInfo| { &m.down_stream },
-            |m: &mut ClientStatusInfo| { &mut m.down_stream },
-        ));
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "nat_type",
-            |m: &ClientStatusInfo| { &m.nat_type },
-            |m: &mut ClientStatusInfo| { &mut m.nat_type },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<ClientStatusInfo>(
-            "ClientStatusInfo",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for ClientStatusInfo {
-    const NAME: &'static str = "ClientStatusInfo";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                13 => {
-                    self.source = is.read_fixed32()?;
-                },
-                18 => {
-                    self.p2p_list.push(is.read_message()?);
-                },
-                24 => {
-                    self.up_stream = is.read_uint64()?;
-                },
-                32 => {
-                    self.down_stream = is.read_uint64()?;
-                },
-                40 => {
-                    self.nat_type = is.read_enum_or_unknown()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if self.source != 0 {
-            my_size += 1 + 4;
-        }
-        for value in &self.p2p_list {
-            let len = value.compute_size();
-            my_size += 1 + ::protobuf::rt::compute_raw_varint64_size(len) + len;
-        };
-        if self.up_stream != 0 {
-            my_size += ::protobuf::rt::uint64_size(3, self.up_stream);
-        }
-        if self.down_stream != 0 {
-            my_size += ::protobuf::rt::uint64_size(4, self.down_stream);
-        }
-        if self.nat_type != ::protobuf::EnumOrUnknown::new(PunchNatType::Symmetric) {
-            my_size += ::protobuf::rt::int32_size(5, self.nat_type.value());
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if self.source != 0 {
-            os.write_fixed32(1, self.source)?;
-        }
-        for v in &self.p2p_list {
-            ::protobuf::rt::write_message_field_with_cached_size(2, v, os)?;
-        };
-        if self.up_stream != 0 {
-            os.write_uint64(3, self.up_stream)?;
-        }
-        if self.down_stream != 0 {
-            os.write_uint64(4, self.down_stream)?;
-        }
-        if self.nat_type != ::protobuf::EnumOrUnknown::new(PunchNatType::Symmetric) {
-            os.write_enum(5, ::protobuf::EnumOrUnknown::value(&self.nat_type))?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> ClientStatusInfo {
-        ClientStatusInfo::new()
-    }
-
-    fn clear(&mut self) {
-        self.source = 0;
-        self.p2p_list.clear();
-        self.up_stream = 0;
-        self.down_stream = 0;
-        self.nat_type = ::protobuf::EnumOrUnknown::new(PunchNatType::Symmetric);
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static ClientStatusInfo {
-        static instance: ClientStatusInfo = ClientStatusInfo {
-            source: 0,
-            p2p_list: ::std::vec::Vec::new(),
-            up_stream: 0,
-            down_stream: 0,
-            nat_type: ::protobuf::EnumOrUnknown::from_i32(0),
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for ClientStatusInfo {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("ClientStatusInfo").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for ClientStatusInfo {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for ClientStatusInfo {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(PartialEq,Clone,Default,Debug)]
-// @@protoc_insertion_point(message:RouteItem)
-pub struct RouteItem {
-    // message fields
-    // @@protoc_insertion_point(field:RouteItem.next_ip)
-    pub next_ip: u32,
-    // special fields
-    // @@protoc_insertion_point(special_field:RouteItem.special_fields)
-    pub special_fields: ::protobuf::SpecialFields,
-}
-
-impl<'a> ::std::default::Default for &'a RouteItem {
-    fn default() -> &'a RouteItem {
-        <RouteItem as ::protobuf::Message>::default_instance()
-    }
-}
-
-impl RouteItem {
-    pub fn new() -> RouteItem {
-        ::std::default::Default::default()
-    }
-
-    fn generated_message_descriptor_data() -> ::protobuf::reflect::GeneratedMessageDescriptorData {
-        let mut fields = ::std::vec::Vec::with_capacity(1);
-        let mut oneofs = ::std::vec::Vec::with_capacity(0);
-        fields.push(::protobuf::reflect::rt::v2::make_simpler_field_accessor::<_, _>(
-            "next_ip",
-            |m: &RouteItem| { &m.next_ip },
-            |m: &mut RouteItem| { &mut m.next_ip },
-        ));
-        ::protobuf::reflect::GeneratedMessageDescriptorData::new_2::<RouteItem>(
-            "RouteItem",
-            fields,
-            oneofs,
-        )
-    }
-}
-
-impl ::protobuf::Message for RouteItem {
-    const NAME: &'static str = "RouteItem";
-
-    fn is_initialized(&self) -> bool {
-        true
-    }
-
-    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::Result<()> {
-        while let Some(tag) = is.read_raw_tag_or_eof()? {
-            match tag {
-                13 => {
-                    self.next_ip = is.read_fixed32()?;
-                },
-                tag => {
-                    ::protobuf::rt::read_unknown_or_skip_group(tag, is, self.special_fields.mut_unknown_fields())?;
-                },
-            };
-        }
-        ::std::result::Result::Ok(())
-    }
-
-    // Compute sizes of nested messages
-    #[allow(unused_variables)]
-    fn compute_size(&self) -> u64 {
-        let mut my_size = 0;
-        if self.next_ip != 0 {
-            my_size += 1 + 4;
-        }
-        my_size += ::protobuf::rt::unknown_fields_size(self.special_fields.unknown_fields());
-        self.special_fields.cached_size().set(my_size as u32);
-        my_size
-    }
-
-    fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::Result<()> {
-        if self.next_ip != 0 {
-            os.write_fixed32(1, self.next_ip)?;
-        }
-        os.write_unknown_fields(self.special_fields.unknown_fields())?;
-        ::std::result::Result::Ok(())
-    }
-
-    fn special_fields(&self) -> &::protobuf::SpecialFields {
-        &self.special_fields
-    }
-
-    fn mut_special_fields(&mut self) -> &mut ::protobuf::SpecialFields {
-        &mut self.special_fields
-    }
-
-    fn new() -> RouteItem {
-        RouteItem::new()
-    }
-
-    fn clear(&mut self) {
-        self.next_ip = 0;
-        self.special_fields.clear();
-    }
-
-    fn default_instance() -> &'static RouteItem {
-        static instance: RouteItem = RouteItem {
-            next_ip: 0,
-            special_fields: ::protobuf::SpecialFields::new(),
-        };
-        &instance
-    }
-}
-
-impl ::protobuf::MessageFull for RouteItem {
-    fn descriptor() -> ::protobuf::reflect::MessageDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().message_by_package_relative_name("RouteItem").unwrap()).clone()
-    }
-}
-
-impl ::std::fmt::Display for RouteItem {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        ::protobuf::text_format::fmt(self, f)
-    }
-}
-
-impl ::protobuf::reflect::ProtobufValue for RouteItem {
-    type RuntimeType = ::protobuf::reflect::rt::RuntimeTypeMessage<Self>;
-}
-
-#[derive(Clone,Copy,PartialEq,Eq,Debug,Hash)]
-// @@protoc_insertion_point(enum:PunchNatType)
-pub enum PunchNatType {
-    // @@protoc_insertion_point(enum_value:PunchNatType.Symmetric)
-    Symmetric = 0,
-    // @@protoc_insertion_point(enum_value:PunchNatType.Cone)
-    Cone = 1,
-}
-
-impl ::protobuf::Enum for PunchNatType {
-    const NAME: &'static str = "PunchNatType";
-
-    fn value(&self) -> i32 {
-        *self as i32
-    }
-
-    fn from_i32(value: i32) -> ::std::option::Option<PunchNatType> {
-        match value {
-            0 => ::std::option::Option::Some(PunchNatType::Symmetric),
-            1 => ::std::option::Option::Some(PunchNatType::Cone),
-            _ => ::std::option::Option::None
-        }
-    }
-
-    const VALUES: &'static [PunchNatType] = &[
-        PunchNatType::Symmetric,
-        PunchNatType::Cone,
-    ];
-}
-
-impl ::protobuf::EnumFull for PunchNatType {
-    fn enum_descriptor() -> ::protobuf::reflect::EnumDescriptor {
-        static descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::rt::Lazy::new();
-        descriptor.get(|| file_descriptor().enum_by_package_relative_name("PunchNatType").unwrap()).clone()
-    }
-
-    fn descriptor(&self) -> ::protobuf::reflect::EnumValueDescriptor {
-        let index = *self as usize;
-        Self::enum_descriptor().value_by_index(index)
-    }
-}
-
-impl ::std::default::Default for PunchNatType {
-    fn default() -> Self {
-        PunchNatType::Symmetric
-    }
-}
-
-impl PunchNatType {
-    fn generated_enum_descriptor_data() -> ::protobuf::reflect::GeneratedEnumDescriptorData {
-        ::protobuf::reflect::GeneratedEnumDescriptorData::new::<PunchNatType>("PunchNatType")
-    }
-}
-
-static file_descriptor_proto_data: &'static [u8] = b"\
-    \n\rmessage.proto\"D\n\x10HandshakeRequest\x12\x18\n\x07version\x18\x01\
-    \x20\x01(\tR\x07version\x12\x16\n\x06secret\x18\x02\x20\x01(\x08R\x06sec\
-    ret\"\x83\x01\n\x11HandshakeResponse\x12\x18\n\x07version\x18\x01\x20\
-    \x01(\tR\x07version\x12\x16\n\x06secret\x18\x02\x20\x01(\x08R\x06secret\
-    \x12\x1d\n\npublic_key\x18\x03\x20\x01(\x0cR\tpublicKey\x12\x1d\n\nkey_f\
-    inger\x18\x04\x20\x01(\tR\tkeyFinger\"@\n\x16SecretHandshakeRequest\x12\
-    \x14\n\x05token\x18\x01\x20\x01(\tR\x05token\x12\x10\n\x03key\x18\x02\
-    \x20\x01(\x0cR\x03key\"\xfb\x01\n\x13RegistrationRequest\x12\x14\n\x05to\
-    ken\x18\x01\x20\x01(\tR\x05token\x12\x1b\n\tdevice_id\x18\x02\x20\x01(\t\
-    R\x08deviceId\x12\x12\n\x04name\x18\x03\x20\x01(\tR\x04name\x12\x17\n\
-    \x07is_fast\x18\x04\x20\x01(\x08R\x06isFast\x12\x18\n\x07version\x18\x05\
-    \x20\x01(\tR\x07version\x12\x1d\n\nvirtual_ip\x18\x06\x20\x01(\x07R\tvir\
-    tualIp\x12&\n\x0fallow_ip_change\x18\x07\x20\x01(\x08R\rallowIpChange\
-    \x12#\n\rclient_secret\x18\x08\x20\x01(\x08R\x0cclientSecret\"\xb3\x02\n\
-    \x14RegistrationResponse\x12\x1d\n\nvirtual_ip\x18\x01\x20\x01(\x07R\tvi\
-    rtualIp\x12'\n\x0fvirtual_gateway\x18\x02\x20\x01(\x07R\x0evirtualGatewa\
-    y\x12'\n\x0fvirtual_netmask\x18\x03\x20\x01(\x07R\x0evirtualNetmask\x12\
-    \x14\n\x05epoch\x18\x04\x20\x01(\rR\x05epoch\x125\n\x10device_info_list\
-    \x18\x05\x20\x03(\x0b2\x0b.DeviceInfoR\x0edeviceInfoList\x12\x1b\n\tpubl\
-    ic_ip\x18\x06\x20\x01(\x07R\x08publicIp\x12\x1f\n\x0bpublic_port\x18\x07\
-    \x20\x01(\rR\npublicPort\x12\x1f\n\x0bpublic_ipv6\x18\x08\x20\x01(\x0cR\
-    \npublicIpv6\"\x89\x01\n\nDeviceInfo\x12\x12\n\x04name\x18\x01\x20\x01(\
-    \tR\x04name\x12\x1d\n\nvirtual_ip\x18\x02\x20\x01(\x07R\tvirtualIp\x12#\
-    \n\rdevice_status\x18\x03\x20\x01(\rR\x0cdeviceStatus\x12#\n\rclient_sec\
-    ret\x18\x04\x20\x01(\x08R\x0cclientSecret\"Y\n\nDeviceList\x12\x14\n\x05\
-    epoch\x18\x01\x20\x01(\rR\x05epoch\x125\n\x10device_info_list\x18\x02\
-    \x20\x03(\x0b2\x0b.DeviceInfoR\x0edeviceInfoList\"\x84\x03\n\tPunchInfo\
-    \x12$\n\x0epublic_ip_list\x18\x02\x20\x03(\x07R\x0cpublicIpList\x12\x1f\
-    \n\x0bpublic_port\x18\x03\x20\x01(\rR\npublicPort\x12*\n\x11public_port_\
-    range\x18\x04\x20\x01(\rR\x0fpublicPortRange\x12(\n\x08nat_type\x18\x05\
-    \x20\x01(\x0e2\r.PunchNatTypeR\x07natType\x12\x14\n\x05reply\x18\x06\x20\
-    \x01(\x08R\x05reply\x12\x19\n\x08local_ip\x18\x07\x20\x01(\x07R\x07local\
-    Ip\x12\x1d\n\nlocal_port\x18\x08\x20\x01(\rR\tlocalPort\x12\x12\n\x04ipv\
-    6\x18\t\x20\x01(\x0cR\x04ipv6\x12\x1b\n\tipv6_port\x18\n\x20\x01(\rR\x08\
-    ipv6Port\x12\x19\n\x08tcp_port\x18\x0b\x20\x01(\rR\x07tcpPort\x12\x1b\n\
-    \tudp_ports\x18\x0c\x20\x03(\rR\x08udpPorts\x12!\n\x0cpublic_ports\x18\r\
-    \x20\x03(\rR\x0bpublicPorts\"\xb9\x01\n\x10ClientStatusInfo\x12\x16\n\
-    \x06source\x18\x01\x20\x01(\x07R\x06source\x12%\n\x08p2p_list\x18\x02\
-    \x20\x03(\x0b2\n.RouteItemR\x07p2pList\x12\x1b\n\tup_stream\x18\x03\x20\
-    \x01(\x04R\x08upStream\x12\x1f\n\x0bdown_stream\x18\x04\x20\x01(\x04R\nd\
-    ownStream\x12(\n\x08nat_type\x18\x05\x20\x01(\x0e2\r.PunchNatTypeR\x07na\
-    tType\"$\n\tRouteItem\x12\x17\n\x07next_ip\x18\x01\x20\x01(\x07R\x06next\
-    Ip*'\n\x0cPunchNatType\x12\r\n\tSymmetric\x10\0\x12\x08\n\x04Cone\x10\
-    \x01b\x06proto3\
-";
-
-/// `FileDescriptorProto` object which was a source for this generated file
-fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto {
-    static file_descriptor_proto_lazy: ::protobuf::rt::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::Lazy::new();
-    file_descriptor_proto_lazy.get(|| {
-        ::protobuf::Message::parse_from_bytes(file_descriptor_proto_data).unwrap()
-    })
-}
-
-/// `FileDescriptor` object which allows dynamic access to files
-pub fn file_descriptor() -> &'static ::protobuf::reflect::FileDescriptor {
-    static generated_file_descriptor_lazy: ::protobuf::rt::Lazy<::protobuf::reflect::GeneratedFileDescriptor> = ::protobuf::rt::Lazy::new();
-    static file_descriptor: ::protobuf::rt::Lazy<::protobuf::reflect::FileDescriptor> = ::protobuf::rt::Lazy::new();
-    file_descriptor.get(|| {
-        let generated_file_descriptor = generated_file_descriptor_lazy.get(|| {
-            let mut deps = ::std::vec::Vec::with_capacity(0);
-            let mut messages = ::std::vec::Vec::with_capacity(10);
-            messages.push(HandshakeRequest::generated_message_descriptor_data());
-            messages.push(HandshakeResponse::generated_message_descriptor_data());
-            messages.push(SecretHandshakeRequest::generated_message_descriptor_data());
-            messages.push(RegistrationRequest::generated_message_descriptor_data());
-            messages.push(RegistrationResponse::generated_message_descriptor_data());
-            messages.push(DeviceInfo::generated_message_descriptor_data());
-            messages.push(DeviceList::generated_message_descriptor_data());
-            messages.push(PunchInfo::generated_message_descriptor_data());
-            messages.push(ClientStatusInfo::generated_message_descriptor_data());
-            messages.push(RouteItem::generated_message_descriptor_data());
-            let mut enums = ::std::vec::Vec::with_capacity(1);
-            enums.push(PunchNatType::generated_enum_descriptor_data());
-            ::protobuf::reflect::GeneratedFileDescriptor::new_generated(
-                file_descriptor_proto(),
-                deps,
-                messages,
-                enums,
-            )
-        });
-        ::protobuf::reflect::FileDescriptor::new_generated_2(generated_file_descriptor)
-    })
-}

vnt/src/proto/mod.rs

@@ -1,3 +0,0 @@
-// @generated
-
-pub mod message;

vnt/src/protocol/body.rs

@@ -4,6 +4,261 @@ pub const ENCRYPTION_RESERVED: usize = 16 + 32 + 12;
 pub const AES_GCM_ENCRYPTION_RESERVED: usize = 32;
 pub const RSA_ENCRYPTION_RESERVED: usize = 32;
 
+pub const RANDOM_RESERVED: usize = 4;
+pub const FINGER_RESERVED: usize = 12;
+pub const TAG_RESERVED: usize = 16;
+
+/*
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                                         random(32)                                          |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                                         finger(32)                                          |
+|                                         finger(32)                                          |
+|                                         finger(32)                                          |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+*/
+pub trait SecretTail {
+    fn buffer(&self) -> &[u8];
+    fn exist_finger(&self) -> bool;
+    fn random_buf(&self) -> &[u8] {
+        let buf = self.buffer();
+        let mut end = buf.len();
+        if self.exist_finger() {
+            end -= FINGER_RESERVED;
+        }
+        &buf[end - RANDOM_RESERVED..end]
+    }
+    fn finger(&self) -> &[u8] {
+        if self.exist_finger() {
+            let buf = self.buffer();
+            let end = buf.len();
+            &buf[end - FINGER_RESERVED..end]
+        } else {
+            &[]
+        }
+    }
+}
+
+pub trait SecretTailMut: SecretTail {
+    fn buffer_mut(&mut self) -> &mut [u8];
+    fn set_random(&mut self, random: &[u8]) {
+        let f = self.exist_finger();
+        let buf = self.buffer_mut();
+        let mut end = buf.len();
+        if f {
+            end -= FINGER_RESERVED;
+        }
+        buf[end - RANDOM_RESERVED..end].copy_from_slice(random);
+    }
+    fn set_finger(&mut self, finger: &[u8]) -> io::Result<()> {
+        if self.exist_finger() {
+            if finger.len() != FINGER_RESERVED {
+                return Err(io::Error::new(
+                    io::ErrorKind::InvalidData,
+                    "finger.len != 12",
+                ));
+            }
+            let buf = self.buffer_mut();
+            let end = buf.len();
+            buf[end - FINGER_RESERVED..end].copy_from_slice(finger);
+            Ok(())
+        } else {
+            Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                "not exist finger",
+            ))
+        }
+    }
+}
+
+/* aead加密数据体
+  0                                            15                                              31
+  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                          数据体                                              |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                          tag(32)                                            |
+ |                                          tag(32)                                            |
+ |                                          tag(32)                                            |
+ |                                          tag(32)                                            |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                         random(32)                                          |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                         finger(32)                                          |
+ |                                         finger(32)                                          |
+ |                                         finger(32)                                          |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+ 注：finger用于快速校验数据是否被修改，上层可使用token、协议头参与计算finger，
+    确保服务端和客户端都能感知修改(服务端不能解密也能校验指纹)
+*/
+pub struct AEADSecretBody<B> {
+    buffer: B,
+    exist_finger: bool,
+}
+
+impl<B: AsRef<[u8]>> AEADSecretBody<B> {
+    pub fn new(buffer: B, exist_finger: bool) -> io::Result<AEADSecretBody<B>> {
+        let len = buffer.as_ref().len();
+        let min_len = if exist_finger {
+            TAG_RESERVED + RANDOM_RESERVED + FINGER_RESERVED
+        } else {
+            TAG_RESERVED + RANDOM_RESERVED
+        };
+        // 不能大于udp最大载荷长度
+        if len < min_len || len > 65535 - 20 - 8 - 12 {
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                format!("AEADSecretBody length overflow {}", len),
+            ));
+        }
+        Ok(AEADSecretBody {
+            buffer,
+            exist_finger,
+        })
+    }
+    pub fn data(&self) -> &[u8] {
+        let mut end = self.buffer.as_ref().len() - TAG_RESERVED - RANDOM_RESERVED;
+        if self.exist_finger {
+            end -= FINGER_RESERVED;
+        }
+        &self.buffer.as_ref()[..end]
+    }
+    pub fn tag(&self) -> &[u8] {
+        let mut end = self.buffer.as_ref().len() - RANDOM_RESERVED;
+        if self.exist_finger {
+            end -= FINGER_RESERVED;
+        }
+        &self.buffer.as_ref()[end - TAG_RESERVED..end]
+    }
+}
+
+impl<B: AsRef<[u8]>> SecretTail for AEADSecretBody<B> {
+    #[inline]
+    fn buffer(&self) -> &[u8] {
+        self.buffer.as_ref()
+    }
+    #[inline]
+    fn exist_finger(&self) -> bool {
+        self.exist_finger
+    }
+}
+
+impl<B: AsRef<[u8]> + AsMut<[u8]>> SecretTailMut for AEADSecretBody<B> {
+    #[inline]
+    fn buffer_mut(&mut self) -> &mut [u8] {
+        self.buffer.as_mut()
+    }
+}
+
+impl<B: AsRef<[u8]> + AsMut<[u8]>> AEADSecretBody<B> {
+    /// 数据部分
+    pub fn data_mut(&mut self) -> &mut [u8] {
+        let mut end = self.buffer.as_ref().len() - RANDOM_RESERVED - TAG_RESERVED;
+        if self.exist_finger {
+            end -= FINGER_RESERVED;
+        }
+        &mut self.buffer.as_mut()[..end]
+    }
+    /// 数据和tag部分
+    pub fn data_tag_mut(&mut self) -> &mut [u8] {
+        let mut end = self.buffer.as_ref().len() - RANDOM_RESERVED;
+        if self.exist_finger {
+            end -= FINGER_RESERVED;
+        }
+        &mut self.buffer.as_mut()[..end]
+    }
+    pub fn set_tag(&mut self, tag: &[u8]) -> io::Result<()> {
+        if tag.len() != 16 {
+            return Err(io::Error::new(io::ErrorKind::InvalidData, "tag.len != 16"));
+        }
+        let mut end = self.buffer.as_ref().len() - RANDOM_RESERVED;
+        if self.exist_finger {
+            end -= FINGER_RESERVED;
+        }
+        self.buffer.as_mut()[end - TAG_RESERVED..end].copy_from_slice(tag);
+        Ok(())
+    }
+}
+
+/* 带随机数的加密数据体
+  0                                            15                                              31
+  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                          数据体                                              |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                         random(32)                                          |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                         finger(32)                                          |
+ |                                         finger(32)                                          |
+ |                                         finger(32)                                          |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+ 注：finger用于快速校验数据是否被修改，上层可使用token、协议头参与计算finger，
+    确保服务端和客户端都能感知修改(服务端不能解密也能校验指纹)
+*/
+pub struct IVSecretBody<B> {
+    buffer: B,
+    exist_finger: bool,
+}
+
+impl<B: AsRef<[u8]>> IVSecretBody<B> {
+    pub fn new(buffer: B, exist_finger: bool) -> io::Result<IVSecretBody<B>> {
+        let len = buffer.as_ref().len();
+        let min_len = if exist_finger {
+            FINGER_RESERVED + RANDOM_RESERVED
+        } else {
+            RANDOM_RESERVED
+        };
+        // 不能大于udp最大载荷长度
+        if len < min_len || len > 65535 - 20 - 8 - 12 {
+            return Err(io::Error::new(
+                io::ErrorKind::InvalidData,
+                format!("IVSecretBody length overflow {}", len),
+            ));
+        }
+        Ok(IVSecretBody {
+            buffer,
+            exist_finger,
+        })
+    }
+    pub fn data(&self) -> &[u8] {
+        let mut end = self.buffer.as_ref().len() - RANDOM_RESERVED;
+        if self.exist_finger {
+            end -= FINGER_RESERVED;
+        }
+        &self.buffer.as_ref()[..end]
+    }
+}
+
+impl<B: AsRef<[u8]> + AsMut<[u8]>> IVSecretBody<B> {
+    pub fn data_mut(&mut self) -> &mut [u8] {
+        let mut end = self.buffer.as_ref().len() - RANDOM_RESERVED;
+        if self.exist_finger {
+            end -= FINGER_RESERVED;
+        }
+        &mut self.buffer.as_mut()[..end]
+    }
+}
+
+impl<B: AsRef<[u8]>> SecretTail for IVSecretBody<B> {
+    #[inline]
+    fn buffer(&self) -> &[u8] {
+        self.buffer.as_ref()
+    }
+    #[inline]
+    fn exist_finger(&self) -> bool {
+        self.exist_finger
+    }
+}
+
+impl<B: AsRef<[u8]> + AsMut<[u8]>> SecretTailMut for IVSecretBody<B> {
+    #[inline]
+    fn buffer_mut(&mut self) -> &mut [u8] {
+        self.buffer.as_mut()
+    }
+}
+
 /* aes_gcm加密数据体
   0                                            15                                              31
   0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1

vnt/src/protocol/control_packet.rs

@@ -5,14 +5,20 @@ use std::{fmt, io};
 pub enum Protocol {
     /// ping请求
     /*
-     0                   1                   2                   3
-     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    |              time             |             echo              |
-    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+         0                                            15                                              31
+         0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |              time                          |                    echo                        |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     */
     Ping,
-    /// 维持连接，内容同ping
+    /*
+         0                                            15                                              31
+         0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+        |              time                          |                    echo                        |
+        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    */
     Pong,
     /// 打洞请求
     PunchRequest,
@@ -85,8 +91,8 @@ pub type PongPacket<B> = PingPacket<B>;
 impl<B: AsRef<[u8]>> PingPacket<B> {
     pub fn new(buffer: B) -> io::Result<PingPacket<B>> {
         let len = buffer.as_ref().len();
-        if len != 4 {
-            return Err(io::Error::new(io::ErrorKind::InvalidData, "len != 4"));
+        if len < 4 {
+            return Err(io::Error::new(io::ErrorKind::InvalidData, "len < 4"));
         }
         Ok(PingPacket { buffer })
     }
@@ -126,8 +132,8 @@ pub struct AddrPacket<B> {
 impl<B: AsRef<[u8]>> AddrPacket<B> {
     pub fn new(buffer: B) -> io::Result<AddrPacket<B>> {
         let len = buffer.as_ref().len();
-        if len != 6 {
-            return Err(io::Error::new(io::ErrorKind::InvalidData, "len != 6"));
+        if len < 6 {
+            return Err(io::Error::new(io::ErrorKind::InvalidData, "len < 6"));
         }
         Ok(AddrPacket { buffer })
     }

vnt/src/protocol/extension.rs

@@ -0,0 +1,141 @@
+/* 扩展协议
+  0                                            15                                              31
+  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                                          扩展数据(n)                                          |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |                         扩展数据(n)                                 |          type(8)        |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ 注：扩展数据的长度由type决定
+*/
+
+use anyhow::anyhow;
+use std::io;
+
+use crate::protocol::NetPacket;
+
+#[derive(Eq, PartialEq, Copy, Clone, Debug)]
+pub enum ExtensionTailType {
+    Compression,
+    Unknown(u8),
+}
+
+impl From<u8> for ExtensionTailType {
+    fn from(value: u8) -> Self {
+        if value == 0 {
+            ExtensionTailType::Compression
+        } else {
+            ExtensionTailType::Unknown(value)
+        }
+    }
+}
+
+pub enum ExtensionTailPacket<B> {
+    Compression(CompressionExtensionTail<B>),
+    Unknown,
+}
+
+impl<B: AsRef<[u8]> + AsMut<[u8]>> NetPacket<B> {
+    /// 分离尾部数据
+    pub fn split_tail_packet(&mut self) -> anyhow::Result<ExtensionTailPacket<&[u8]>> {
+        if self.is_extension() {
+            let payload = self.payload();
+            if let Some(v) = payload.last() {
+                return match ExtensionTailType::from(*v) {
+                    ExtensionTailType::Compression => {
+                        let data_len = self.data_len - 4;
+                        self.set_data_len(data_len)?;
+                        self.set_extension_flag(false);
+                        Ok(ExtensionTailPacket::Compression(
+                            CompressionExtensionTail::new(
+                                &self.raw_buffer()[data_len..data_len + 4],
+                            ),
+                        ))
+                    }
+                    ExtensionTailType::Unknown(e) => Err(anyhow!("unknown extension {}", e)),
+                };
+            }
+        }
+        Err(anyhow!("not extension"))
+    }
+    /// 追加压缩扩展
+    pub fn append_compression_extension_tail(
+        &mut self,
+    ) -> io::Result<CompressionExtensionTail<&mut [u8]>> {
+        let len = self.data_len;
+        //增加数据长度
+        self.set_data_len(self.data_len + 4)?;
+        self.set_extension_flag(true);
+        let mut tail = CompressionExtensionTail::new(&mut self.buffer_mut()[len..]);
+        tail.init();
+        return Ok(tail);
+    }
+}
+
+/* 扩展协议
+  0                                            15                                              31
+  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ |     algorithm(8)     |                                            |          type(8)        |
+ +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ 注：扩展数据的长度由type决定
+*/
+/// 压缩扩展
+pub struct CompressionExtensionTail<B> {
+    buffer: B,
+}
+
+impl<B: AsRef<[u8]>> CompressionExtensionTail<B> {
+    pub fn new(buffer: B) -> CompressionExtensionTail<B> {
+        assert_eq!(buffer.as_ref().len(), 4);
+        CompressionExtensionTail { buffer }
+    }
+}
+
+impl<B: AsRef<[u8]>> CompressionExtensionTail<B> {
+    pub fn algorithm(&self) -> CompressionAlgorithm {
+        self.buffer.as_ref()[0].into()
+    }
+}
+
+impl<B: AsRef<[u8]> + AsMut<[u8]>> CompressionExtensionTail<B> {
+    pub fn init(&mut self) {
+        self.buffer.as_mut().fill(0);
+    }
+    pub fn set_algorithm(&mut self, algorithm: CompressionAlgorithm) {
+        self.buffer.as_mut()[0] = algorithm.into()
+    }
+}
+
+#[derive(Eq, PartialEq, Copy, Clone, Debug)]
+pub enum CompressionAlgorithm {
+    #[cfg(feature = "lz4_compress")]
+    Lz4,
+    #[cfg(feature = "zstd_compress")]
+    Zstd,
+    Unknown(u8),
+}
+
+impl From<u8> for CompressionAlgorithm {
+    fn from(value: u8) -> Self {
+        match value {
+            #[cfg(feature = "lz4_compress")]
+            1 => CompressionAlgorithm::Lz4,
+            #[cfg(feature = "zstd_compress")]
+            2 => CompressionAlgorithm::Zstd,
+            v => CompressionAlgorithm::Unknown(v),
+        }
+    }
+}
+
+impl From<CompressionAlgorithm> for u8 {
+    fn from(value: CompressionAlgorithm) -> Self {
+        match value {
+            #[cfg(feature = "lz4_compress")]
+            CompressionAlgorithm::Lz4 => 1,
+            #[cfg(feature = "zstd_compress")]
+            CompressionAlgorithm::Zstd => 2,
+            CompressionAlgorithm::Unknown(val) => val,
+        }
+    }
+}

vnt/src/protocol/ip_turn_packet.rs

@@ -1,9 +1,12 @@
+#![allow(dead_code)]
+
 use std::io;
 use std::net::Ipv4Addr;
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 pub enum Protocol {
     Ipv4,
+    WGIpv4,
     Ipv4Broadcast,
     Unknown(u8),
 }
@@ -12,16 +15,18 @@ impl From<u8> for Protocol {
     fn from(value: u8) -> Self {
         match value {
             4 => Protocol::Ipv4,
+            5 => Protocol::WGIpv4,
             201 => Protocol::Ipv4Broadcast,
             val => Protocol::Unknown(val),
         }
     }
 }
 
-impl Into<u8> for Protocol {
-    fn into(self) -> u8 {
-        match self {
+impl From<Protocol> for u8 {
+    fn from(val: Protocol) -> Self {
+        match val {
             Protocol::Ipv4 => 4,
+            Protocol::WGIpv4 => 5,
             Protocol::Ipv4Broadcast => 201,
             Protocol::Unknown(val) => val,
         }

vnt/src/protocol/mod.rs

@@ -6,7 +6,7 @@ use std::{fmt, io};
    0                                            15                                              31
    0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1  2  3  4  5  6  7  8  9  0  1
   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  |e |s |u |u|   版本(4) |      协议(8)          |      上层协议(8)        | 初始ttl(4) | 生存时间(4) |
+  |e |s |x |u|   版本(4) |      协议(8)          |      上层协议(8)        | 初始ttl(4) | 生存时间(4) |
   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
   |                                          源ip地址(32)                                         |
   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -14,27 +14,29 @@ use std::{fmt, io};
   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
   |                                           数据体                                              |
   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-  注：e为是否加密标志，s为服务端通信包标志，u未使用
+  注：e为是否加密标志，s为服务端通信包标志，x扩展标志，u未使用
 */
 pub const HEAD_LEN: usize = 12;
 
 pub mod body;
 pub mod control_packet;
 pub mod error_packet;
+pub mod extension;
 pub mod ip_turn_packet;
 pub mod other_turn_packet;
 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 +45,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,
         }
     }
@@ -100,6 +102,10 @@ pub struct NetPacket<B> {
 }
 
 impl<B: AsRef<[u8]>> NetPacket<B> {
+    pub fn unchecked(buffer: B) -> Self {
+        let data_len = buffer.as_ref().len();
+        Self { data_len, buffer }
+    }
     pub fn new(buffer: B) -> io::Result<NetPacket<B>> {
         let data_len = buffer.as_ref().len();
         Self::new0(data_len, buffer)
@@ -122,15 +128,15 @@ impl<B: AsRef<[u8]>> NetPacket<B> {
                 "length overflow",
             ));
         }
-        // 不能大于udp最大载荷长度
-        if data_len < 12 || data_len > 65535 - 20 - 8 {
+        if data_len < 12 {
             return Err(io::Error::new(
                 io::ErrorKind::InvalidData,
-                "length overflow",
+                "data_len too short",
             ));
         }
         Ok(NetPacket { data_len, buffer })
     }
+    #[inline]
     pub fn buffer(&self) -> &[u8] {
         &self.buffer.as_ref()[..self.data_len]
     }
@@ -157,6 +163,10 @@ impl<B: AsRef<[u8]>> NetPacket<B> {
     pub fn is_gateway(&self) -> bool {
         self.buffer.as_ref()[0] & 0x40 == 0x40
     }
+    /// 扩展协议
+    pub fn is_extension(&self) -> bool {
+        self.buffer.as_ref()[0] & 0x20 == 0x20
+    }
     pub fn version(&self) -> Version {
         Version::from(self.buffer.as_ref()[0] & 0x0F)
     }
@@ -189,6 +199,9 @@ impl<B: AsRef<[u8]>> NetPacket<B> {
 }
 
 impl<B: AsRef<[u8]> + AsMut<[u8]>> NetPacket<B> {
+    pub fn head_mut(&mut self) -> &mut [u8] {
+        &mut self.buffer.as_mut()[..12]
+    }
     pub fn buffer_mut(&mut self) -> &mut [u8] {
         &mut self.buffer.as_mut()[..self.data_len]
     }
@@ -201,14 +214,20 @@ impl<B: AsRef<[u8]> + AsMut<[u8]>> NetPacket<B> {
     }
     pub fn set_gateway_flag(&mut self, is_gateway: bool) {
         if is_gateway {
-            // 后面的版本再改为0x40，改了之后不兼容1.2.5之前的版本
-            self.buffer.as_mut()[0] = self.buffer.as_ref()[0] | 0x50
+            self.buffer.as_mut()[0] = self.buffer.as_ref()[0] | 0x40
         } else {
             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_extension_flag(&mut self, is_extension: bool) {
+        if is_extension {
+            self.buffer.as_mut()[0] = self.buffer.as_ref()[0] | 0x20
+        } else {
+            self.buffer.as_mut()[0] = self.buffer.as_ref()[0] & 0xDF
+        };
+    }
+    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) {
@@ -263,6 +282,10 @@ impl<B: AsRef<[u8]> + AsMut<[u8]>> NetPacket<B> {
         self.data_len = data_len;
         Ok(())
     }
+    pub fn set_payload_len(&mut self, payload_len: usize) -> io::Result<()> {
+        let data_len = HEAD_LEN + payload_len;
+        self.set_data_len(data_len)
+    }
     pub fn set_data_len_max(&mut self) {
         self.data_len = self.buffer.as_ref().len();
     }

vnt/src/protocol/service_packet.rs

@@ -5,7 +5,7 @@ pub enum Protocol {
     /// 注册响应
     RegistrationResponse,
     /// 拉取设备列表
-    PollDeviceList,
+    PullDeviceList,
     /// 推送设备列表
     PushDeviceList,
     /// 和服务端握手
@@ -23,7 +23,7 @@ impl From<u8> for Protocol {
         match value {
             1 => Self::RegistrationRequest,
             2 => Self::RegistrationResponse,
-            3 => Self::PollDeviceList,
+            3 => Self::PullDeviceList,
             4 => Self::PushDeviceList,
             5 => Self::HandshakeRequest,
             6 => Self::HandshakeResponse,
@@ -40,7 +40,7 @@ impl Into<u8> for Protocol {
         match self {
             Self::RegistrationRequest => 1,
             Self::RegistrationResponse => 2,
-            Self::PollDeviceList => 3,
+            Self::PullDeviceList => 3,
             Self::PushDeviceList => 4,
             Self::HandshakeRequest => 5,
             Self::HandshakeResponse => 6,

vnt/src/tun_tap_device/create_device.rs

@@ -0,0 +1,241 @@
+use std::io;
+use std::net::Ipv4Addr;
+use std::sync::Arc;
+use tun_rs::SyncDevice;
+
+use crate::{DeviceConfig, ErrorInfo, ErrorType, VntCallback};
+
+#[cfg(any(target_os = "windows", target_os = "linux"))]
+const DEFAULT_TUN_NAME: &str = "vnt-tun";
+
+pub fn create_device<Call: VntCallback>(
+    config: DeviceConfig,
+    call: &Call,
+) -> Result<Arc<SyncDevice>, ErrorInfo> {
+    let device = match create_device0(&config) {
+        Ok(device) => device,
+        Err(e) => {
+            return Err(ErrorInfo::new_msg(
+                ErrorType::FailedToCrateDevice,
+                format!("create device {:?}", e),
+            ));
+        }
+    };
+    #[cfg(windows)]
+    let index = device.if_index().unwrap();
+    #[cfg(unix)]
+    let index = &device.name().unwrap();
+    if let Err(e) = add_route(index, Ipv4Addr::BROADCAST, Ipv4Addr::BROADCAST) {
+        log::warn!("添加广播路由失败 ={:?}", e);
+    }
+
+    if let Err(e) = add_route(
+        index,
+        Ipv4Addr::from([224, 0, 0, 0]),
+        Ipv4Addr::from([240, 0, 0, 0]),
+    ) {
+        log::warn!("添加组播路由失败 ={:?}", e);
+    }
+
+    for (dest, mask) in config.external_route {
+        if let Err(e) = add_route(index, dest, mask) {
+            log::warn!("添加路由失败,请检查-i参数是否和现有路由冲突 ={:?}", e);
+            call.error(ErrorInfo::new_msg(
+                ErrorType::Warn,
+                format!(
+                    "警告！ 添加路由失败,请检查-i参数是否和现有路由冲突 ={:?}",
+                    e
+                ),
+            ))
+        }
+    }
+    Ok(device)
+}
+
+fn create_device0(config: &DeviceConfig) -> io::Result<Arc<SyncDevice>> {
+    let mut tun_builder = tun_rs::DeviceBuilder::default();
+    tun_builder = tun_builder.ipv4(config.virtual_ip, config.virtual_netmask, None);
+
+    match &config.device_name {
+        None => {
+            #[cfg(any(target_os = "windows", target_os = "linux"))]
+            {
+                tun_builder = tun_builder.name(DEFAULT_TUN_NAME);
+            }
+        }
+        Some(name) => {
+            tun_builder = tun_builder.name(name);
+        }
+    }
+
+    #[cfg(target_os = "windows")]
+    {
+        let name = config
+            .device_name
+            .clone()
+            .unwrap_or_else(|| DEFAULT_TUN_NAME.to_string());
+        _ = delete_adapter_info_from_reg(&name);
+        tun_builder = tun_builder.metric(0).ring_capacity(4 * 1024 * 1024);
+    }
+
+    #[cfg(target_os = "linux")]
+    {
+        let device_name = config
+            .device_name
+            .clone()
+            .unwrap_or(DEFAULT_TUN_NAME.to_string());
+        if &device_name == DEFAULT_TUN_NAME {
+            delete_device(DEFAULT_TUN_NAME);
+        }
+    }
+
+    let device = tun_builder.mtu(config.mtu as u16).build_sync()?;
+    Ok(Arc::new(device))
+}
+
+#[cfg(target_os = "linux")]
+fn delete_device(name: &str) {
+    // 删除默认网卡，此操作有风险，后续可能去除
+    use std::process::Command;
+    let cmd = format!("ip link delete {}", name);
+    let delete_tun = Command::new("sh")
+        .arg("-c")
+        .arg(&cmd)
+        .output()
+        .expect("sh exec error!");
+    if !delete_tun.status.success() {
+        log::warn!("删除网卡失败:{:?}", delete_tun);
+    }
+}
+#[cfg(windows)]
+fn delete_adapter_info_from_reg(dev_name: &str) -> std::io::Result<()> {
+    use std::collections::HashSet;
+    use winreg::{enums::HKEY_LOCAL_MACHINE, enums::KEY_ALL_ACCESS, RegKey};
+    let hklm = RegKey::predef(HKEY_LOCAL_MACHINE);
+    let profiles_key = hklm.open_subkey_with_flags(
+        "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\NetworkList\\Profiles",
+        KEY_ALL_ACCESS,
+    )?;
+    let mut profile_guid_set = HashSet::new();
+    for sub_key_name in profiles_key.enum_keys().filter_map(Result::ok) {
+        let sub_key = profiles_key.open_subkey(&sub_key_name)?;
+        match sub_key.get_value::<String, _>("Description") {
+            Ok(profile_name) => {
+                if dev_name == profile_name {
+                    match profiles_key.delete_subkey_all(&sub_key_name) {
+                        Ok(_) => {
+                            log::info!("deleted Profiles sub_key: {}", sub_key_name);
+                            profile_guid_set.insert(sub_key_name);
+                        }
+                        Err(e) => {
+                            log::warn!("Failed to delete Profiles sub_key {}: {}", sub_key_name, e)
+                        }
+                    }
+                }
+            }
+            Err(e) => log::warn!(
+                "Failed to read Description for sub_key {}: {}",
+                sub_key_name,
+                e
+            ),
+        }
+    }
+    let unmanaged_key = hklm.open_subkey_with_flags(
+        "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\NetworkList\\Signatures\\Unmanaged",
+        KEY_ALL_ACCESS,
+    )?;
+    for sub_key_name in unmanaged_key.enum_keys().filter_map(Result::ok) {
+        let sub_key = unmanaged_key.open_subkey(&sub_key_name)?;
+        match sub_key.get_value::<String, _>("ProfileGuid") {
+            Ok(profile_guid) => {
+                if profile_guid_set.contains(&profile_guid) {
+                    match unmanaged_key.delete_subkey_all(&sub_key_name) {
+                        Ok(_) => log::info!("deleted Unmanaged sub_key: {}", sub_key_name),
+                        Err(e) => {
+                            log::warn!("Failed to delete Unmanaged sub_key {}: {}", sub_key_name, e)
+                        }
+                    }
+                }
+            }
+            Err(e) => log::warn!(
+                "Failed to read Description for sub_key {}: {}",
+                sub_key_name,
+                e
+            ),
+        }
+    }
+    Ok(())
+}
+
+#[cfg(target_os = "windows")]
+pub fn add_route(index: u32, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
+    let cmd = format!(
+        "route add {:?} mask {:?} {:?} metric {} if {}",
+        dest,
+        netmask,
+        Ipv4Addr::UNSPECIFIED,
+        1,
+        index
+    );
+    exe_cmd(&cmd)
+}
+#[cfg(target_os = "windows")]
+pub fn exe_cmd(cmd: &str) -> io::Result<()> {
+    use std::os::windows::process::CommandExt;
+
+    println!("exe cmd: {}", cmd);
+    let out = std::process::Command::new("cmd")
+        .creation_flags(windows_sys::Win32::System::Threading::CREATE_NO_WINDOW)
+        .arg("/C")
+        .arg(&cmd)
+        .output()?;
+    if !out.status.success() {
+        return Err(io::Error::new(
+            io::ErrorKind::Other,
+            format!("cmd={},out={:?}", cmd, String::from_utf8(out.stderr)),
+        ));
+    }
+    Ok(())
+}
+
+#[cfg(target_os = "macos")]
+pub fn add_route(name: &str, address: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
+    let cmd = format!(
+        "route -n add {} -netmask {} -interface {}",
+        address, netmask, name
+    );
+    exe_cmd(&cmd)?;
+    Ok(())
+}
+#[cfg(target_os = "linux")]
+pub fn add_route(name: &str, address: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
+    let cmd = if netmask.is_broadcast() {
+        format!("route add -host {:?} {}", address, name)
+    } else {
+        format!(
+            "route add -net {}/{} {}",
+            address,
+            u32::from(netmask).count_ones(),
+            name
+        )
+    };
+    exe_cmd(&cmd)?;
+    Ok(())
+}
+#[cfg(any(target_os = "macos", target_os = "linux"))]
+pub fn exe_cmd(cmd: &str) -> io::Result<std::process::Output> {
+    use std::process::Command;
+    println!("exe cmd: {}", cmd);
+    let out = Command::new("sh")
+        .arg("-c")
+        .arg(cmd)
+        .output()
+        .expect("sh exec error!");
+    if !out.status.success() {
+        return Err(io::Error::new(
+            io::ErrorKind::Other,
+            format!("cmd={},out={:?}", cmd, out),
+        ));
+    }
+    Ok(out)
+}

vnt/src/tun_tap_device/mod.rs

@@ -1,70 +1,11 @@
-use std::io;
-use std::sync::Arc;
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+#[cfg(feature = "integrated_tun")]
+pub use create_device::create_device;
 
-use tun::device::IFace;
-use tun::Device;
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+#[cfg(feature = "integrated_tun")]
+mod create_device;
+#[cfg(feature = "integrated_tun")]
+pub mod tun_create_helper;
 
-use crate::core::Config;
-#[cfg(any(target_os = "windows", target_os = "linux"))]
-const DEFAULT_TUN_NAME: &str = "vnt-tun";
-#[cfg(any(target_os = "windows", target_os = "linux"))]
-const DEFAULT_TAP_NAME: &str = "vnt-tap";
-
-pub fn create_device(config: &Config) -> io::Result<Arc<Device>> {
-    #[cfg(any(target_os = "windows", target_os = "linux"))]
-    let default_name: &str = if config.tap {
-        DEFAULT_TAP_NAME
-    } else {
-        DEFAULT_TUN_NAME
-    };
-    #[cfg(target_os = "linux")]
-    let device = {
-        let device_name = config
-            .device_name
-            .clone()
-            .unwrap_or(default_name.to_string());
-        if &device_name == default_name {
-            delete_device(default_name);
-        }
-        Arc::new(Device::new(Some(device_name), config.tap)?)
-    };
-    #[cfg(target_os = "macos")]
-    let device = Arc::new(Device::new(config.device_name.clone())?);
-    #[cfg(target_os = "windows")]
-    let device = Arc::new(Device::new(
-        config
-            .device_name
-            .clone()
-            .unwrap_or(default_name.to_string()),
-        config.tap,
-    )?);
-    #[cfg(target_os = "android")]
-    let device = Arc::new(Device::new(config.device_fd as _)?);
-    #[cfg(not(target_os = "android"))]
-    {
-        let mtu = config.mtu.unwrap_or_else(|| {
-            if config.password.is_none() {
-                1450
-            } else {
-                1410
-            }
-        });
-        device.set_mtu(mtu)?;
-    }
-    Ok(device)
-}
-
-#[cfg(target_os = "linux")]
-fn delete_device(name: &str) {
-    // 删除默认网卡，此操作有风险，后续可能去除
-    use std::process::Command;
-    let cmd = format!("ip link delete {}", name);
-    let delete_tun = Command::new("sh")
-        .arg("-c")
-        .arg(&cmd)
-        .output()
-        .expect("sh exec error!");
-    if !delete_tun.status.success() {
-        log::warn!("删除网卡失败:{:?}", delete_tun);
-    }
-}
+pub mod vnt_device;

vnt/src/tun_tap_device/tun_create_helper.rs

@@ -0,0 +1,141 @@
+use std::collections::HashMap;
+use std::io;
+use std::net::Ipv4Addr;
+use std::sync::Arc;
+
+use crate::channel::context::ChannelContext;
+use crate::cipher::Cipher;
+use crate::compression::Compressor;
+use crate::external_route::ExternalRoute;
+use crate::handle::tun_tap::DeviceStop;
+use crate::handle::{CurrentDeviceInfo, PeerDeviceInfo};
+#[cfg(feature = "ip_proxy")]
+use crate::ip_proxy::IpProxyMap;
+use crate::tun_tap_device::vnt_device::DeviceWrite;
+use crate::util::StopManager;
+use crossbeam_utils::atomic::AtomicCell;
+use parking_lot::Mutex;
+use tun_rs::SyncDevice;
+
+#[repr(transparent)]
+#[derive(Clone, Default)]
+pub struct DeviceAdapter {
+    tun: Arc<Mutex<Option<Arc<SyncDevice>>>>,
+}
+
+impl DeviceAdapter {
+    pub fn insert(&self, device: Arc<SyncDevice>) {
+        let r = self.tun.lock().replace(device);
+        assert!(r.is_none());
+    }
+    /// 要保证先remove 再insert
+    pub fn remove(&self) {
+        drop(self.tun.lock().take());
+    }
+}
+
+impl DeviceWrite for DeviceAdapter {
+    #[inline]
+    fn write(&self, buf: &[u8]) -> io::Result<usize> {
+        if let Some(tun) = self.tun.lock().as_ref() {
+            tun.send(buf)
+        } else {
+            Err(io::Error::new(io::ErrorKind::NotFound, "not tun device"))
+        }
+    }
+
+    fn into_device_adapter(self) -> DeviceAdapter {
+        self
+    }
+}
+
+#[derive(Clone)]
+pub struct TunDeviceHelper {
+    inner: Arc<Mutex<TunDeviceHelperInner>>,
+    device_adapter: DeviceAdapter,
+    device_stop: Arc<Mutex<Option<DeviceStop>>>,
+}
+
+#[derive(Clone)]
+struct TunDeviceHelperInner {
+    stop_manager: StopManager,
+    context: ChannelContext,
+    current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+    ip_route: ExternalRoute,
+    #[cfg(feature = "ip_proxy")]
+    ip_proxy_map: Option<IpProxyMap>,
+    client_cipher: Cipher,
+    server_cipher: Cipher,
+    device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+    compressor: Compressor,
+}
+
+impl TunDeviceHelper {
+    pub fn new(
+        stop_manager: StopManager,
+        context: ChannelContext,
+        current_device: Arc<AtomicCell<CurrentDeviceInfo>>,
+        ip_route: ExternalRoute,
+        #[cfg(feature = "ip_proxy")] ip_proxy_map: Option<IpProxyMap>,
+        client_cipher: Cipher,
+        server_cipher: Cipher,
+        device_map: Arc<Mutex<(u16, HashMap<Ipv4Addr, PeerDeviceInfo>)>>,
+        compressor: Compressor,
+        device_adapter: DeviceAdapter,
+    ) -> Self {
+        let inner = TunDeviceHelperInner {
+            stop_manager,
+            context,
+            current_device,
+            ip_route,
+            #[cfg(feature = "ip_proxy")]
+            ip_proxy_map,
+            client_cipher,
+            server_cipher,
+            device_map,
+            compressor,
+        };
+        Self {
+            inner: Arc::new(Mutex::new(inner)),
+            device_adapter,
+            device_stop: Default::default(),
+        }
+    }
+    pub fn stop(&self) {
+        //先停止旧的，再启动新的，改变旧网卡的IP太麻烦
+        if let Some(device_stop) = self.device_stop.lock().take() {
+            self.device_adapter.remove();
+            loop {
+                device_stop.stop();
+                std::thread::sleep(std::time::Duration::from_millis(300));
+                //确保停止了
+                if device_stop.is_stopped() {
+                    break;
+                }
+            }
+        }
+    }
+    /// 要保证先stop 再start
+    pub fn start(&self, device: Arc<SyncDevice>, allow_wire_guard: bool) -> io::Result<()> {
+        self.device_adapter.insert(device.clone());
+        let device_stop = DeviceStop::default();
+        let s = self.device_stop.lock().replace(device_stop.clone());
+        assert!(s.is_none());
+        let inner = self.inner.lock().clone();
+        crate::handle::tun_tap::tun_handler::start(
+            inner.stop_manager,
+            inner.context,
+            device,
+            inner.current_device,
+            inner.ip_route,
+            #[cfg(feature = "ip_proxy")]
+            inner.ip_proxy_map,
+            inner.client_cipher,
+            inner.server_cipher,
+            inner.device_map,
+            inner.compressor,
+            device_stop,
+            allow_wire_guard,
+        )
+    }
+}

vnt/src/tun_tap_device/vnt_device.rs

@@ -0,0 +1,7 @@
+use std::io;
+
+pub trait DeviceWrite: Clone + Send + Sync + 'static {
+    fn write(&self, buf: &[u8]) -> io::Result<usize>;
+    #[cfg(feature = "integrated_tun")]
+    fn into_device_adapter(self) -> crate::tun_tap_device::tun_create_helper::DeviceAdapter;
+}

vnt/src/util/counter/adder.rs

@@ -1,138 +1,33 @@
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
-/// 不安全的并发计数器，谨慎使用
+use crossbeam_utils::atomic::AtomicCell;
 
+#[derive(Clone, Default)]
 pub struct U64Adder {
-    global_index: Arc<AtomicUsize>,
-    inner: Arc<U64AdderInner>,
-    index: usize,
-}
-pub struct SingleU64Adder {
-    inner: Arc<SingleU64AdderInner>,
-}
-impl SingleU64Adder {
-    pub fn new() -> Self {
-        Self {
-            inner: Arc::new(SingleU64AdderInner::new()),
-        }
-    }
-    pub fn add(&mut self, num: u64) {
-        self.inner.add(num);
-    }
-    pub fn get(&self) -> u64 {
-        self.inner.get()
-    }
-    pub fn watch(&self) -> WatchSingleU64Adder {
-        WatchSingleU64Adder {
-            inner: self.inner.clone(),
-        }
-    }
-}
-
-struct SingleU64AdderInner {
-    ptr: *mut u64,
-}
-
-impl SingleU64AdderInner {
-    fn new() -> Self {
-        Self {
-            ptr: Box::into_raw(Box::new(0)),
-        }
-    }
-    #[inline(always)]
-    fn add(&self, num: u64) {
-        unsafe { *self.ptr += num }
-    }
-
-    fn get(&self) -> u64 {
-        unsafe { *self.ptr }
-    }
-}
-impl Drop for SingleU64AdderInner {
-    fn drop(&mut self) {
-        unsafe {
-            let _ = Box::from_raw(self.ptr);
-        }
-    }
-}
-
-unsafe impl Send for SingleU64AdderInner {}
-
-unsafe impl Sync for SingleU64AdderInner {}
-
-struct U64AdderInner {
-    base: Vec<SingleU64AdderInner>,
-}
-
-impl U64AdderInner {
-    pub fn get(&self) -> u64 {
-        let mut count = 0;
-        for counter in self.base.iter() {
-            count += counter.get()
-        }
-        count
-    }
+    count: Arc<AtomicCell<u64>>,
 }
 
 impl U64Adder {
-    /// 计数槽容量
-    pub fn with_capacity(capacity: usize) -> Self {
-        let mut base = Vec::with_capacity(capacity);
-        for _ in 0..capacity {
-            base.push(SingleU64AdderInner::new())
-        }
-        let inner = Arc::new(U64AdderInner { base });
-        U64Adder {
-            global_index: Arc::new(AtomicUsize::new(1)),
-            inner,
-            index: 0,
-        }
-    }
-    pub fn add(&mut self, num: u64) {
-        self.inner.base[self.index].add(num);
+    pub fn add(&self, num: u64) {
+        self.count.fetch_add(num);
     }
     pub fn get(&self) -> u64 {
-        self.inner.get()
+        self.count.load()
     }
     pub fn watch(&self) -> WatchU64Adder {
         WatchU64Adder {
-            inner: self.inner.clone(),
-        }
-    }
-}
-
-impl Clone for U64Adder {
-    fn clone(&self) -> Self {
-        let index = self.global_index.fetch_add(1, Ordering::AcqRel);
-        if index > self.inner.base.len() {
-            panic!()
-        }
-
-        Self {
-            global_index: self.global_index.clone(),
-            inner: self.inner.clone(),
-            index,
+            count: self.count.clone(),
         }
     }
 }
 
 #[derive(Clone)]
 pub struct WatchU64Adder {
-    inner: Arc<U64AdderInner>,
+    count: Arc<AtomicCell<u64>>,
 }
 
 impl WatchU64Adder {
     pub fn get(&self) -> u64 {
-        self.inner.get()
-    }
-}
-#[derive(Clone)]
-pub struct WatchSingleU64Adder {
-    inner: Arc<SingleU64AdderInner>,
-}
-impl WatchSingleU64Adder {
-    pub fn get(&self) -> u64 {
-        self.inner.get()
+        self.count.load()
     }
 }

vnt/src/util/dns_query.rs

@@ -0,0 +1,436 @@
+use crate::channel::socket::LocalInterface;
+use anyhow::Context;
+use dns_parser::{Builder, Packet, QueryClass, QueryType, RData, ResponseCode};
+use http_req::request::{RedirectPolicy, Request};
+use http_req::uri::Uri;
+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};
+
+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
+fn address_choose0(addrs: Vec<SocketAddr>) -> anyhow::Result<SocketAddr> {
+    let v4: Vec<SocketAddr> = addrs.iter().filter(|v| v.is_ipv4()).copied().collect();
+    let v6: Vec<SocketAddr> = addrs.iter().filter(|v| v.is_ipv6()).copied().collect();
+    let check_addr = |addrs: &Vec<SocketAddr>| -> anyhow::Result<SocketAddr> {
+        let mut err = Vec::new();
+        if !addrs.is_empty() {
+            let udp = if addrs[0].is_ipv6() {
+                UdpSocket::bind("[::]:0")?
+            } else {
+                UdpSocket::bind("0.0.0.0:0")?
+            };
+            for addr in addrs {
+                if let Err(e) = udp.connect(addr) {
+                    err.push((*addr, e));
+                } else {
+                    return Ok(*addr);
+                }
+            }
+        }
+        Err(anyhow::anyhow!("Unable to connect to address {:?}", err))
+    };
+    if v6.is_empty() {
+        return check_addr(&v4);
+    }
+    if v4.is_empty() {
+        return check_addr(&v6);
+    }
+    match check_addr(&v6) {
+        Ok(addr) => Ok(addr),
+        Err(e1) => match check_addr(&v4) {
+            Ok(addr) => Ok(addr),
+            Err(e2) => Err(anyhow::anyhow!("{} , {}", e1, e2)),
+        },
+    }
+}
+
+pub fn dns_query_all(
+    domain: &str,
+    mut name_servers: Vec<String>,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<Vec<SocketAddr>> {
+    let mut current_domain = domain.to_string(); // 引入可变变量存储当前域名
+    match SocketAddr::from_str(&current_domain) {
+        Ok(addr) => Ok(vec![addr]),
+        Err(_) => {
+            // 重定向判断 http:
+            let current_domain_lower = current_domain.to_lowercase();
+            let redirect_domain = current_domain_lower
+                .strip_prefix("http:")
+                .or_else(|| current_domain_lower.strip_prefix("https:"))
+                .map(|v| v.to_string());
+
+            // 执行重定向检查
+            if let Some(stripped) = redirect_domain {
+                if let Some(redirected_url) = check_for_redirect(&stripped)? {
+                    // 去掉 URL 开头的协议部分
+                    let final_domain = remove_http_prefix(&redirected_url);
+                    println!("Server Address: {}", final_domain);
+
+                    // 检查是否为 IP 和端口组合
+                    if let Ok(socket_addr) = SocketAddr::from_str(&final_domain) {
+                        // 如果是 IP 和端口格式，直接返回结果
+                        return Ok(vec![socket_addr]);
+                    } else {
+                        // 如果不是 IP 和端口格式，则更新为重定向地址
+                        current_domain = final_domain;
+                    }
+                }
+            }
+            let txt_domain = current_domain
+                .to_lowercase()
+                .strip_prefix("txt:")
+                .map(|v| v.to_string());
+            if name_servers.is_empty() {
+                if txt_domain.is_some() {
+                    name_servers.push("223.5.5.5:53".into());
+                    name_servers.push("119.29.29.29:53".into());
+                    name_servers.push("114.114.114.114:53".into());
+                } else {
+                    return Ok(current_domain
+                        .to_socket_addrs()
+                        .with_context(|| format!("DNS query failed {:?}", current_domain))?
+                        .collect());
+                }
+            }
+
+            let mut err: Option<anyhow::Error> = None;
+            for name_server in name_servers {
+                if let Some(domain) = txt_domain.as_ref() {
+                    match txt_dns(domain, name_server, default_interface) {
+                        Ok(addr) => {
+                            if !addr.is_empty() {
+                                println!("TXT: {:?}", addr);
+                                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 = current_domain
+                    .rfind(':')
+                    .with_context(|| format!("{:?} not port", current_domain))?;
+                let host = &domain[..end_index];
+                let port = u16::from_str(&domain[end_index + 1..])
+                    .with_context(|| format!("{:?} not port", current_domain))?;
+                let th1 = {
+                    let host = host.to_string();
+                    let name_server = name_server.clone();
+                    let default_interface = default_interface.clone();
+                    thread::spawn(move || a_dns(host, name_server, &default_interface))
+                };
+                let th2 = {
+                    let host = host.to_string();
+                    let name_server = name_server.clone();
+                    let default_interface = default_interface.clone();
+                    thread::spawn(move || aaaa_dns(host, name_server, &default_interface))
+                };
+                let mut addr = Vec::new();
+                match th1.join().unwrap() {
+                    Ok(rs) => {
+                        for ip in rs {
+                            addr.push(SocketAddr::new(ip.into(), port));
+                        }
+                    }
+                    Err(e) => {
+                        err.replace(anyhow::anyhow!("{}", e));
+                    }
+                }
+                match th2.join().unwrap() {
+                    Ok(rs) => {
+                        for ip in rs {
+                            addr.push(SocketAddr::new(ip.into(), port));
+                        }
+                    }
+                    Err(e) => {
+                        if addr.is_empty() {
+                            if let Some(err) = &mut err {
+                                *err = anyhow::anyhow!("{},{}", err, e);
+                            } else {
+                                err.replace(anyhow::anyhow!("{}", e));
+                            }
+                            continue;
+                        }
+                    }
+                }
+                if addr.is_empty() {
+                    continue;
+                }
+                return Ok(addr);
+            }
+            if let Some(e) = err {
+                Err(e)
+            } else {
+                Err(anyhow::anyhow!("DNS query failed {:?}", current_domain))
+            }
+        }
+    }
+}
+
+fn parse_host_port(addr: &str) -> bool {
+    // 处理 IPv6 地址（格式为 [::1]:8080）
+    if addr.starts_with('[') {
+        if let Some(idx) = addr.rfind(']') {
+            if let Some(port_idx) = addr[idx + 1..].find(':') {
+                let port = &addr[idx + 1 + port_idx + 1..]; // 提取端口部分
+                return !port.is_empty() && port.chars().all(|c| c.is_numeric());
+            }
+        }
+    } else {
+        // 处理 IPv4 和普通域名（格式为 example.com:443 或 192.168.1.1:8080）
+        if let Some((_host, port)) = addr.rsplit_once(':') {
+            return !port.is_empty() && port.chars().all(|c| c.is_numeric());
+        }
+    }
+    false
+}
+
+fn check_for_redirect(domain: &String) -> anyhow::Result<Option<String>> {
+    // 确保域名有 http:// 或 https:// 前缀
+    let mut url = if domain.starts_with("http://") || domain.starts_with("https://") {
+        domain.clone()
+    } else {
+        format!("http://{}", domain)
+    };
+
+    let mut count = 0; // 重定向次数计数器
+    let mut last_redirect_url: Option<String> = None; // 记录最后一个重定向的 URL
+
+    loop {
+        count += 1;
+        if count > 3 {
+            println!("重定向次数超过 3 次，跳过");
+            return Ok(last_redirect_url);
+        }
+
+        // 解析 URL
+        let uri = match Uri::try_from(url.as_str()) {
+            Ok(u) => u,
+            Err(e) => {
+                println!("解析地址失败: {}", e);
+                return Ok(last_redirect_url);
+            }
+        };
+
+        let mut response_body = Vec::new();
+
+        // 发送 HTTP 请求
+        let response = match Request::new(&uri)
+            .timeout(Duration::from_secs(10))
+            .redirect_policy(RedirectPolicy::Limit(0))
+            .send(&mut response_body)
+        {
+            Ok(resp) => {
+                println!("HTTP Status Code: {}", resp.status_code());
+                resp
+            }
+            Err(e) => {
+                return Ok(last_redirect_url);
+            }
+        };
+
+        let body_str = String::from_utf8_lossy(&response_body);
+        let cleaned_body = body_str.replace('\n', "").replace('\r', "");
+        println!("Response Body: {}", cleaned_body);
+        // 处理 3XX 重定向
+        if response.status_code().is_redirect() {
+            if let Some(location) = response.headers().get("Location") {
+                url = location.to_string().trim_end_matches('/').to_string();
+                last_redirect_url = Some(url.clone()); // 更新最后的重定向地址
+                println!("Location: {}", url);
+                continue;
+            } else {
+                return Ok(last_redirect_url);
+            }
+        }
+        // 处理 200 响应
+        else if response.status_code().is_success() {
+            for line in body_str.lines() {
+                let trimmed = line.trim();
+                if parse_host_port(trimmed) {
+                    println!("text: {}", trimmed);
+                    return Ok(Some(trimmed.to_string()));
+                }
+            }
+            return Ok(last_redirect_url);
+        }
+        return Ok(last_redirect_url);
+    }
+}
+
+/// 去掉 http:// 或 https:// 前缀
+fn remove_http_prefix(url: &str) -> String {
+    url.trim_start_matches("http://")
+        .trim_start_matches("https://")
+        .to_string()
+}
+
+fn query<'a>(
+    udp: &UdpSocket,
+    domain: &str,
+    name_server: SocketAddr,
+    record_type: QueryType,
+    buf: &'a mut [u8],
+) -> anyhow::Result<Packet<'a>> {
+    let mut builder = Builder::new_query(1, true);
+    builder.add_question(domain, false, record_type, QueryClass::IN);
+    let packet = builder.build().unwrap();
+
+    udp.connect(name_server)
+        .with_context(|| format!("DNS {:?} error ", name_server))?;
+    let mut count = 0;
+    let len = loop {
+        udp.send(&packet)?;
+
+        match udp.recv(buf) {
+            Ok(len) => {
+                break len;
+            }
+            Err(e) => {
+                if e.kind() == io::ErrorKind::TimedOut || e.kind() == io::ErrorKind::WouldBlock {
+                    count += 1;
+                    if count < 3 {
+                        continue;
+                    }
+                }
+                Err(e).with_context(|| format!("DNS {:?} recv error ", name_server))?
+            }
+        };
+    };
+
+    let pkt = Packet::parse(&buf[..len])
+        .with_context(|| format!("domain {:?} DNS {:?} data error ", domain, name_server))?;
+    if pkt.header.response_code != ResponseCode::NoError {
+        return Err(anyhow::anyhow!(
+            "response_code {} DNS {:?} domain {:?}",
+            pkt.header.response_code,
+            name_server,
+            domain
+        ));
+    }
+    if pkt.answers.is_empty() {
+        return Err(anyhow::anyhow!(
+            "No records received DNS {:?} domain {:?}",
+            name_server,
+            domain
+        ));
+    }
+
+    Ok(pkt)
+}
+
+pub fn txt_dns(
+    domain: &str,
+    name_server: String,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<Vec<SocketAddr>> {
+    let name_server: SocketAddr = name_server.parse()?;
+    let udp = bind_udp(name_server, default_interface)?;
+    let mut buf = [0; 65536];
+    let message = query(&udp, domain, name_server, QueryType::TXT, &mut buf)?;
+    let mut rs = Vec::new();
+    for record in message.answers {
+        if let RData::TXT(txt) = record.data {
+            for x in txt.iter() {
+                let txt = std::str::from_utf8(x).context("record type txt is not string")?;
+                let addr =
+                    SocketAddr::from_str(txt).context("record type txt is not SocketAddr")?;
+                rs.push(addr);
+            }
+        }
+    }
+    Ok(rs)
+}
+
+fn bind_udp(
+    name_server: SocketAddr,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<UdpSocket> {
+    let addr: SocketAddr = if name_server.is_ipv4() {
+        "0.0.0.0:0".parse().unwrap()
+    } else {
+        "[::]:0".parse().unwrap()
+    };
+    let socket = crate::channel::socket::bind_udp(addr, default_interface)?;
+    socket.set_nonblocking(false)?;
+    socket.set_read_timeout(Some(Duration::from_millis(800)))?;
+    Ok(socket.into())
+}
+
+pub fn a_dns(
+    domain: String,
+    name_server: String,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<Vec<Ipv4Addr>> {
+    let name_server: SocketAddr = name_server.parse()?;
+    let udp = bind_udp(name_server, default_interface)?;
+    let mut buf = [0; 65536];
+    let message = query(&udp, &domain, name_server, QueryType::A, &mut buf)?;
+    let mut rs = Vec::new();
+    for record in message.answers {
+        if let RData::A(a) = record.data {
+            rs.push(a.0);
+        }
+    }
+    Ok(rs)
+}
+
+pub fn aaaa_dns(
+    domain: String,
+    name_server: String,
+    default_interface: &LocalInterface,
+) -> anyhow::Result<Vec<Ipv6Addr>> {
+    let name_server: SocketAddr = name_server.parse()?;
+    let udp = bind_udp(name_server, default_interface)?;
+    let mut buf = [0; 65536];
+    let message = query(&udp, &domain, name_server, QueryType::AAAA, &mut buf)?;
+    let mut rs = Vec::new();
+    for record in message.answers {
+        if let RData::AAAA(a) = record.data {
+            rs.push(a.0);
+        }
+    }
+    Ok(rs)
+}

vnt/src/util/limit/mod.rs

@@ -0,0 +1,5 @@
+mod rate_limiter;
+pub use rate_limiter::*;
+
+mod traffic_meter;
+pub use traffic_meter::*;

vnt/src/util/limit/rate_limiter.rs

@@ -0,0 +1,62 @@
+use parking_lot::Mutex;
+use std::sync::Arc;
+use std::time::Instant;
+
+#[derive(Clone)]
+pub struct ConcurrentRateLimiter {
+    inner: Arc<Mutex<RateLimiter>>,
+}
+
+impl ConcurrentRateLimiter {
+    pub fn new(capacity: usize, refill_rate: usize) -> Self {
+        let inner = RateLimiter::new(capacity, refill_rate);
+        Self {
+            inner: Arc::new(Mutex::new(inner)),
+        }
+    }
+    pub fn try_acquire(&self) -> bool {
+        self.inner.lock().try_acquire()
+    }
+}
+
+pub struct RateLimiter {
+    capacity: usize,
+    tokens: usize,
+    refill_rate: usize,
+    last_refill: Instant,
+}
+
+impl RateLimiter {
+    // 初始化限流器
+    pub fn new(capacity: usize, refill_rate: usize) -> Self {
+        Self {
+            capacity,
+            tokens: capacity,
+            refill_rate,
+            last_refill: Instant::now(),
+        }
+    }
+
+    // 尝试获取一个令牌
+    pub fn try_acquire(&mut self) -> bool {
+        self.refill();
+        if self.tokens > 0 {
+            self.tokens -= 1;
+            true
+        } else {
+            false
+        }
+    }
+
+    // 补充令牌
+    fn refill(&mut self) {
+        let now = Instant::now();
+        let elapsed = now.duration_since(self.last_refill).as_secs() as usize;
+        let new_tokens = elapsed * self.refill_rate;
+
+        if new_tokens > 0 {
+            self.tokens = std::cmp::min(self.capacity, self.tokens + new_tokens);
+            self.last_refill = now;
+        }
+    }
+}

vnt/src/util/limit/traffic_meter.rs

@@ -0,0 +1,132 @@
+use parking_lot::Mutex;
+use std::collections::{HashMap, VecDeque};
+use std::net::Ipv4Addr;
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+
+#[derive(Clone)]
+pub struct TrafficMeterMultiAddress {
+    history_capacity: usize,
+    inner: Arc<Mutex<(u64, HashMap<Ipv4Addr, TrafficMeter>)>>,
+}
+
+impl Default for TrafficMeterMultiAddress {
+    fn default() -> Self {
+        TrafficMeterMultiAddress::new(100)
+    }
+}
+
+impl TrafficMeterMultiAddress {
+    pub fn new(history_capacity: usize) -> Self {
+        let inner = Arc::new(Mutex::new((0, HashMap::new())));
+        Self {
+            inner,
+            history_capacity,
+        }
+    }
+    pub fn add_traffic(&self, ip: Ipv4Addr, amount: usize) {
+        let mut guard = self.inner.lock();
+        guard.0 += amount as u64;
+        guard
+            .1
+            .entry(ip)
+            .or_insert(TrafficMeter::new(self.history_capacity))
+            .add_traffic(amount)
+    }
+    pub fn total(&self) -> u64 {
+        self.inner.lock().0
+    }
+    pub fn get_all(&self) -> (u64, HashMap<Ipv4Addr, u64>) {
+        let guard = self.inner.lock();
+        (
+            guard.0,
+            guard.1.iter().map(|(ip, t)| (*ip, t.total())).collect(),
+        )
+    }
+    pub fn get_all_history(&self) -> (u64, HashMap<Ipv4Addr, (u64, Vec<usize>)>) {
+        let guard = self.inner.lock();
+        (
+            guard.0,
+            guard
+                .1
+                .iter()
+                .map(|(ip, t)| (*ip, (t.total(), t.get_history())))
+                .collect(),
+        )
+    }
+    pub fn get_history(&self, ip: &Ipv4Addr) -> Option<(u64, Vec<usize>)> {
+        self.inner
+            .lock()
+            .1
+            .get(ip)
+            .map(|t| (t.total(), t.get_history()))
+    }
+}
+
+#[derive(Clone)]
+pub struct ConcurrentTrafficMeter {
+    inner: Arc<Mutex<TrafficMeter>>,
+}
+
+impl ConcurrentTrafficMeter {
+    pub fn new(history_capacity: usize) -> Self {
+        let inner = Arc::new(Mutex::new(TrafficMeter::new(history_capacity)));
+        Self { inner }
+    }
+    pub fn add_traffic(&self, amount: usize) {
+        self.inner.lock().add_traffic(amount)
+    }
+    pub fn get_history(&self) -> Vec<usize> {
+        self.inner.lock().get_history()
+    }
+}
+
+pub struct TrafficMeter {
+    start_time: Instant,
+    total: u64,
+    count: usize,
+    history_capacity: usize,
+    history: VecDeque<usize>,
+}
+
+impl TrafficMeter {
+    // 初始化一个新的 TrafficMeter
+    pub fn new(history_capacity: usize) -> Self {
+        Self {
+            start_time: Instant::now(),
+            total: 0,
+            count: 0,
+            history: VecDeque::with_capacity(history_capacity),
+            history_capacity,
+        }
+    }
+
+    // 增加流量计数
+    pub fn add_traffic(&mut self, amount: usize) {
+        self.total += amount as u64;
+        self.count += amount;
+        self.check_time();
+    }
+
+    // 检查时间是否超过一秒，如果是，记录流量并重置计数器和时间
+    fn check_time(&mut self) {
+        if self.start_time.elapsed() >= Duration::new(1, 0) {
+            // 将当前计数添加到历史记录
+            if self.history.len() >= self.history_capacity {
+                self.history.pop_front(); // 保持历史记录不超过capacity
+            }
+            self.history.push_back(self.count);
+
+            // 重置计数器和时间
+            self.count = 0;
+            self.start_time = Instant::now();
+        }
+    }
+    pub fn total(&self) -> u64 {
+        self.total
+    }
+    // 获取流量记录
+    pub fn get_history(&self) -> Vec<usize> {
+        self.history.iter().cloned().collect()
+    }
+}

vnt/src/util/mod.rs

@@ -1,9 +1,17 @@
 mod notify;
-mod result_convert;
-pub use result_convert::io_convert;
 mod scheduler;
-pub use notify::StopManager;
+pub use notify::{StopManager, Worker};
 pub use scheduler::Scheduler;
 
-mod counter;
-pub use counter::*;
+// mod counter;
+// pub use counter::*;
+
+mod dns_query;
+pub use dns_query::*;
+
+#[cfg(feature = "upnp")]
+mod upnp;
+#[cfg(feature = "upnp")]
+pub use upnp::*;
+
+pub mod limit;

vnt/src/util/notify.rs

@@ -1,8 +1,10 @@
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::thread;
 use std::thread::Thread;
-use std::{io, thread};
+use std::time::Duration;
 
+use anyhow::anyhow;
 use parking_lot::Mutex;
 
 #[derive(Clone)]
@@ -19,20 +21,23 @@ impl StopManager {
             inner: Arc::new(StopManagerInner::new(f)),
         }
     }
-    pub fn add_listener<F>(&self, name: String, f: F) -> io::Result<Worker>
+    pub fn add_listener<F>(&self, name: String, f: F) -> anyhow::Result<Worker>
     where
         F: FnOnce() + Send + 'static,
     {
         self.inner.add_listener(name, f)
     }
     pub fn stop(&self) {
-        self.inner.stop("");
+        self.inner.stop();
     }
     pub fn wait(&self) {
         self.inner.wait();
     }
-    pub fn is_stop(&self) -> bool {
-        self.inner.state.load(Ordering::Acquire)
+    pub fn wait_timeout(&self, dur: Duration) -> bool {
+        self.inner.wait_timeout(dur)
+    }
+    pub fn is_stopped(&self) -> bool {
+        self.inner.is_stopped()
     }
 }
 
@@ -57,39 +62,36 @@ impl StopManagerInner {
             stop_call: Mutex::new(Some(Box::new(f))),
         }
     }
-    fn add_listener<F>(self: &Arc<Self>, name: String, f: F) -> io::Result<Worker>
+    fn add_listener<F>(self: &Arc<Self>, name: String, f: F) -> anyhow::Result<Worker>
     where
         F: FnOnce() + Send + 'static,
     {
         if name.is_empty() {
-            return Err(io::Error::new(io::ErrorKind::Other, "name cannot be empty"));
+            return Err(anyhow!("name cannot be empty"));
         }
         let mut guard = self.listeners.lock();
         if guard.0 {
-            return Err(io::Error::new(io::ErrorKind::Other, "stopped"));
+            return Err(anyhow!("stopped"));
         }
         for (n, _) in &guard.1 {
             if &name == n {
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("stop add_listener {:?} name already exists", name),
-                ));
+                return Err(anyhow!("stop add_listener {:?} name already exists", name));
             }
         }
         guard.1.push((name.clone(), Box::new(f)));
         Ok(Worker::new(name, self.clone()))
     }
-    fn stop(&self, skip_name: &str) {
+    fn stop(&self) {
         self.state.store(true, Ordering::Release);
         let mut guard = self.listeners.lock();
         guard.0 = true;
-        for (name, listener) in guard.1.drain(..) {
-            if &name == skip_name {
-                continue;
-            }
+        for (_name, listener) in guard.1.drain(..) {
             listener();
         }
     }
+    pub fn is_stopped(&self) -> bool {
+        self.worker_num.load(Ordering::Acquire) == 0
+    }
     fn wait(&self) {
         {
             let mut guard = self.park_threads.lock();
@@ -103,7 +105,20 @@ 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) {
+        self.stop();
         if let Some(call) = self.stop_call.lock().take() {
             call();
         }
@@ -122,6 +137,19 @@ impl Worker {
     }
     fn release0(&self) {
         let inner = &self.inner;
+        let worker_name = &self.name;
+        {
+            let mut mutex_guard = inner.listeners.lock();
+            if let Some(pos) = mutex_guard
+                .1
+                .iter()
+                .position(|(name, _)| name == worker_name)
+            {
+                let (_, listener) = mutex_guard.1.remove(pos);
+                listener();
+            }
+        }
+
         let count = inner.worker_num.fetch_sub(1, Ordering::AcqRel);
         if count == 1 {
             for x in inner.park_threads.lock().drain(..) {
@@ -131,7 +159,10 @@ impl Worker {
         }
     }
     pub fn stop_all(self) {
-        self.inner.stop(&self.name)
+        self.inner.stop()
+    }
+    pub fn stop_self(self) {
+        drop(self)
     }
 }
 

vnt/src/util/result_convert.rs

@@ -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)))
-}

vnt/src/util/scheduler.rs

@@ -1,8 +1,10 @@
 use crate::util::StopManager;
+use crossbeam_utils::atomic::AtomicCell;
 use std::collections::BinaryHeap;
+use std::sync::mpsc::TrySendError;
+use std::sync::Arc;
 use std::{
     cmp::Ordering,
-    io,
     sync::mpsc::{sync_channel, Receiver, SyncSender},
     time::{Duration, Instant},
 };
@@ -11,45 +13,62 @@ struct DelayedTask {
     f: Box<dyn FnOnce(&Scheduler) + Send>,
     next: Instant,
 }
+
 impl Eq for DelayedTask {}
+
 impl PartialEq for DelayedTask {
     fn eq(&self, other: &Self) -> bool {
         self.next.eq(&other.next)
     }
 }
+
 impl PartialOrd for DelayedTask {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
         self.next.partial_cmp(&other.next).map(|ord| ord.reverse())
     }
 }
+
 impl Ord for DelayedTask {
     fn cmp(&self, other: &Self) -> Ordering {
         self.next.cmp(&other.next).reverse()
     }
 }
+
 enum Op {
     Task(DelayedTask),
     Stop,
 }
+
 #[derive(Clone)]
 pub struct Scheduler {
     sender: SyncSender<Op>,
+    state: Arc<AtomicCell<SchedulerState>>,
 }
+
+#[derive(Copy, Clone, Eq, PartialEq)]
+enum SchedulerState {
+    Running,
+    ShutdownNow, // 立即停止任务执行，队列中剩余的任务不再执行
+    _Shutdown,   //执行完队列中剩余的任务再停止
+}
+
 impl Scheduler {
-    pub fn new(stop_manager: StopManager) -> io::Result<Self> {
+    pub fn new(stop_manager: StopManager) -> anyhow::Result<Self> {
         let (sender, receiver) = sync_channel::<Op>(32);
-        let s = Self { sender };
+        let state = Arc::new(AtomicCell::new(SchedulerState::Running));
+        let s = Self { sender, state };
         let s_inner = s.clone();
         let worker = {
             let scheduler = s.clone();
             stop_manager.add_listener("Scheduler".into(), move || {
-                scheduler.shutdown();
+                scheduler.shutdown_now();
             })?
         };
         std::thread::Builder::new()
             .name("Scheduler".into())
             .spawn(move || {
-                run(receiver, s_inner);
+                run(receiver, &s_inner);
+                s_inner.shutdown_now();
                 worker.stop_all();
             })
             .expect("Scheduler");
@@ -59,20 +78,44 @@ impl Scheduler {
     where
         F: FnOnce(&Scheduler) + Send + 'static,
     {
+        if self.state.load() != SchedulerState::Running {
+            log::error!("定时任务执行停止");
+            return false;
+        }
         let task = DelayedTask {
             f: Box::new(f),
             next: Instant::now().checked_add(time).unwrap(),
         };
-        self.sender.send(Op::Task(task)).is_ok()
+        // 如果是任务中调用此方法，那这里用send可能会导致整个定时任务阻塞
+        // 任务总数不能大于或等于通道长度，所以改成try_send快速失败
+        match self.sender.try_send(Op::Task(task)) {
+            Ok(_) => true,
+            Err(e) => {
+                match e {
+                    TrySendError::Full(_) => {
+                        log::error!("定时任务队列达到上限");
+                    }
+                    TrySendError::Disconnected(_) => {
+                        log::error!("定时任务执行停止 通道关闭");
+                    }
+                }
+                false
+            }
+        }
     }
-    pub fn shutdown(self) {
+    pub fn shutdown_now(&self) {
+        self.state.store(SchedulerState::ShutdownNow);
         let _ = self.sender.send(Op::Stop);
     }
 }
-fn run(receiver: Receiver<Op>, s_inner: Scheduler) {
+
+fn run(receiver: Receiver<Op>, s_inner: &Scheduler) {
     let mut binary_heap = BinaryHeap::<DelayedTask>::with_capacity(32);
     loop {
         while let Some(task) = binary_heap.peek() {
+            if s_inner.state.load() == SchedulerState::ShutdownNow {
+                return;
+            }
             let now = Instant::now();
             if now < task.next {
                 //需要等待对应时间
@@ -90,7 +133,7 @@ fn run(receiver: Receiver<Op>, s_inner: Scheduler) {
                 }
             } else {
                 if let Some(task) = binary_heap.pop() {
-                    (task.f)(&s_inner);
+                    (task.f)(s_inner);
                 }
             }
         }
@@ -121,6 +164,7 @@ fn run(receiver: Receiver<Op>, s_inner: Scheduler) {
         }
     }
 }
+
 fn add_task(op: Op, binary_heap: &mut BinaryHeap<DelayedTask>) -> bool {
     return match op {
         Op::Task(task) => {

vnt/src/util/upnp.rs

@@ -0,0 +1,81 @@
+use igd::{search_gateway, PortMappingProtocol};
+use std::net::{Ipv4Addr, SocketAddrV4};
+use std::ops::Deref;
+use std::sync::Arc;
+
+use parking_lot::Mutex;
+
+#[derive(Clone, Default)]
+pub struct UPnP {
+    inner: Arc<UpnpInner>,
+}
+
+impl Deref for UPnP {
+    type Target = UpnpInner;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+#[derive(Default)]
+pub struct UpnpInner {
+    list: Mutex<Vec<(PortMappingProtocol, u16)>>,
+}
+
+impl UpnpInner {
+    pub fn add_tcp_port(&self, port: u16) {
+        self.list.lock().push((PortMappingProtocol::TCP, port));
+    }
+    pub fn add_udp_port(&self, port: u16) {
+        self.list.lock().push((PortMappingProtocol::UDP, port));
+    }
+    pub fn reset(&self, local_ip: Ipv4Addr) {
+        let gateway = match search_gateway(Default::default()) {
+            Ok(gateway) => gateway,
+            Err(e) => {
+                log::warn!("search_gateway {:?}", e);
+                return;
+            }
+        };
+        let guard = self.list.lock();
+
+        // 不支持upnp的情况会阻塞30秒，之后再改这个库
+        for (protocol, port) in guard.iter() {
+            let local_addr = SocketAddrV4::new(local_ip, *port);
+            log::info!("add upnp protocol={} {}", protocol, local_addr);
+            if let Err(e) = gateway.add_port(*protocol, *port, local_addr, 700, "upnp") {
+                log::warn!(
+                    "add upnp failed protocol={},port={} err:{:?}",
+                    protocol,
+                    port,
+                    e
+                );
+            }
+        }
+    }
+}
+
+impl Drop for UpnpInner {
+    fn drop(&mut self) {
+        // let gateway = match search_gateway(Default::default()) {
+        //     Ok(gateway) => gateway,
+        //     Err(e) => {
+        //         log::warn!("search_gateway {:?}", e);
+        //         return;
+        //     }
+        // };
+        //
+        // let guard = self.list.lock();
+        // for (protocol, port) in guard.iter() {
+        //     if let Err(e) = gateway.remove_port(*protocol, *port) {
+        //         log::warn!(
+        //             "remove upnp failed protocol={},port={} err:{:?}",
+        //             protocol,
+        //             port,
+        //             e
+        //         );
+        //     }
+        // }
+    }
+}

vnt/tun/Cargo.toml

@@ -1,32 +0,0 @@
-[package]
-name = "tun"
-version = "0.1.0"
-edition = "2021"
-
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-libc = "0.2.153"
-
-log = { version = "0.4.20", features = [] }
-rand = "0.8.5"
-
-[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
-ioctl = { version = "0.8", package = "ioctl-sys" }
-
-[target.'cfg(target_os = "windows")'.dependencies]
-libloading = "0.8.0"
-widestring = "1.0.2"
-winapi = {version = "0.3",features = [
-    "errhandlingapi",
-    "combaseapi",
-    "ioapiset",
-    "winioctl",
-    "setupapi",
-    "synchapi",
-    "netioapi",
-    "fileapi","handleapi","winerror","minwindef","ifdef","basetsd","winnt","winreg","winbase","minwinbase",
-    "impl-default"
-]}
-

vnt/tun/src/android/mod.rs

@@ -1,56 +0,0 @@
-use crate::device::IFace;
-use crate::Fd;
-use std::io;
-use std::net::Ipv4Addr;
-use std::os::fd::RawFd;
-
-pub struct Device {
-    fd: Fd,
-}
-
-impl Device {
-    pub fn new(fd: RawFd) -> io::Result<Self> {
-        Ok(Self { fd: Fd::new(fd)? })
-    }
-}
-impl IFace for Device {
-    fn version(&self) -> io::Result<String> {
-        Ok(String::new())
-    }
-
-    fn name(&self) -> io::Result<String> {
-        Ok(String::new())
-    }
-
-    fn shutdown(&self) -> io::Result<()> {
-        Err(io::Error::from(io::ErrorKind::Unsupported))
-    }
-
-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> io::Result<()> {
-        Err(io::Error::from(io::ErrorKind::Unsupported))
-    }
-
-    fn mtu(&self) -> io::Result<u32> {
-        Err(io::Error::from(io::ErrorKind::Unsupported))
-    }
-
-    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<()> {
-        Err(io::Error::from(io::ErrorKind::Unsupported))
-    }
-
-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-        Err(io::Error::from(io::ErrorKind::Unsupported))
-    }
-
-    fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.fd.read(buf)
-    }
-
-    fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        self.fd.write(buf)
-    }
-}

vnt/tun/src/device.rs

@@ -1,24 +0,0 @@
-use io::Result;
-use std::io;
-use std::net::Ipv4Addr;
-
-pub trait IFace {
-    fn version(&self) -> Result<String>;
-    /// Get the device name.
-    fn name(&self) -> Result<String>;
-
-    fn shutdown(&self) -> Result<()>;
-
-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> Result<()>;
-
-    /// Get the MTU.
-    fn mtu(&self) -> Result<u32>;
-
-    /// Set the MTU.
-    fn set_mtu(&self, value: u32) -> Result<()>;
-    fn add_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr, metric: u16) -> Result<()>;
-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> Result<()>;
-
-    fn read(&self, buf: &mut [u8]) -> Result<usize>;
-    fn write(&self, buf: &[u8]) -> Result<usize>;
-}

vnt/tun/src/lib.rs

@@ -1,31 +0,0 @@
-/// 参考
-/// https://github.com/meh/rust-tun
-/// https://github.com/Tazdevil971/tap-windows
-/// https://github.com/nulldotblack/wintun
-pub mod device;
-mod packet;
-
-#[cfg(target_os = "linux")]
-mod linux;
-#[cfg(target_os = "linux")]
-pub use linux::Device;
-
-#[cfg(target_os = "android")]
-mod android;
-#[cfg(target_os = "android")]
-pub use android::Device;
-
-#[cfg(target_os = "macos")]
-mod macos;
-#[cfg(target_os = "macos")]
-pub use macos::Device;
-
-#[cfg(unix)]
-mod unix;
-#[cfg(unix)]
-pub use unix::Fd;
-#[cfg(windows)]
-mod windows;
-
-#[cfg(windows)]
-pub use windows::Device;

vnt/tun/src/linux/device.rs

@@ -1,307 +0,0 @@
-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,
-    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> {
-        let device = unsafe {
-            let dev = match name {
-                Some(name) => {
-                    let name =
-                        CString::new(name).map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
-
-                    if name.as_bytes_with_nul().len() > IFNAMSIZ {
-                        return Err(io::Error::new(io::ErrorKind::InvalidInput, "name too long"));
-                    }
-
-                    Some(name)
-                }
-
-                None => None,
-            };
-
-            let mut req: ifreq = mem::zeroed();
-
-            if let Some(dev) = dev.as_ref() {
-                ptr::copy_nonoverlapping(
-                    dev.as_ptr() as *const c_char,
-                    req.ifr_name.as_mut_ptr(),
-                    dev.as_bytes().len(),
-                );
-            }
-
-            let device_type: c_short = if tap { IFF_TAP } else { IFF_TUN } as c_short;
-
-            let queues_num = 1;
-
-            let iff_no_pi = IFF_NO_PI as c_short;
-            let iff_multi_queue = IFF_MULTI_QUEUE as c_short;
-            let packet_information = false;
-            req.ifr_ifru.ifru_flags = device_type
-                | if packet_information { 0 } else { iff_no_pi }
-                | if queues_num > 1 { iff_multi_queue } else { 0 };
-
-            let tun = Fd::new(libc::open(b"/dev/net/tun\0".as_ptr() as *const _, O_RDWR))
-                .map_err(|_| io::Error::last_os_error())?;
-
-            if tunsetiff(tun.0, &mut req as *mut _ as *mut _) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            let ctl = Fd::new(libc::socket(AF_INET, SOCK_DGRAM, 0))?;
-
-            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,
-            }
-        };
-        device.enabled(true)?;
-        Ok(device)
-    }
-}
-
-impl Device {
-    fn enabled(&self, value: bool) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifflags(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            if value {
-                req.ifr_ifru.ifru_flags |= (IFF_UP | IFF_RUNNING) as c_short;
-            } else {
-                req.ifr_ifru.ifru_flags &= !(IFF_UP as c_short);
-            }
-
-            if siocsifflags(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-    unsafe fn request(&self) -> ifreq {
-        let mut req: ifreq = mem::zeroed();
-        ptr::copy_nonoverlapping(
-            self.name.as_ptr() as *const c_char,
-            req.ifr_name.as_mut_ptr(),
-            self.name.len(),
-        );
-        req
-    }
-    fn address(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifaddr(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error().into());
-            }
-
-            SockAddr::new(&req.ifr_ifru.ifru_addr).map(Into::into)
-        }
-    }
-
-    fn set_address(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifr_ifru.ifru_addr = SockAddr::from(value).into();
-
-            if siocsifaddr(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn destination(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifdstaddr(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            SockAddr::new(&req.ifr_ifru.ifru_dstaddr).map(Into::into)
-        }
-    }
-
-    fn set_destination(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifr_ifru.ifru_dstaddr = SockAddr::from(value).into();
-
-            if siocsifdstaddr(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn broadcast(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifbrdaddr(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            SockAddr::new(&req.ifr_ifru.ifru_broadaddr).map(Into::into)
-        }
-    }
-
-    fn set_broadcast(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifr_ifru.ifru_broadaddr = SockAddr::from(value).into();
-
-            if siocsifbrdaddr(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn netmask(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifnetmask(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            SockAddr::new(&req.ifr_ifru.ifru_netmask).map(Into::into)
-        }
-    }
-
-    fn set_netmask(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifr_ifru.ifru_netmask = SockAddr::from(value).into();
-
-            if siocsifnetmask(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-}
-
-impl IFace for Device {
-    fn version(&self) -> io::Result<String> {
-        Ok(String::new())
-    }
-
-    fn name(&self) -> io::Result<String> {
-        Ok(self.name.clone())
-    }
-
-    fn shutdown(&self) -> io::Result<()> {
-        exe_cmd(&format!("ip link delete {}", self.name))?;
-        Ok(())
-    }
-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> io::Result<()> {
-        self.set_address(address)?;
-        self.set_netmask(mask)
-    }
-
-    fn mtu(&self) -> io::Result<u32> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifmtu(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(req.ifr_ifru.ifru_mtu as u32)
-        }
-    }
-
-    fn set_mtu(&self, value: u32) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifr_ifru.ifru_mtu = value as _;
-
-            if siocsifmtu(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn add_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr, _metric: u16) -> io::Result<()> {
-        route::add_route(&self.name, dest, netmask)
-    }
-
-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-        route::del_route(&self.name, dest, netmask)
-    }
-
-    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)
-        }
-    }
-
-    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)
-        }
-    }
-}

vnt/tun/src/linux/mod.rs

@@ -1,4 +0,0 @@
-mod device;
-pub use device::Device;
-mod route;
-mod sys;

vnt/tun/src/linux/route.rs

@@ -1,16 +0,0 @@
-use std::io;
-use std::net::Ipv4Addr;
-
-use crate::unix::exe_cmd;
-
-pub fn add_route(name: &str, address: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-    let cmd = format!("ip route add {:?}/{:?} dev {}", address, netmask, name);
-    exe_cmd(&cmd)?;
-    Ok(())
-}
-
-pub fn del_route(name: &str, address: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-    let cmd = format!("ip route del {:?}/{:?} dev {}", address, netmask, name);
-    exe_cmd(&cmd)?;
-    Ok(())
-}

vnt/tun/src/linux/sys.rs

@@ -1,21 +0,0 @@
-use ioctl::*;
-use libc::{c_int, ifreq};
-
-ioctl!(bad read siocgifflags with 0x8913; ifreq);
-ioctl!(bad write siocsifflags with 0x8914; ifreq);
-ioctl!(bad read siocgifaddr with 0x8915; ifreq);
-ioctl!(bad write siocsifaddr with 0x8916; ifreq);
-ioctl!(bad read siocgifdstaddr with 0x8917; ifreq);
-ioctl!(bad write siocsifdstaddr with 0x8918; ifreq);
-ioctl!(bad read siocgifbrdaddr with 0x8919; ifreq);
-ioctl!(bad write siocsifbrdaddr with 0x891a; ifreq);
-ioctl!(bad read siocgifnetmask with 0x891b; ifreq);
-ioctl!(bad write siocsifnetmask with 0x891c; ifreq);
-ioctl!(bad read siocgifmtu with 0x8921; ifreq);
-ioctl!(bad write siocsifmtu with 0x8922; ifreq);
-ioctl!(bad write siocsifname with 0x8923; ifreq);
-
-ioctl!(write tunsetiff with b'T', 202; c_int);
-ioctl!(write tunsetpersist with b'T', 203; c_int);
-ioctl!(write tunsetowner with b'T', 204; c_int);
-ioctl!(write tunsetgroup with b'T', 206; c_int);

vnt/tun/src/macos/device.rs

@@ -1,291 +0,0 @@
-use std::ffi::{c_void, CStr};
-use std::net::Ipv4Addr;
-use std::os::fd::AsRawFd;
-use std::{io, mem, ptr};
-
-use libc::{
-    c_char, c_short, c_uint, sockaddr, socklen_t, AF_INET, AF_SYSTEM, AF_SYS_CONTROL, IFF_RUNNING,
-    IFF_UP, IFNAMSIZ, PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL, UTUN_OPT_IFNAME,
-};
-
-use crate::device::IFace;
-use crate::macos::route;
-use crate::macos::sys::*;
-use crate::unix::{Fd, SockAddr};
-
-pub struct Device {
-    name: String,
-    ctl: Fd,
-    tun: Fd,
-}
-
-impl Device {
-    pub fn new(name: Option<String>) -> io::Result<Self> {
-        let id = if let Some(name) = name {
-            if name.len() > IFNAMSIZ {
-                return Err(io::Error::new(io::ErrorKind::InvalidInput, "name too long"));
-            }
-
-            if !name.starts_with("utun") {
-                return Err(io::Error::new(io::ErrorKind::InvalidInput, "invalid name"));
-            }
-
-            name[4..]
-                .parse::<u32>()
-                .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?
-                + 1u32
-        } else {
-            0u32
-        };
-        let device = unsafe {
-            let tun = Fd::new(libc::socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL))?;
-
-            let mut info = ctl_info {
-                ctl_id: 0,
-                ctl_name: {
-                    let mut buffer = [0; 96];
-                    for (i, o) in UTUN_CONTROL_NAME.as_bytes().iter().zip(buffer.iter_mut()) {
-                        *o = *i as _;
-                    }
-                    buffer
-                },
-            };
-
-            if ctliocginfo(tun.0, &mut info as *mut _ as *mut _) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            let addr = sockaddr_ctl {
-                sc_id: info.ctl_id,
-                sc_len: mem::size_of::<sockaddr_ctl>() as _,
-                sc_family: AF_SYSTEM as _,
-                ss_sysaddr: AF_SYS_CONTROL as _,
-                sc_unit: id as c_uint,
-                sc_reserved: [0; 5],
-            };
-
-            let address = &addr as *const sockaddr_ctl as *const sockaddr;
-            if libc::connect(tun.0, address, mem::size_of_val(&addr) as socklen_t) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            let mut name = [0u8; 64];
-            let mut name_len: socklen_t = 64;
-
-            let optval = &mut name as *mut _ as *mut c_void;
-            let optlen = &mut name_len as *mut socklen_t;
-            if libc::getsockopt(tun.0, SYSPROTO_CONTROL, UTUN_OPT_IFNAME, optval, optlen) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            let ctl = Fd::new(libc::socket(AF_INET, SOCK_DGRAM, 0))?;
-
-            Device {
-                name: CStr::from_ptr(name.as_ptr() as *const c_char)
-                    .to_string_lossy()
-                    .into(),
-                tun,
-                ctl,
-            }
-        };
-        device.enabled(true)?;
-        Ok(device)
-    }
-}
-
-impl Device {
-    fn enabled(&self, value: bool) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifflags(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            if value {
-                req.ifru.flags |= (IFF_UP | IFF_RUNNING) as c_short;
-            } else {
-                req.ifru.flags &= !(IFF_UP as c_short);
-            }
-
-            if siocsifflags(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-    unsafe fn request(&self) -> ifreq {
-        let mut req: ifreq = mem::zeroed();
-        ptr::copy_nonoverlapping(
-            self.name.as_ptr() as *const c_char,
-            req.ifrn.name.as_mut_ptr(),
-            self.name.len(),
-        );
-        req
-    }
-    fn address(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifaddr(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            SockAddr::new(&req.ifru.addr).map(Into::into)
-        }
-    }
-
-    fn set_address(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifru.addr = SockAddr::from(value).into();
-
-            if siocsifaddr(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn destination(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifdstaddr(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            SockAddr::new(&req.ifru.dstaddr).map(Into::into)
-        }
-    }
-
-    fn set_destination(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifru.dstaddr = SockAddr::from(value).into();
-
-            if siocsifdstaddr(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn broadcast(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifbrdaddr(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            SockAddr::new(&req.ifru.broadaddr).map(Into::into)
-        }
-    }
-
-    fn set_broadcast(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifru.broadaddr = SockAddr::from(value).into();
-
-            if siocsifbrdaddr(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn netmask(&self) -> io::Result<Ipv4Addr> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifnetmask(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            SockAddr::unchecked(&req.ifru.addr).map(Into::into)
-        }
-    }
-
-    fn set_netmask(&self, value: Ipv4Addr) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifru.addr = SockAddr::from(value).into();
-
-            if siocsifnetmask(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-}
-
-impl IFace for Device {
-    fn version(&self) -> io::Result<String> {
-        Ok(String::new())
-    }
-
-    fn name(&self) -> io::Result<String> {
-        Ok(self.name.clone())
-    }
-
-    fn shutdown(&self) -> io::Result<()> {
-        Ok(())
-    }
-
-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> io::Result<()> {
-        self.set_address(address)?;
-        self.set_netmask(mask)
-    }
-
-    fn mtu(&self) -> io::Result<u32> {
-        unsafe {
-            let mut req = self.request();
-
-            if siocgifmtu(self.ctl.as_raw_fd(), &mut req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(req.ifru.mtu as _)
-        }
-    }
-
-    fn set_mtu(&self, value: u32) -> io::Result<()> {
-        unsafe {
-            let mut req = self.request();
-            req.ifru.mtu = value as _;
-
-            if siocsifmtu(self.ctl.as_raw_fd(), &req) < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(())
-        }
-    }
-
-    fn add_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr, _metric: u16) -> io::Result<()> {
-        route::add_route(&self.name, dest, netmask)
-    }
-
-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-        route::del_route(&self.name, dest, netmask)
-    }
-
-    fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        self.tun.read(buf)
-    }
-
-    fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        let mut packet = Vec::<u8>::with_capacity(4 + buf.len());
-        packet.push(0);
-        packet.push(0);
-        packet.extend_from_slice(&(libc::PF_INET as u16).to_be_bytes());
-        packet.extend_from_slice(buf);
-        self.tun.write(&packet)
-    }
-}

vnt/tun/src/macos/mod.rs

@@ -1,5 +0,0 @@
-mod device;
-pub use device::Device;
-mod sys;
-
-mod route;

vnt/tun/src/macos/route.rs

@@ -1,20 +0,0 @@
-use crate::unix::exe_cmd;
-use std::io;
-use std::net::Ipv4Addr;
-
-pub fn add_route(name: &str, address: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-    let cmd = format!(
-        "route -n add {} -netmask {} -interface {}",
-        address, netmask, name
-    );
-    exe_cmd(&cmd)?;
-    Ok(())
-}
-pub fn del_route(name: &str, address: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-    let cmd = format!(
-        "route -n delete {} -netmask {} -interface {}",
-        address, netmask, name
-    );
-    exe_cmd(&cmd)?;
-    Ok(())
-}

vnt/tun/src/macos/sys.rs

@@ -1,119 +0,0 @@
-//! Bindings to internal macOS stuff.
-
-use ioctl::*;
-use libc::{c_char, c_int, c_short, c_uint, c_ushort, c_void, sockaddr, IFNAMSIZ};
-
-pub const UTUN_CONTROL_NAME: &str = "com.apple.net.utun_control";
-
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct ctl_info {
-    pub ctl_id: c_uint,
-    pub ctl_name: [c_char; 96],
-}
-
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct sockaddr_ctl {
-    pub sc_len: c_char,
-    pub sc_family: c_char,
-    pub ss_sysaddr: c_ushort,
-    pub sc_id: c_uint,
-    pub sc_unit: c_uint,
-    pub sc_reserved: [c_uint; 5],
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union ifrn {
-    pub name: [c_char; IFNAMSIZ],
-}
-
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct ifdevmtu {
-    pub current: c_int,
-    pub min: c_int,
-    pub max: c_int,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union ifku {
-    pub ptr: *mut c_void,
-    pub value: c_int,
-}
-
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct ifkpi {
-    pub module_id: c_uint,
-    pub type_: c_uint,
-    pub ifku: ifku,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union ifru {
-    pub addr: sockaddr,
-    pub dstaddr: sockaddr,
-    pub broadaddr: sockaddr,
-
-    pub flags: c_short,
-    pub metric: c_int,
-    pub mtu: c_int,
-    pub phys: c_int,
-    pub media: c_int,
-    pub intval: c_int,
-    pub data: *mut c_void,
-    pub devmtu: ifdevmtu,
-    pub wake_flags: c_uint,
-    pub route_refcnt: c_uint,
-    pub cap: [c_int; 2],
-    pub functional_type: c_uint,
-}
-
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct ifreq {
-    pub ifrn: ifrn,
-    pub ifru: ifru,
-}
-
-#[allow(non_camel_case_types)]
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub struct ifaliasreq {
-    pub ifran: [c_char; IFNAMSIZ],
-    pub addr: sockaddr,
-    pub broadaddr: sockaddr,
-    pub mask: sockaddr,
-}
-
-ioctl!(readwrite ctliocginfo with 'N', 3; ctl_info);
-
-ioctl!(write siocsifflags with 'i', 16; ifreq);
-ioctl!(readwrite siocgifflags with 'i', 17; ifreq);
-
-ioctl!(write siocsifaddr with 'i', 12; ifreq);
-ioctl!(readwrite siocgifaddr with 'i', 33; ifreq);
-
-ioctl!(write siocsifdstaddr with 'i', 14; ifreq);
-ioctl!(readwrite siocgifdstaddr with 'i', 34; ifreq);
-
-ioctl!(write siocsifbrdaddr with 'i', 19; ifreq);
-ioctl!(readwrite siocgifbrdaddr with 'i', 35; ifreq);
-
-ioctl!(write siocsifnetmask with 'i', 22; ifreq);
-ioctl!(readwrite siocgifnetmask with 'i', 37; ifreq);
-
-ioctl!(write siocsifmtu with 'i', 52; ifreq);
-ioctl!(readwrite siocgifmtu with 'i', 51; ifreq);
-
-ioctl!(write siocaifaddr with 'i', 26; ifaliasreq);
-ioctl!(write siocdifaddr with 'i', 25; ifreq);

vnt/tun/src/packet/arp/mod.rs

@@ -1 +0,0 @@
-pub mod packet;

vnt/tun/src/packet/arp/packet.rs

@@ -1,122 +0,0 @@
-use std::{fmt, io};
-
-/// 地址解析协议，由IP地址找到MAC地址
-/// https://www.ietf.org/rfc/rfc6747.txt
-/*
-  0      2       4         5          6      8      10  (字节)
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- | 硬件类型|协议类型|硬件地址长度|协议地址长度|操作类型|
- |          源MAC地址                  |    源ip地址    |
- |          目的MAC地址                 |   目的ip地址   |
-*/
-
-pub struct ArpPacket<B> {
-    buffer: B,
-}
-
-impl<B: AsRef<[u8]>> ArpPacket<B> {
-    pub fn unchecked(buffer: B) -> Self {
-        Self { buffer }
-    }
-    pub fn new(buffer: B) -> io::Result<Self> {
-        if buffer.as_ref().len() != 28 {
-            Err(io::Error::from(io::ErrorKind::InvalidData))?;
-        }
-        let packet = Self::unchecked(buffer);
-        Ok(packet)
-    }
-}
-
-impl<B: AsRef<[u8]>> ArpPacket<B> {
-    /// 硬件类型 以太网类型为1
-    pub fn hardware_type(&self) -> u16 {
-        u16::from_be_bytes(self.buffer.as_ref()[0..2].try_into().unwrap())
-    }
-    /// 上层协议类型,ipv4是0x0800
-    pub fn protocol_type(&self) -> u16 {
-        u16::from_be_bytes(self.buffer.as_ref()[2..4].try_into().unwrap())
-    }
-    /// 如果是MAC地址 则长度为6
-    pub fn hardware_size(&self) -> u8 {
-        self.buffer.as_ref()[4]
-    }
-    /// 如果是IPv4 则长度为4
-    pub fn protocol_size(&self) -> u8 {
-        self.buffer.as_ref()[5]
-    }
-    /// 操作类型，请求和响应 1：ARP请求，2：ARP响应，3：RARP请求，4：RARP响应
-    pub fn op_code(&self) -> u16 {
-        u16::from_be_bytes(self.buffer.as_ref()[6..8].try_into().unwrap())
-    }
-    /// 发送端硬件地址，仅支持以太网
-    pub fn sender_hardware_addr(&self) -> &[u8] {
-        &self.buffer.as_ref()[8..14]
-    }
-    /// 发送端协议地址，仅支持IPv4
-    pub fn sender_protocol_addr(&self) -> &[u8] {
-        &self.buffer.as_ref()[14..18]
-    }
-    /// 接收端硬件地址，仅支持以太网
-    pub fn target_hardware_addr(&self) -> &[u8] {
-        &self.buffer.as_ref()[18..24]
-    }
-    /// 接收端协议地址，仅支持IPv4
-    pub fn target_protocol_addr(&self) -> &[u8] {
-        &self.buffer.as_ref()[24..28]
-    }
-}
-
-impl<B: AsRef<[u8]> + AsMut<[u8]>> ArpPacket<B> {
-    /// 硬件类型 以太网类型为1
-    pub fn set_hardware_type(&mut self, value: u16) {
-        self.buffer.as_mut()[0..2].copy_from_slice(&value.to_be_bytes())
-    }
-    /// 上层协议类型,ipv4是0x0800
-    pub fn set_protocol_type(&mut self, value: u16) {
-        self.buffer.as_mut()[2..4].copy_from_slice(&value.to_be_bytes())
-    }
-    /// 如果是MAC地址 则长度为6
-    pub fn set_hardware_size(&mut self, value: u8) {
-        self.buffer.as_mut()[4] = value
-    }
-    /// 如果是IPv4 则长度为4
-    pub fn set_protocol_size(&mut self, value: u8) {
-        self.buffer.as_mut()[5] = value
-    }
-    /// 操作类型，请求和响应 1：ARP请求，2：ARP响应，3：RARP请求，4：RARP响应
-    pub fn set_op_code(&mut self, value: u16) {
-        self.buffer.as_mut()[6..8].copy_from_slice(&value.to_be_bytes())
-    }
-    /// 发送端硬件地址，仅支持以太网
-    pub fn set_sender_hardware_addr(&mut self, buf: &[u8]) {
-        self.buffer.as_mut()[8..14].copy_from_slice(buf)
-    }
-    /// 发送端协议地址，仅支持IPv4
-    pub fn set_sender_protocol_addr(&mut self, buf: &[u8]) {
-        self.buffer.as_mut()[14..18].copy_from_slice(buf)
-    }
-    /// 接收端硬件地址，仅支持以太网
-    pub fn set_target_hardware_addr(&mut self, buf: &[u8]) {
-        self.buffer.as_mut()[18..24].copy_from_slice(buf)
-    }
-    /// 接收端协议地址，仅支持IPv4
-    pub fn set_target_protocol_addr(&mut self, buf: &[u8]) {
-        self.buffer.as_mut()[24..28].copy_from_slice(buf)
-    }
-}
-
-impl<B: AsRef<[u8]>> fmt::Debug for ArpPacket<B> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("ArpPacket")
-            .field("hardware_type", &self.hardware_type())
-            .field("protocol_type", &self.protocol_type())
-            .field("hardware_size", &self.hardware_size())
-            .field("protocol_size", &self.protocol_size())
-            .field("op_code", &self.op_code())
-            .field("sender_hardware_addr", &self.sender_hardware_addr())
-            .field("sender_protocol_addr", &self.sender_protocol_addr())
-            .field("target_hardware_addr", &self.target_hardware_addr())
-            .field("target_protocol_addr", &self.target_protocol_addr())
-            .finish()
-    }
-}

vnt/tun/src/packet/ethernet/mod.rs

@@ -1,2 +0,0 @@
-pub mod packet;
-pub mod protocol;

vnt/tun/src/packet/ethernet/packet.rs

@@ -1,77 +0,0 @@
-use crate::packet::ethernet::protocol::Protocol;
-use std::{fmt, io};
-
-/// 以太网帧协议
-/// https://www.ietf.org/rfc/rfc894.txt
-/*
-  0                      6                      12    14 (字节)
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |        目的地址         |         源地址         | 类型 |
-*/
-pub struct EthernetPacket<B> {
-    pub buffer: B,
-}
-
-impl<B: AsRef<[u8]>> EthernetPacket<B> {
-    pub fn unchecked(buffer: B) -> EthernetPacket<B> {
-        EthernetPacket { buffer }
-    }
-
-    pub fn new(buffer: B) -> io::Result<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())))?;
-        }
-
-        Ok(packet)
-    }
-}
-
-impl<B: AsRef<[u8]>> EthernetPacket<B> {
-    /// 目的MAC地址
-    pub fn destination(&self) -> &[u8] {
-        &self.buffer.as_ref()[0..6]
-    }
-    /// 源MAC地址
-    pub fn source(&self) -> &[u8] {
-        &self.buffer.as_ref()[6..12]
-    }
-    /// 3层协议
-    pub fn protocol(&self) -> Protocol {
-        u16::from_be_bytes(self.buffer.as_ref()[12..14].try_into().unwrap()).into()
-    }
-    /// 载荷
-    pub fn payload(&self) -> &[u8] {
-        &self.buffer.as_ref()[14..]
-    }
-}
-
-impl<B: AsRef<[u8]> + AsMut<[u8]>> EthernetPacket<B> {
-    pub fn set_destination(&mut self, value: &[u8]) {
-        self.buffer.as_mut()[0..6].copy_from_slice(value);
-    }
-
-    pub fn set_source(&mut self, value: &[u8]) {
-        self.buffer.as_mut()[6..12].copy_from_slice(value);
-    }
-
-    pub fn set_protocol(&mut self, value: Protocol) {
-        let p: u16 = value.into();
-        self.buffer.as_mut()[12..14].copy_from_slice(&p.to_be_bytes())
-    }
-    pub fn payload_mut(&mut self) -> &mut [u8] {
-        &mut self.buffer.as_mut()[14..]
-    }
-}
-
-impl<B: AsRef<[u8]>> fmt::Debug for EthernetPacket<B> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("EthernetPacket")
-            .field("destination", &self.destination())
-            .field("source", &self.source())
-            .field("protocol", &self.protocol())
-            .field("payload", &self.payload())
-            .finish()
-    }
-}

vnt/tun/src/packet/ethernet/protocol.rs

@@ -1,141 +0,0 @@
-/// 以太网帧协议
-#[derive(Eq, PartialEq, Copy, Clone, Debug)]
-pub enum Protocol {
-    ///
-    Ipv4,
-
-    ///
-    Arp,
-
-    ///
-    WakeOnLan,
-
-    ///
-    Trill,
-
-    ///
-    DecNet,
-
-    ///
-    Rarp,
-
-    ///
-    AppleTalk,
-
-    ///
-    Aarp,
-
-    ///
-    Ipx,
-
-    ///
-    Qnx,
-
-    ///
-    Ipv6,
-
-    ///
-    FlowControl,
-
-    ///
-    CobraNet,
-
-    ///
-    Mpls,
-
-    ///
-    MplsMulticast,
-
-    ///
-    PppoeDiscovery,
-
-    ///
-    PppoeSession,
-
-    ///
-    Vlan,
-
-    ///
-    PBridge,
-
-    ///
-    Lldp,
-
-    ///
-    Ptp,
-
-    ///
-    Cfm,
-
-    ///
-    QinQ,
-
-    ///
-    Unknown(u16),
-}
-
-impl From<u16> for Protocol {
-    fn from(value: u16) -> Protocol {
-        use self::Protocol::*;
-
-        match value {
-            0x0800 => Ipv4,
-            0x0806 => Arp,
-            0x0842 => WakeOnLan,
-            0x22f3 => Trill,
-            0x6003 => DecNet,
-            0x8035 => Rarp,
-            0x809b => AppleTalk,
-            0x80f3 => Aarp,
-            0x8137 => Ipx,
-            0x8204 => Qnx,
-            0x86dd => Ipv6,
-            0x8808 => FlowControl,
-            0x8819 => CobraNet,
-            0x8847 => Mpls,
-            0x8848 => MplsMulticast,
-            0x8863 => PppoeDiscovery,
-            0x8864 => PppoeSession,
-            0x8100 => Vlan,
-            0x88a8 => PBridge,
-            0x88cc => Lldp,
-            0x88f7 => Ptp,
-            0x8902 => Cfm,
-            0x9100 => QinQ,
-            n => Unknown(n),
-        }
-    }
-}
-
-impl Into<u16> for Protocol {
-    fn into(self) -> u16 {
-        use self::Protocol::*;
-
-        match self {
-            Ipv4 => 0x0800,
-            Arp => 0x0806,
-            WakeOnLan => 0x0842,
-            Trill => 0x22f3,
-            DecNet => 0x6003,
-            Rarp => 0x8035,
-            AppleTalk => 0x809b,
-            Aarp => 0x80f3,
-            Ipx => 0x8137,
-            Qnx => 0x8204,
-            Ipv6 => 0x86dd,
-            FlowControl => 0x8808,
-            CobraNet => 0x8819,
-            Mpls => 0x8847,
-            MplsMulticast => 0x8848,
-            PppoeDiscovery => 0x8863,
-            PppoeSession => 0x8864,
-            Vlan => 0x8100,
-            PBridge => 0x88a8,
-            Lldp => 0x88cc,
-            Ptp => 0x88f7,
-            Cfm => 0x8902,
-            QinQ => 0x9100,
-            Unknown(n) => n,
-        }
-    }
-}

vnt/tun/src/packet/mod.rs

@@ -1,67 +0,0 @@
-use crate::packet::ethernet::protocol::Protocol;
-use std::io;
-
-pub mod arp;
-pub mod ethernet;
-
-const MAC: [u8; 6] = [0xf, 0xf, 0xf, 0xf, 0xe, 0x9];
-pub fn read_tap<W, R>(buf: &mut [u8], read_fn: R, write_fn: W) -> io::Result<usize>
-where
-    W: Fn(&[u8]) -> io::Result<usize>,
-    R: Fn(&mut [u8]) -> io::Result<usize>,
-{
-    let mut eth_buf = [0; 65536];
-    loop {
-        let len = read_fn(&mut eth_buf)?;
-        if len == 0{
-            return Ok(len);
-        }
-        //处理arp包
-        let mut ether = ethernet::packet::EthernetPacket::new(&mut eth_buf[..len])?;
-        match ether.protocol() {
-            Protocol::Ipv4 => {
-                let len = ether.payload().len();
-                if len > buf.len() {
-                    return Err(io::Error::new(io::ErrorKind::Other, "short"));
-                }
-                buf[..len].copy_from_slice(ether.payload());
-                return Ok(len);
-            }
-            Protocol::Arp => {
-                let mut arp_packet = arp::packet::ArpPacket::unchecked(ether.payload_mut());
-                let sender_h: [u8; 6] = arp_packet.sender_hardware_addr().try_into().unwrap();
-                let sender_p: [u8; 4] = arp_packet.sender_protocol_addr().try_into().unwrap();
-                let target_p: [u8; 4] = arp_packet.target_protocol_addr().try_into().unwrap();
-                if target_p == [0, 0, 0, 0] || sender_p == [0, 0, 0, 0] || target_p == sender_p {
-                    continue;
-                }
-                if arp_packet.op_code() == 1 {
-                    //回复一个默认的MAC
-                    arp_packet.set_op_code(2);
-                    arp_packet.set_target_hardware_addr(&sender_h);
-                    arp_packet.set_target_protocol_addr(&sender_p);
-                    arp_packet.set_sender_protocol_addr(&target_p);
-                    arp_packet.set_sender_hardware_addr(&MAC);
-                    ether.set_destination(&sender_h);
-                    ether.set_source(&MAC);
-                    write_fn(ether.buffer)?;
-                }
-            }
-            _ => {
-                //忽略这些数据
-            }
-        }
-    }
-}
-pub fn write_tap<W>(buf: &[u8], write_fn: W, mac: &[u8; 6]) -> io::Result<usize>
-where
-    W: Fn(&[u8]) -> io::Result<usize>,
-{
-    // 封装二层数据
-    let mut ether = ethernet::packet::EthernetPacket::unchecked(vec![0; 14 + buf.len()]);
-    ether.set_source(&MAC);
-    ether.set_destination(mac);
-    ether.set_protocol(Protocol::Ipv4);
-    ether.payload_mut().copy_from_slice(buf);
-    write_fn(&ether.buffer)
-}

vnt/tun/src/unix/fd.rs

@@ -1,62 +0,0 @@
-use std::io;
-use std::os::fd::{AsRawFd, IntoRawFd, RawFd};
-
-pub struct Fd(pub RawFd);
-
-impl Fd {
-    pub fn new(value: RawFd) -> io::Result<Self> {
-        if value < 0 {
-            return Err(io::Error::from(io::ErrorKind::InvalidInput));
-        }
-        Ok(Fd(value))
-    }
-}
-
-impl Fd {
-    pub fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        unsafe {
-            let amount = libc::read(self.0, buf.as_mut_ptr() as *mut _, buf.len());
-
-            if amount < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(amount as usize)
-        }
-    }
-    pub fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        unsafe {
-            let amount = libc::write(self.0, buf.as_ptr() as *const _, buf.len());
-
-            if amount < 0 {
-                return Err(io::Error::last_os_error());
-            }
-
-            Ok(amount as usize)
-        }
-    }
-}
-
-impl AsRawFd for Fd {
-    fn as_raw_fd(&self) -> RawFd {
-        self.0
-    }
-}
-
-impl IntoRawFd for Fd {
-    fn into_raw_fd(mut self) -> RawFd {
-        let fd = self.0;
-        self.0 = -1;
-        fd
-    }
-}
-
-impl Drop for Fd {
-    fn drop(&mut self) {
-        unsafe {
-            if self.0 >= 0 {
-                libc::close(self.0);
-            }
-        }
-    }
-}

vnt/tun/src/unix/mod.rs

@@ -1,27 +0,0 @@
-mod fd;
-
-pub use fd::Fd;
-use std::process::Output;
-#[cfg(any(target_os = "macos", target_os = "linux"))]
-mod sockaddr;
-#[cfg(any(target_os = "macos", target_os = "linux"))]
-pub use sockaddr::SockAddr;
-
-#[cfg(any(target_os = "macos", target_os = "linux"))]
-pub fn exe_cmd(cmd: &str) -> std::io::Result<Output> {
-    use std::io;
-    use std::process::Command;
-    println!("exe cmd: {}", cmd);
-    let out = Command::new("sh")
-        .arg("-c")
-        .arg(cmd)
-        .output()
-        .expect("sh exec error!");
-    if !out.status.success() {
-        return Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!("cmd={},out={:?}", cmd, out),
-        ));
-    }
-    Ok(out)
-}

vnt/tun/src/unix/sockaddr.rs

@@ -1,67 +0,0 @@
-use libc::{in_addr, sockaddr, sockaddr_in};
-use std::{io, mem, net::Ipv4Addr, ptr};
-
-use io::Result;
-
-/// A wrapper for `sockaddr_in`.
-#[derive(Copy, Clone)]
-pub struct SockAddr(sockaddr_in);
-
-impl SockAddr {
-    /// Create a new `SockAddr` from a generic `sockaddr`.
-    pub fn new(value: &sockaddr) -> Result<Self> {
-        if value.sa_family != libc::AF_INET as libc::sa_family_t {
-            return Err(io::Error::new(io::ErrorKind::Other, "invalid address"));
-        }
-
-        unsafe { Self::unchecked(value) }
-    }
-
-    /// # Safety
-    ///  Create a new `SockAddr` and not check the source.
-    pub unsafe fn unchecked(value: &sockaddr) -> Result<Self> {
-        Ok(SockAddr(ptr::read(value as *const _ as *const _)))
-    }
-
-    /// # Safety
-    /// Get a generic pointer to the `SockAddr`.
-    pub unsafe fn as_ptr(&self) -> *const sockaddr {
-        &self.0 as *const _ as *const sockaddr
-    }
-}
-
-impl From<Ipv4Addr> for SockAddr {
-    fn from(ip: Ipv4Addr) -> SockAddr {
-        let octets = ip.octets();
-        let mut addr = unsafe { mem::zeroed::<sockaddr_in>() };
-
-        addr.sin_family = libc::AF_INET as libc::sa_family_t;
-        addr.sin_port = 0;
-        addr.sin_addr = in_addr {
-            s_addr: u32::from_ne_bytes(octets),
-        };
-
-        SockAddr(addr)
-    }
-}
-
-impl From<SockAddr> for Ipv4Addr {
-    fn from(addr: SockAddr) -> Ipv4Addr {
-        let ip = addr.0.sin_addr.s_addr;
-        let [a, b, c, d] = ip.to_ne_bytes();
-
-        Ipv4Addr::new(a, b, c, d)
-    }
-}
-
-impl From<SockAddr> for sockaddr {
-    fn from(addr: SockAddr) -> sockaddr {
-        unsafe { mem::transmute(addr.0) }
-    }
-}
-
-impl From<SockAddr> for sockaddr_in {
-    fn from(addr: SockAddr) -> sockaddr_in {
-        addr.0
-    }
-}

vnt/tun/src/windows/device.rs

@@ -1,91 +0,0 @@
-use crate::device::IFace;
-use crate::windows::{tap, tun};
-use std::io;
-use std::net::Ipv4Addr;
-
-pub enum Device {
-    Tap(tap::Device),
-    Tun(tun::Device),
-}
-
-impl Device {
-    pub fn new(name: String, tap: bool) -> io::Result<Self> {
-        if tap {
-            Ok(Device::Tap(tap::Device::new(name)?))
-        } else {
-            Ok(Device::Tun(tun::Device::new(name)?))
-        }
-    }
-}
-
-impl IFace for Device {
-    fn version(&self) -> io::Result<String> {
-        match self {
-            Device::Tap(dev) => dev.version(),
-            Device::Tun(dev) => dev.version(),
-        }
-    }
-
-    fn name(&self) -> io::Result<String> {
-        match self {
-            Device::Tap(dev) => dev.name(),
-            Device::Tun(dev) => dev.name(),
-        }
-    }
-
-    fn shutdown(&self) -> io::Result<()> {
-        match self {
-            Device::Tap(dev) => dev.shutdown(),
-            Device::Tun(dev) => dev.shutdown(),
-        }
-    }
-
-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> io::Result<()> {
-        match self {
-            Device::Tap(dev) => dev.set_ip(address, mask),
-            Device::Tun(dev) => dev.set_ip(address, mask),
-        }
-    }
-
-    fn mtu(&self) -> io::Result<u32> {
-        match self {
-            Device::Tap(dev) => dev.mtu(),
-            Device::Tun(dev) => dev.mtu(),
-        }
-    }
-
-    fn set_mtu(&self, value: u32) -> io::Result<()> {
-        match self {
-            Device::Tap(dev) => dev.set_mtu(value),
-            Device::Tun(dev) => dev.set_mtu(value),
-        }
-    }
-
-    fn add_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr, metric: u16) -> io::Result<()> {
-        match self {
-            Device::Tap(dev) => dev.add_route(dest, netmask, metric),
-            Device::Tun(dev) => dev.add_route(dest, netmask, metric),
-        }
-    }
-
-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-        match self {
-            Device::Tap(dev) => dev.delete_route(dest, netmask),
-            Device::Tun(dev) => dev.delete_route(dest, netmask),
-        }
-    }
-
-    fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        match self {
-            Device::Tap(dev) => dev.read(buf),
-            Device::Tun(dev) => dev.read(buf),
-        }
-    }
-
-    fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        match self {
-            Device::Tap(dev) => dev.write(buf),
-            Device::Tun(dev) => dev.write(buf),
-        }
-    }
-}

vnt/tun/src/windows/ffi.rs

@@ -1,502 +0,0 @@
-// Many things will be used in the future
-#![allow(unused)]
-
-//! Module holding safe wrappers over winapi functions
-
-use winapi::shared::basetsd::*;
-use winapi::shared::guiddef::GUID;
-use winapi::shared::ifdef::*;
-use winapi::shared::minwindef::*;
-use winapi::shared::netioapi::*;
-use winapi::shared::winerror::*;
-
-use winapi::um::combaseapi::*;
-use winapi::um::errhandlingapi::*;
-use winapi::um::fileapi::*;
-use winapi::um::handleapi::*;
-use winapi::um::ioapiset::*;
-use winapi::um::setupapi::*;
-use winapi::um::synchapi::*;
-use winapi::um::winioctl::*;
-use winapi::um::winnt::*;
-use winapi::um::winreg::*;
-
-use std::error::Error;
-use std::{io, mem, ptr};
-use winapi::um::minwinbase::OVERLAPPED_u;
-
-#[allow(non_camel_case_types)]
-#[allow(non_snake_case)]
-#[repr(C)]
-#[derive(Clone, Copy)]
-/// Custom type to handle variable size SP_DRVINFO_DETAIL_DATA_W
-pub struct SP_DRVINFO_DETAIL_DATA_W2 {
-    pub cbSize: DWORD,
-    pub InfDate: FILETIME,
-    pub CompatIDsOffset: DWORD,
-    pub CompatIDsLength: DWORD,
-    pub Reserved: ULONG_PTR,
-    pub SectionName: [WCHAR; 256],
-    pub InfFileName: [WCHAR; 260],
-    pub DrvDescription: [WCHAR; 256],
-    pub HardwareID: [WCHAR; 512],
-}
-
-pub fn string_from_guid(guid: &GUID) -> io::Result<Vec<WCHAR>> {
-    // GUID_STRING_CHARACTERS + 1
-    let mut string = vec![0; 39];
-
-    match unsafe { StringFromGUID2(guid, string.as_mut_ptr(), string.len() as _) } {
-        0 => Err(io::Error::new(io::ErrorKind::Other, "Insufficent buffer")),
-        _ => Ok(string),
-    }
-}
-
-pub fn alias_to_luid(alias: &[WCHAR]) -> io::Result<NET_LUID> {
-    let mut luid = unsafe { mem::zeroed() };
-
-    match unsafe { ConvertInterfaceAliasToLuid(alias.as_ptr(), &mut luid) } {
-        0 => Ok(luid),
-        err => Err(io::Error::from_raw_os_error(err as _)),
-    }
-}
-
-pub fn luid_to_index(luid: &NET_LUID) -> io::Result<NET_IFINDEX> {
-    let mut index = 0;
-
-    match unsafe { ConvertInterfaceLuidToIndex(luid, &mut index) } {
-        0 => Ok(index),
-        err => Err(io::Error::from_raw_os_error(err as _)),
-    }
-}
-
-pub fn luid_to_guid(luid: &NET_LUID) -> io::Result<GUID> {
-    let mut guid = unsafe { mem::zeroed() };
-
-    match unsafe { ConvertInterfaceLuidToGuid(luid, &mut guid) } {
-        0 => Ok(guid),
-        err => Err(io::Error::from_raw_os_error(err as _)),
-    }
-}
-
-pub fn luid_to_alias(luid: &NET_LUID) -> io::Result<Vec<WCHAR>> {
-    // IF_MAX_STRING_SIZE + 1
-    let mut alias = vec![0; 257];
-
-    match unsafe { ConvertInterfaceLuidToAlias(luid, alias.as_mut_ptr(), alias.len()) } {
-        0 => Ok(alias),
-        err => Err(io::Error::from_raw_os_error(err as _)),
-    }
-}
-
-pub fn close_handle(handle: HANDLE) -> io::Result<()> {
-    match unsafe { CloseHandle(handle) } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn create_file(
-    file_name: &[WCHAR],
-    desired_access: DWORD,
-    share_mode: DWORD,
-    creation_disposition: DWORD,
-    flags_and_attributes: DWORD,
-) -> io::Result<HANDLE> {
-    match unsafe {
-        CreateFileW(
-            file_name.as_ptr(),
-            desired_access,
-            share_mode,
-            ptr::null_mut(),
-            creation_disposition,
-            flags_and_attributes,
-            ptr::null_mut(),
-        )
-    } {
-        INVALID_HANDLE_VALUE => Err(io::Error::last_os_error()),
-        handle => Ok(handle),
-    }
-}
-
-pub fn read_file(handle: HANDLE, buffer: &mut [u8]) -> io::Result<DWORD> {
-    let mut ret = 0;
-    //https://www.cnblogs.com/linyilong3/archive/2012/05/03/2480451.html
-    unsafe {
-        let mut ip_overlapped = winapi::um::minwinbase::OVERLAPPED {
-            Internal: 0,
-            InternalHigh: 0,
-            u: Default::default(),
-            hEvent: ptr::null_mut(),
-        };
-        if 0 == ReadFile(
-            handle,
-            buffer.as_mut_ptr() as _,
-            buffer.len() as _,
-            &mut ret,
-            &mut ip_overlapped,
-        ) {
-            let e = io::Error::last_os_error();
-            if e.raw_os_error().unwrap_or(0) == ERROR_IO_PENDING as _ {
-                if 0 == GetOverlappedResult(handle, &mut ip_overlapped, &mut ret, 1) {
-                    return Err(e);
-                }
-            } else {
-                return Err(e);
-            }
-        }
-        Ok(ret)
-    }
-}
-
-pub fn write_file(handle: HANDLE, buffer: &[u8]) -> io::Result<DWORD> {
-    let mut ret = 0;
-    let mut ip_overlapped = winapi::um::minwinbase::OVERLAPPED {
-        Internal: 0,
-        InternalHigh: 0,
-        u: Default::default(),
-        hEvent: ptr::null_mut(),
-    };
-    unsafe {
-        if 0 == WriteFile(
-            handle,
-            buffer.as_ptr() as _,
-            buffer.len() as _,
-            &mut ret,
-            &mut ip_overlapped,
-        ) {
-            let e = io::Error::last_os_error();
-            if e.raw_os_error().unwrap_or(0) == ERROR_IO_PENDING as _ {
-                if 0 == GetOverlappedResult(handle, &mut ip_overlapped, &mut ret, 1) {
-                    return Err(e);
-                }
-            } else {
-                return Err(e);
-            }
-        }
-        Ok(ret)
-    }
-}
-
-pub fn create_device_info_list(guid: &GUID) -> io::Result<HDEVINFO> {
-    match unsafe { SetupDiCreateDeviceInfoList(guid, ptr::null_mut()) } {
-        INVALID_HANDLE_VALUE => Err(io::Error::last_os_error()),
-        devinfo => Ok(devinfo),
-    }
-}
-
-pub fn get_class_devs(guid: &GUID, flags: DWORD) -> io::Result<HDEVINFO> {
-    match unsafe { SetupDiGetClassDevsW(guid, ptr::null(), ptr::null_mut(), flags) } {
-        INVALID_HANDLE_VALUE => Err(io::Error::last_os_error()),
-        devinfo => Ok(devinfo),
-    }
-}
-
-pub fn destroy_device_info_list(devinfo: HDEVINFO) -> io::Result<()> {
-    match unsafe { SetupDiDestroyDeviceInfoList(devinfo) } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn class_name_from_guid(guid: &GUID) -> io::Result<Vec<WCHAR>> {
-    let mut class_name = vec![0; 32];
-
-    match unsafe {
-        SetupDiClassNameFromGuidW(
-            guid,
-            class_name.as_mut_ptr(),
-            class_name.len() as _,
-            ptr::null_mut(),
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(class_name),
-    }
-}
-
-pub fn create_device_info(
-    devinfo: HDEVINFO,
-    device_name: &[WCHAR],
-    guid: &GUID,
-    device_description: &[WCHAR],
-    creation_flags: DWORD,
-) -> io::Result<SP_DEVINFO_DATA> {
-    let mut devinfo_data: SP_DEVINFO_DATA = unsafe { mem::zeroed() };
-    devinfo_data.cbSize = mem::size_of_val(&devinfo_data) as _;
-
-    match unsafe {
-        SetupDiCreateDeviceInfoW(
-            devinfo,
-            device_name.as_ptr(),
-            guid,
-            device_description.as_ptr(),
-            ptr::null_mut(),
-            creation_flags,
-            &mut devinfo_data,
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(devinfo_data),
-    }
-}
-
-pub fn set_selected_device(devinfo: HDEVINFO, devinfo_data: &SP_DEVINFO_DATA) -> io::Result<()> {
-    match unsafe { SetupDiSetSelectedDevice(devinfo, devinfo_data as *const _ as _) } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn set_device_registry_property(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    property: DWORD,
-    value: &[WCHAR],
-) -> io::Result<()> {
-    match unsafe {
-        SetupDiSetDeviceRegistryPropertyW(
-            devinfo,
-            devinfo_data as *const _ as _,
-            property,
-            value.as_ptr() as _,
-            (value.len() * 2) as _,
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn get_device_registry_property(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    property: DWORD,
-) -> io::Result<Vec<WCHAR>> {
-    let mut value = vec![0; 32];
-
-    match unsafe {
-        SetupDiGetDeviceRegistryPropertyW(
-            devinfo,
-            devinfo_data as *const _ as _,
-            property,
-            ptr::null_mut(),
-            value.as_mut_ptr() as _,
-            (value.len() * 2) as _,
-            ptr::null_mut(),
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(value),
-    }
-}
-
-pub fn build_driver_info_list(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    driver_type: DWORD,
-) -> io::Result<()> {
-    match unsafe { SetupDiBuildDriverInfoList(devinfo, devinfo_data as *const _ as _, driver_type) }
-    {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn destroy_driver_info_list(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    driver_type: DWORD,
-) -> io::Result<()> {
-    match unsafe {
-        SetupDiDestroyDriverInfoList(devinfo, devinfo_data as *const _ as _, driver_type)
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn get_driver_info_detail(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    drvinfo_data: &SP_DRVINFO_DATA_W,
-) -> io::Result<SP_DRVINFO_DETAIL_DATA_W2> {
-    let mut drvinfo_detail: SP_DRVINFO_DETAIL_DATA_W2 = unsafe { mem::zeroed() };
-    drvinfo_detail.cbSize = mem::size_of::<SP_DRVINFO_DETAIL_DATA_W>() as _;
-
-    match unsafe {
-        SetupDiGetDriverInfoDetailW(
-            devinfo,
-            devinfo_data as *const _ as _,
-            drvinfo_data as *const _ as _,
-            &mut drvinfo_detail as *mut _ as _,
-            mem::size_of_val(&drvinfo_detail) as _,
-            ptr::null_mut(),
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(drvinfo_detail),
-    }
-}
-
-pub fn set_selected_driver(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    drvinfo_data: &SP_DRVINFO_DATA_W,
-) -> io::Result<()> {
-    match unsafe {
-        SetupDiSetSelectedDriverW(
-            devinfo,
-            devinfo_data as *const _ as _,
-            drvinfo_data as *const _ as _,
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn set_class_install_params(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    params: &impl Copy,
-) -> io::Result<()> {
-    match unsafe {
-        SetupDiSetClassInstallParamsW(
-            devinfo,
-            devinfo_data as *const _ as _,
-            params as *const _ as _,
-            mem::size_of_val(params) as _,
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn call_class_installer(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    install_function: DI_FUNCTION,
-) -> io::Result<()> {
-    match unsafe {
-        SetupDiCallClassInstaller(install_function, devinfo, devinfo_data as *const _ as _)
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}
-
-pub fn open_dev_reg_key(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    scope: DWORD,
-    hw_profile: DWORD,
-    key_type: DWORD,
-    sam_desired: REGSAM,
-) -> io::Result<HKEY> {
-    const INVALID_KEY_VALUE: HKEY = INVALID_HANDLE_VALUE as _;
-
-    match unsafe {
-        SetupDiOpenDevRegKey(
-            devinfo,
-            devinfo_data as *const _ as _,
-            scope,
-            hw_profile,
-            key_type,
-            sam_desired,
-        )
-    } {
-        INVALID_KEY_VALUE => Err(io::Error::last_os_error()),
-        key => Ok(key),
-    }
-}
-
-pub fn notify_change_key_value(
-    key: HKEY,
-    watch_subtree: BOOL,
-    notify_filter: DWORD,
-    milliseconds: DWORD,
-) -> io::Result<()> {
-    let event = match unsafe { CreateEventW(ptr::null_mut(), FALSE, FALSE, ptr::null()) } {
-        INVALID_HANDLE_VALUE => Err(io::Error::last_os_error()),
-        event => Ok(event),
-    }?;
-
-    match unsafe { RegNotifyChangeKeyValue(key, watch_subtree, notify_filter, event, TRUE) } {
-        0 => Ok(()),
-        err => Err(io::Error::from_raw_os_error(err)),
-    }?;
-
-    match unsafe { WaitForSingleObject(event, milliseconds) } {
-        0 => Ok(()),
-        0x102 => Err(io::Error::new(
-            io::ErrorKind::TimedOut,
-            "Registry timed out",
-        )),
-        _ => Err(io::Error::last_os_error()),
-    }
-}
-
-pub fn enum_driver_info(
-    devinfo: HDEVINFO,
-    devinfo_data: &SP_DEVINFO_DATA,
-    driver_type: DWORD,
-    member_index: DWORD,
-) -> Option<io::Result<SP_DRVINFO_DATA_W>> {
-    let mut drvinfo_data: SP_DRVINFO_DATA_W = unsafe { mem::zeroed() };
-    drvinfo_data.cbSize = mem::size_of_val(&drvinfo_data) as _;
-
-    match unsafe {
-        SetupDiEnumDriverInfoW(
-            devinfo,
-            devinfo_data as *const _ as _,
-            driver_type,
-            member_index,
-            &mut drvinfo_data,
-        )
-    } {
-        0 if unsafe { GetLastError() == ERROR_NO_MORE_ITEMS } => None,
-        0 => Some(Err(io::Error::last_os_error())),
-        _ => Some(Ok(drvinfo_data)),
-    }
-}
-
-pub fn enum_device_info(
-    devinfo: HDEVINFO,
-    member_index: DWORD,
-) -> Option<io::Result<SP_DEVINFO_DATA>> {
-    let mut devinfo_data: SP_DEVINFO_DATA = unsafe { mem::zeroed() };
-    devinfo_data.cbSize = mem::size_of_val(&devinfo_data) as _;
-
-    match unsafe { SetupDiEnumDeviceInfo(devinfo, member_index, &mut devinfo_data) } {
-        0 if unsafe { GetLastError() == ERROR_NO_MORE_ITEMS } => None,
-        0 => Some(Err(io::Error::last_os_error())),
-        _ => Some(Ok(devinfo_data)),
-    }
-}
-
-pub fn device_io_control(
-    handle: HANDLE,
-    io_control_code: DWORD,
-    in_buffer: &impl Copy,
-    out_buffer: &mut impl Copy,
-) -> io::Result<()> {
-    let mut junk = 0;
-
-    match unsafe {
-        DeviceIoControl(
-            handle,
-            io_control_code,
-            in_buffer as *const _ as _,
-            mem::size_of_val(in_buffer) as _,
-            out_buffer as *mut _ as _,
-            mem::size_of_val(out_buffer) as _,
-            &mut junk,
-            ptr::null_mut(),
-        )
-    } {
-        0 => Err(io::Error::last_os_error()),
-        _ => Ok(()),
-    }
-}

vnt/tun/src/windows/mod.rs

@@ -1,43 +0,0 @@
-use std::io;
-use std::os::windows::process::CommandExt;
-use winapi::shared::minwindef::DWORD;
-use winapi::um::winbase::CREATE_NO_WINDOW;
-
-mod device;
-mod ffi;
-mod netsh;
-mod route;
-mod tap;
-mod tun;
-pub use device::Device;
-
-/// Encode a string as a utf16 buffer
-pub fn encode_utf16(string: &str) -> Vec<u16> {
-    use std::iter::once;
-    string.encode_utf16().chain(once(0)).collect()
-}
-
-pub fn decode_utf16(string: &[u16]) -> String {
-    let end = string.iter().position(|b| *b == 0).unwrap_or(string.len());
-    String::from_utf16_lossy(&string[..end])
-}
-
-pub const fn ctl_code(device_type: DWORD, function: DWORD, method: DWORD, access: DWORD) -> DWORD {
-    (device_type << 16) | (access << 14) | (function << 2) | method
-}
-
-pub fn exe_cmd(cmd: &str) -> io::Result<()> {
-    println!("exe cmd: {}", cmd);
-    let out = std::process::Command::new("cmd")
-        .creation_flags(CREATE_NO_WINDOW)
-        .arg("/C")
-        .arg(&cmd)
-        .output()?;
-    if !out.status.success() {
-        return Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!("cmd={},out={:?}", cmd, String::from_utf8(out.stderr)),
-        ));
-    }
-    Ok(())
-}

vnt/tun/src/windows/netsh.rs

@@ -1,47 +0,0 @@
-use crate::windows::exe_cmd;
-use std::net::Ipv4Addr;
-use std::{io, process};
-
-/// 设置网卡名称
-pub fn set_interface_name(old_name: &str, new_name: &str) -> io::Result<()> {
-    let cmd = format!(
-        " netsh interface set interface name={:?} newname={:?}",
-        old_name, new_name
-    );
-    exe_cmd(&cmd)
-}
-/// 删除缓存
-pub fn delete_cache() -> io::Result<()> {
-    //清除缓存
-    let cmd = "netsh interface ip delete destinationcache";
-    exe_cmd(cmd)
-}
-
-/// 设置网卡ip
-pub fn set_interface_ip(index: u32, address: &Ipv4Addr, netmask: &Ipv4Addr) -> io::Result<()> {
-    let cmd = format!(
-        "netsh interface ip set address {} static {:?} {:?} ",
-        index, address, netmask,
-    );
-    exe_cmd(&cmd)
-}
-
-pub fn set_interface_mtu(index: u32, mtu: u32) -> io::Result<()> {
-    let cmd = format!(
-        "netsh interface ipv4 set subinterface {}  mtu={} store=persistent",
-        index, mtu
-    );
-    exe_cmd(&cmd)
-}
-pub fn set_interface_metric(index: u32, metric: u16) -> io::Result<()> {
-    let cmd = format!(
-        "netsh interface ip set interface {} metric={}",
-        index, metric
-    );
-    exe_cmd(&cmd)
-}
-/// 禁用ipv6
-pub fn disabled_ipv6(index: u32) -> io::Result<()> {
-    let cmd = format!("netsh interface ipv6 set interface {} disabled", index);
-    exe_cmd(&cmd)
-}

vnt/tun/src/windows/route.rs

@@ -1,33 +0,0 @@
-use std::io;
-use std::net::Ipv4Addr;
-
-use crate::windows::exe_cmd;
-
-/// 添加路由
-pub fn add_route(
-    index: u32,
-    dest: Ipv4Addr,
-    netmask: Ipv4Addr,
-    gateway: Ipv4Addr,
-    metric: u16,
-) -> io::Result<()> {
-    let cmd = format!(
-        "route add {:?} mask {:?} {:?} metric {} if {}",
-        dest, netmask, gateway, metric, index
-    );
-    exe_cmd(&cmd)
-}
-
-/// 删除路由
-pub fn delete_route(
-    index: u32,
-    dest: Ipv4Addr,
-    netmask: Ipv4Addr,
-    gateway: Ipv4Addr,
-) -> io::Result<()> {
-    let cmd = format!(
-        "route delete  {:?} mask {:?} {:?} if {}",
-        dest, netmask, gateway, index
-    );
-    exe_cmd(&cmd)
-}

vnt/tun/src/windows/tap/mod.rs

@@ -1,188 +0,0 @@
-use std::io;
-use std::net::Ipv4Addr;
-use winapi::shared::ifdef::NET_LUID;
-use winapi::shared::minwindef::DWORD;
-use winapi::um::fileapi::OPEN_EXISTING;
-use winapi::um::winbase::FILE_FLAG_OVERLAPPED;
-use winapi::um::winioctl::{FILE_ANY_ACCESS, FILE_DEVICE_UNKNOWN, METHOD_BUFFERED};
-use winapi::um::winnt::{
-    FILE_ATTRIBUTE_SYSTEM, FILE_SHARE_READ, FILE_SHARE_WRITE, GENERIC_READ, GENERIC_WRITE, HANDLE,
-};
-
-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 */
-const TAP_WIN_IOCTL_GET_MAC: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 1, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_GET_VERSION: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 2, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_GET_MTU: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 3, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_GET_INFO: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 4, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 5, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_SET_MEDIA_STATUS: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 6, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_CONFIG_DHCP_MASQ: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 7, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_GET_LOG_LINE: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 8, METHOD_BUFFERED, FILE_ANY_ACCESS);
-const TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 9, METHOD_BUFFERED, FILE_ANY_ACCESS);
-/* Added in 8.2 */
-/* obsoletes TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT */
-const TAP_WIN_IOCTL_CONFIG_TUN: DWORD =
-    ctl_code(FILE_DEVICE_UNKNOWN, 10, METHOD_BUFFERED, FILE_ANY_ACCESS);
-
-pub struct Device {
-    handle: HANDLE,
-    index: u32,
-    luid: NET_LUID,
-    mac: [u8; 6],
-}
-
-unsafe impl Send for Device {}
-
-unsafe impl Sync for Device {}
-
-impl Device {
-    /// 打开设备，设置为TUN模式，激活网卡
-    pub fn new(name: String) -> io::Result<Self> {
-        let luid = ffi::alias_to_luid(&encode_utf16(&name)).map_err(|e| {
-            io::Error::new(e.kind(), format!("alias_to_luid name={},err={:?}", name, e))
-        })?;
-        let guid = ffi::luid_to_guid(&luid)
-            .and_then(|guid| ffi::string_from_guid(&guid))
-            .map_err(|e| {
-                io::Error::new(e.kind(), format!("luid_to_guid name={},err={:?}", name, e))
-            })?;
-        let path = format!(r"\\.\Global\{}.tap", decode_utf16(&guid));
-        let handle = ffi::create_file(
-            &encode_utf16(&path),
-            GENERIC_READ | GENERIC_WRITE,
-            FILE_SHARE_READ | FILE_SHARE_WRITE,
-            OPEN_EXISTING,
-            FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED,
-        )
-        .map_err(|e| io::Error::new(e.kind(), format!("tap name={},err={:?}", name, e)))?;
-
-        // ep保存tun网卡的IP地址和掩码
-        // let mut ep = [0;3];
-        // ep[0] = Ipv4Addr::new(10,26,0,11).into();
-        // ep[2] = Ipv4Addr::new(255,255,255,0).into();;
-        // ep[1] = ep[0] & ep[2];
-        // //tun模式收不到ipv4包，原因未知 https://github.com/OpenVPN/tap-windows6/issues/111
-        // ffi::device_io_control(handle, TAP_WIN_IOCTL_CONFIG_TUN, &ep, &mut ()).map_err(
-        //     |e| {
-        //         io::Error::new(
-        //             e.kind(),
-        //             format!("TAP_WIN_IOCTL_CONFIG_TUN name={},err={:?}", name_str, e),
-        //         )
-        //     },
-        // )?;
-        let mut mac = [0u8; 6];
-        ffi::device_io_control(handle, TAP_WIN_IOCTL_GET_MAC, &(), &mut mac)
-            .map_err(|e| {
-                io::Error::new(
-                    e.kind(),
-                    format!("TAP_WIN_IOCTL_CONFIG_TUN name={},err={:?}", name, e),
-                )
-            })
-            .map_err(|e| io::Error::new(e.kind(), format!("TAP_WIN_IOCTL_GET_MAC,err={:?}", e)))?;
-        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);
-        }
-        let device = Self {
-            handle,
-            index,
-            luid,
-            mac,
-        };
-        device.enabled(true)?;
-        Ok(device)
-    }
-    fn write_tap(&self, buf: &[u8]) -> io::Result<usize> {
-        ffi::write_file(self.handle, buf).map(|res| res as _)
-    }
-    fn enabled(&self, value: bool) -> io::Result<()> {
-        let status: u32 = if value { 1 } else { 0 };
-        ffi::device_io_control(
-            self.handle,
-            TAP_WIN_IOCTL_SET_MEDIA_STATUS,
-            &status,
-            &mut (),
-        )
-    }
-}
-
-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];
-        ffi::device_io_control(self.handle, TAP_WIN_IOCTL_GET_VERSION, &(), &mut version)?;
-        Ok(format!("{}.{}.{}", version[0], version[1], version[2]))
-    }
-    fn name(&self) -> io::Result<String> {
-        ffi::luid_to_alias(&self.luid).map(|name| decode_utf16(&name))
-    }
-
-    fn shutdown(&self) -> io::Result<()> {
-        self.enabled(false)
-    }
-
-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> io::Result<()> {
-        netsh::set_interface_ip(self.index, &address, &mask)
-    }
-
-    fn mtu(&self) -> io::Result<u32> {
-        let mut mtu = 0;
-        ffi::device_io_control(self.handle, TAP_WIN_IOCTL_GET_MTU, &(), &mut mtu).map(|_| mtu)
-    }
-
-    fn set_mtu(&self, value: u32) -> io::Result<()> {
-        netsh::set_interface_mtu(self.index, value)
-    }
-
-    fn add_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr, metric: u16) -> io::Result<()> {
-        route::add_route(self.index, dest, netmask, Ipv4Addr::UNSPECIFIED, metric)?;
-        netsh::delete_cache()
-    }
-
-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-        route::delete_route(self.index, dest, netmask, Ipv4Addr::UNSPECIFIED)?;
-        netsh::delete_cache()
-    }
-
-    fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        packet::read_tap(
-            buf,
-            |eth_buf| ffi::read_file(self.handle, eth_buf).map(|res| res as usize),
-            |eth_buf| ffi::write_file(self.handle, eth_buf).map(|res| res as _),
-        )
-    }
-
-    fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        // 封装二层数据
-        packet::write_tap(
-            buf,
-            |eth_buf| ffi::write_file(self.handle, eth_buf).map(|res| res as _),
-            &self.mac,
-        )
-    }
-}
-
-impl Drop for Device {
-    fn drop(&mut self) {
-        if let Err(e) = ffi::close_handle(self.handle) {
-            log::warn!("close_handle={:?}", e)
-        }
-    }
-}

vnt/tun/src/windows/tun/mod.rs

@@ -1,343 +0,0 @@
-use libloading::{Error, Library};
-use std::io;
-use std::net::Ipv4Addr;
-
-use rand::Rng;
-use winapi::um::winbase;
-use winapi::um::{synchapi, winnt};
-
-use crate::device::IFace;
-use crate::windows::decode_utf16;
-use crate::windows::{encode_utf16, ffi, netsh, route};
-
-mod packet;
-mod wintun_log;
-mod wintun_raw;
-
-/// The maximum size of wintun's internal ring buffer (in bytes)
-pub const MAX_RING_CAPACITY: u32 = 0x400_0000;
-
-/// The minimum size of wintun's internal ring buffer (in bytes)
-pub const MIN_RING_CAPACITY: u32 = 0x2_0000;
-
-/// Maximum pool name length including zero terminator
-pub const MAX_POOL: usize = 256;
-
-pub struct Device {
-    pub(crate) luid: u64,
-    pub(crate) index: u32,
-    /// The session handle given to us by WintunStartSession
-    pub(crate) session: wintun_raw::WINTUN_SESSION_HANDLE,
-
-    /// Shared dll for required wintun driver functions
-    pub(crate) win_tun: wintun_raw::wintun,
-
-    /// Windows event handle that is signaled by the wintun driver when data becomes available to
-    /// read
-    pub(crate) read_event: winnt::HANDLE,
-
-    /// Windows event handle that is signaled when [`TunSession::shutdown`] is called force blocking
-    /// readers to exit
-    pub(crate) shutdown_event: winnt::HANDLE,
-
-    /// The adapter that owns this session
-    pub(crate) adapter: wintun_raw::WINTUN_ADAPTER_HANDLE,
-}
-
-unsafe impl Send for Device {}
-
-unsafe impl Sync for Device {}
-
-impl Device {
-    pub fn new(name: String) -> io::Result<Self> {
-        unsafe {
-            let library = match Library::new("wintun.dll") {
-                Ok(library) => library,
-                Err(e) => {
-                    return Err(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("wintun.dll not found {:?}", e),
-                    ));
-                }
-            };
-            let win_tun = match wintun_raw::wintun::from_library(library) {
-                Ok(win_tun) => win_tun,
-                Err(e) => {
-                    return Err(io::Error::new(
-                        io::ErrorKind::Other,
-                        format!("library error {:?} ", e),
-                    ));
-                }
-            };
-            let name_utf16 = encode_utf16(&name);
-            if name_utf16.len() > MAX_POOL {
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    format!("too long {}:{:?}", MAX_POOL, name),
-                ));
-            }
-            wintun_log::set_default_logger_if_unset(&win_tun);
-            let _ = Self::delete_for_name(&win_tun, &name_utf16);
-            let mut guid_bytes: [u8; 16] = [0u8; 16];
-            rand::thread_rng().fill(&mut guid_bytes);
-            let guid = u128::from_ne_bytes(guid_bytes);
-            //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_ptr = &guid_struct as *const wintun_raw::GUID;
-
-            //SAFETY: the function is loaded from the wintun dll properly, we are providing valid
-            //pointers, and all the strings are correct null terminated UTF-16. This safety rationale
-            //applies for all Wintun* functions below
-            let adapter =
-                win_tun.WintunCreateAdapter(name_utf16.as_ptr(), name_utf16.as_ptr(), guid_ptr);
-            if adapter.is_null() {
-                log::error!("adapter.is_null {:?}", io::Error::last_os_error());
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    "Failed to crate adapter",
-                ));
-            }
-            // 开启session
-            let session = win_tun.WintunStartSession(adapter, MAX_RING_CAPACITY);
-            if session.is_null() {
-                log::error!("session.is_null {:?}", io::Error::last_os_error());
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    "WintunStartSession failed",
-                ));
-            }
-            //SAFETY: We follow the contract required by CreateEventA. See MSDN
-            //(the pointers are allowed to be null, and 0 is okay for the others)
-            let shutdown_event =
-                synchapi::CreateEventA(std::ptr::null_mut(), 0, 0, std::ptr::null_mut());
-            let read_event = win_tun.WintunGetReadWaitEvent(session) as winnt::HANDLE;
-            let mut luid: wintun_raw::NET_LUID = std::mem::zeroed();
-            win_tun.WintunGetAdapterLUID(adapter, &mut luid as *mut wintun_raw::NET_LUID);
-            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);
-            }
-            Ok(Self {
-                luid: std::mem::transmute(luid),
-                index,
-                session,
-                win_tun,
-                read_event,
-                shutdown_event,
-                adapter,
-            })
-        }
-    }
-    pub unsafe fn delete_for_name(
-        win_tun: &wintun_raw::wintun,
-        name_utf16: &Vec<u16>,
-    ) -> io::Result<()> {
-        let adapter = win_tun.WintunOpenAdapter(name_utf16.as_ptr());
-        if adapter.is_null() {
-            log::error!(
-                "delete_for_name adapter.is_null {:?}",
-                io::Error::last_os_error()
-            );
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                "Failed to open adapter",
-            ));
-        }
-        win_tun.WintunCloseAdapter(adapter);
-        win_tun.WintunDeleteDriver();
-        Ok(())
-    }
-}
-
-impl IFace for Device {
-    fn version(&self) -> io::Result<String> {
-        let version = unsafe { self.win_tun.WintunGetRunningDriverVersion() };
-        if version == 0 {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                "WintunGetRunningDriverVersion",
-            ));
-        } else {
-            Ok(format!("{}.{}", (version >> 16) & 0xFFFF, version & 0xFFFF))
-        }
-    }
-    fn name(&self) -> io::Result<String> {
-        let luid = self.luid;
-        ffi::luid_to_alias(&unsafe { std::mem::transmute(luid) }).map(|name| decode_utf16(&name))
-    }
-
-    fn shutdown(&self) -> io::Result<()> {
-        unsafe {
-            if 0 == synchapi::SetEvent(self.shutdown_event) {
-                Ok(())
-            } else {
-                Err(io::Error::last_os_error())
-            }
-        }
-    }
-
-    fn set_ip(&self, address: Ipv4Addr, mask: Ipv4Addr) -> io::Result<()> {
-        netsh::set_interface_ip(self.index, &address, &mask)
-    }
-
-    fn mtu(&self) -> io::Result<u32> {
-        Err(io::Error::from(io::ErrorKind::Unsupported))
-    }
-
-    fn set_mtu(&self, value: u32) -> io::Result<()> {
-        netsh::set_interface_mtu(self.index, value)
-    }
-
-    fn add_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr, metric: u16) -> io::Result<()> {
-        route::add_route(self.index, dest, netmask, Ipv4Addr::UNSPECIFIED, metric)?;
-        netsh::delete_cache()
-    }
-
-    fn delete_route(&self, dest: Ipv4Addr, netmask: Ipv4Addr) -> io::Result<()> {
-        route::delete_route(self.index, dest, netmask, Ipv4Addr::UNSPECIFIED)?;
-        netsh::delete_cache()
-    }
-
-    fn read(&self, buf: &mut [u8]) -> io::Result<usize> {
-        let packet = self.receive_blocking()?;
-        let packet = packet.bytes();
-        let len = packet.len();
-        if len > buf.len() {
-            return Err(io::Error::new(io::ErrorKind::InvalidData, "data too long"));
-        }
-        buf[..len].copy_from_slice(packet);
-        Ok(len)
-    }
-
-    fn write(&self, buf: &[u8]) -> io::Result<usize> {
-        let mut packet = self.allocate_send_packet(buf.len() as u16)?;
-        packet.bytes_mut().copy_from_slice(buf);
-        self.send_packet(packet);
-        Ok(buf.len())
-    }
-}
-
-impl Device {
-    pub fn try_receive(&self) -> io::Result<Option<packet::TunPacket>> {
-        let mut size = 0u32;
-
-        let bytes_ptr = unsafe {
-            self.win_tun
-                .WintunReceivePacket(self.session, &mut size as *mut u32)
-        };
-
-        debug_assert!(size <= u16::MAX as u32);
-        if bytes_ptr.is_null() {
-            //Wintun returns ERROR_NO_MORE_ITEMS instead of blocking if packets are not available
-            let last_error = unsafe { winapi::um::errhandlingapi::GetLastError() };
-            if last_error == winapi::shared::winerror::ERROR_NO_MORE_ITEMS {
-                Ok(None)
-            } else {
-                Err(io::Error::new(io::ErrorKind::Other, "try_receive failed"))
-            }
-        } else {
-            Ok(Some(packet::TunPacket {
-                kind: packet::Kind::ReceivePacket,
-                size: size as usize,
-                //SAFETY: ptr is non null, aligned for u8, and readable for up to size bytes (which
-                //must be less than isize::MAX because bytes is a u16
-                bytes_ptr,
-                tun_device: Some(&self),
-            }))
-        }
-    }
-    pub fn receive_blocking(&self) -> io::Result<packet::TunPacket> {
-        loop {
-            //Try 16 times to receive without blocking so we don't have to issue a syscall to wait
-            //for the event if packets are being received at a rapid rate
-            for _i in 0..20 {
-                match self.try_receive()? {
-                    None => {
-                        continue;
-                    }
-                    Some(packet) => {
-                        return Ok(packet);
-                    }
-                }
-            }
-            //Wait on both the read handle and the shutdown handle so that we stop when requested
-            let handles = [self.read_event, self.shutdown_event];
-            let result = unsafe {
-                //SAFETY: We abide by the requirements of WaitForMultipleObjects, handles is a
-                //pointer to valid, aligned, stack memory
-                synchapi::WaitForMultipleObjects(
-                    2,
-                    &handles as *const winnt::HANDLE,
-                    0,
-                    winbase::INFINITE,
-                )
-            };
-            match result {
-                winbase::WAIT_FAILED => {
-                    return Err(io::Error::new(io::ErrorKind::Other, "WAIT_FAILED"));
-                }
-                _ => {
-                    if result == winbase::WAIT_OBJECT_0 {
-                        //We have data!
-                        continue;
-                    } else if result == winbase::WAIT_OBJECT_0 + 1 {
-                        //Shutdown event triggered
-                        return Err(io::Error::new(
-                            io::ErrorKind::Other,
-                            "Shutdown event triggered",
-                        ));
-                    }
-                }
-            }
-        }
-    }
-    pub fn allocate_send_packet(&self, size: u16) -> io::Result<packet::TunPacket> {
-        let bytes_ptr = unsafe {
-            self.win_tun
-                .WintunAllocateSendPacket(self.session, size as u32)
-        };
-        if bytes_ptr.is_null() {
-            Err(io::Error::new(
-                io::ErrorKind::Other,
-                "allocate_send_packet failed",
-            ))
-        } else {
-            Ok(packet::TunPacket {
-                kind: packet::Kind::SendPacketPending,
-                size: size as usize,
-                //SAFETY: ptr is non null, aligned for u8, and readable for up to size bytes (which
-                //must be less than isize::MAX because bytes is a u16
-                bytes_ptr,
-                tun_device: None,
-            })
-        }
-    }
-    pub fn send_packet(&self, mut packet: packet::TunPacket) {
-        assert!(matches!(packet.kind, packet::Kind::SendPacketPending));
-
-        unsafe {
-            self.win_tun
-                .WintunSendPacket(self.session, packet.bytes_ptr)
-        };
-        //Mark the packet at sent
-        packet.kind = packet::Kind::SendPacketSent;
-    }
-}
-
-impl Drop for Device {
-    fn drop(&mut self) {
-        unsafe {
-            if let Err(e) = ffi::close_handle(self.shutdown_event) {
-                log::warn!("close shutdown_event={:?}", e)
-            }
-            self.win_tun.WintunEndSession(self.session);
-            self.win_tun.WintunCloseAdapter(self.adapter);
-            if 0 != self.win_tun.WintunDeleteDriver() {
-                log::warn!("WintunDeleteDriver failed")
-            }
-        }
-    }
-}

vnt/tun/src/windows/tun/packet.rs

@@ -1,64 +0,0 @@
-use crate::windows::tun::Device;
-
-pub(crate) enum Kind {
-    SendPacketPending,
-    //Send packet type, but not sent yet
-    SendPacketSent,
-    //Send packet type - sent
-    ReceivePacket,
-}
-
-/// Represents a wintun packet
-pub struct TunPacket<'a> {
-    pub(crate) kind: Kind,
-    pub(crate) size: usize,
-    pub(crate) bytes_ptr: *const u8,
-
-    //Share ownership of session to prevent the session from being dropped before packets that
-    //belong to it
-    pub(crate) tun_device: Option<&'a Device>,
-}
-
-impl<'a> TunPacket<'a> {
-    /// Returns the bytes this packet holds as &mut.
-    /// The lifetime of the bytes is tied to the lifetime of this packet.
-    pub fn bytes_mut(&mut self) -> &mut [u8] {
-        unsafe { std::slice::from_raw_parts_mut(self.bytes_ptr as *mut u8, self.size) }
-    }
-
-    /// Returns an immutable reference to the bytes this packet holds.
-    /// The lifetime of the bytes is tied to the lifetime of this packet.
-    pub fn bytes(&self) -> &[u8] {
-        unsafe { std::slice::from_raw_parts(self.bytes_ptr, self.size) }
-    }
-}
-
-impl<'a> Drop for TunPacket<'a> {
-    fn drop(&mut self) {
-        match self.kind {
-            Kind::ReceivePacket => {
-                unsafe {
-                    //SAFETY:
-                    //
-                    //  1. We share ownership of the session therefore it hasn't been dropped yet
-                    //  2. Bytes is valid because each packet holds exclusive access to a region of the
-                    //     ring buffer that the wintun session owns. We return that region of
-                    //     memory back to wintun here
-                    let tun_device = self.tun_device.unwrap();
-                    tun_device
-                        .win_tun
-                        .WintunReleaseReceivePacket(tun_device.session, self.bytes_ptr)
-                };
-            }
-            Kind::SendPacketPending => {
-                //If someone allocates a packet with session.allocate_send_packet() and then it is
-                //dropped without being sent, this will hold up the send queue because wintun expects
-                //that every allocated packet is sent
-                panic!("Packet was never sent!");
-            }
-            Kind::SendPacketSent => {
-                //Nop
-            }
-        }
-    }
-}

vnt/tun/src/windows/tun/wintun_log.rs

@@ -1,47 +0,0 @@
-use log::*;
-
-use crate::windows::tun::wintun_raw;
-use std::sync::atomic::{AtomicBool, Ordering};
-use widestring::U16CStr;
-
-/// Sets the logger wintun will use when logging. Maps to the WintunSetLogger C function
-pub fn set_logger(win_tun: &wintun_raw::wintun, f: wintun_raw::WINTUN_LOGGER_CALLBACK) {
-    unsafe { win_tun.WintunSetLogger(f) };
-}
-
-pub fn reset_logger(win_tun: &wintun_raw::wintun) {
-    set_logger(win_tun, None);
-}
-
-static SET_LOGGER: AtomicBool = AtomicBool::new(false);
-
-/// The logger that is active by default. Logs messages to the log crate
-///
-/// # Safety
-/// `message` must be a valid pointer that points to an aligned null terminated UTF-16 string
-pub unsafe extern "C" fn default_logger(
-    level: wintun_raw::WINTUN_LOGGER_LEVEL,
-    _timestamp: wintun_raw::DWORD64,
-    message: *const wintun_raw::WCHAR,
-) {
-    //Cant wait for RFC 2585
-    #[allow(unused_unsafe)]
-    //Wintun will always give us a valid UTF16 null termineted string
-    let msg = unsafe { U16CStr::from_ptr_str(message) };
-    let utf8_msg = msg.to_string_lossy();
-    match level {
-        wintun_raw::WINTUN_LOGGER_LEVEL_WINTUN_LOG_INFO => info!("WinTun: {}", utf8_msg),
-        wintun_raw::WINTUN_LOGGER_LEVEL_WINTUN_LOG_WARN => warn!("WinTun: {}", utf8_msg),
-        wintun_raw::WINTUN_LOGGER_LEVEL_WINTUN_LOG_ERR => error!("WinTun: {}", utf8_msg),
-        _ => error!("WinTun: {} (with invalid log level {})", utf8_msg, level),
-    }
-}
-
-pub(crate) fn set_default_logger_if_unset(win_tun: &wintun_raw::wintun) {
-    if SET_LOGGER
-        .compare_exchange(false, true, Ordering::SeqCst, Ordering::Relaxed)
-        .is_ok()
-    {
-        set_logger(win_tun, Some(default_logger));
-    }
-}

vnt/tun/src/windows/tun/wintun_raw.rs

@@ -1,447 +0,0 @@
-/* automatically generated by rust-bindgen 0.59.1 */
-#[repr(C)]
-#[derive(Copy, Clone, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
-pub struct __BindgenBitfieldUnit<Storage> {
-    storage: Storage,
-}
-impl<Storage> __BindgenBitfieldUnit<Storage> {
-    #[inline]
-    pub const fn new(storage: Storage) -> Self {
-        Self { storage }
-    }
-}
-impl<Storage> __BindgenBitfieldUnit<Storage>
-where
-    Storage: AsRef<[u8]> + AsMut<[u8]>,
-{
-    #[inline]
-    pub fn get_bit(&self, index: usize) -> bool {
-        debug_assert!(index / 8 < self.storage.as_ref().len());
-        let byte_index = index / 8;
-        let byte = self.storage.as_ref()[byte_index];
-        let bit_index = if cfg!(target_endian = "big") {
-            7 - (index % 8)
-        } else {
-            index % 8
-        };
-        let mask = 1 << bit_index;
-        byte & mask == mask
-    }
-    #[inline]
-    pub fn set_bit(&mut self, index: usize, val: bool) {
-        debug_assert!(index / 8 < self.storage.as_ref().len());
-        let byte_index = index / 8;
-        let byte = &mut self.storage.as_mut()[byte_index];
-        let bit_index = if cfg!(target_endian = "big") {
-            7 - (index % 8)
-        } else {
-            index % 8
-        };
-        let mask = 1 << bit_index;
-        if val {
-            *byte |= mask;
-        } else {
-            *byte &= !mask;
-        }
-    }
-    #[inline]
-    pub fn get(&self, bit_offset: usize, bit_width: u8) -> u64 {
-        debug_assert!(bit_width <= 64);
-        debug_assert!(bit_offset / 8 < self.storage.as_ref().len());
-        debug_assert!((bit_offset + (bit_width as usize)) / 8 <= self.storage.as_ref().len());
-        let mut val = 0;
-        for i in 0..(bit_width as usize) {
-            if self.get_bit(i + bit_offset) {
-                let index = if cfg!(target_endian = "big") {
-                    bit_width as usize - 1 - i
-                } else {
-                    i
-                };
-                val |= 1 << index;
-            }
-        }
-        val
-    }
-    #[inline]
-    pub fn set(&mut self, bit_offset: usize, bit_width: u8, val: u64) {
-        debug_assert!(bit_width <= 64);
-        debug_assert!(bit_offset / 8 < self.storage.as_ref().len());
-        debug_assert!((bit_offset + (bit_width as usize)) / 8 <= self.storage.as_ref().len());
-        for i in 0..(bit_width as usize) {
-            let mask = 1 << i;
-            let val_bit_is_set = val & mask == mask;
-            let index = if cfg!(target_endian = "big") {
-                bit_width as usize - 1 - i
-            } else {
-                i
-            };
-            self.set_bit(index + bit_offset, val_bit_is_set);
-        }
-    }
-}
-pub type wchar_t = ::std::os::raw::c_ushort;
-pub type DWORD = ::std::os::raw::c_ulong;
-pub type BOOL = ::std::os::raw::c_int;
-pub type BYTE = ::std::os::raw::c_uchar;
-pub type ULONG64 = ::std::os::raw::c_ulonglong;
-pub type DWORD64 = ::std::os::raw::c_ulonglong;
-pub type WCHAR = wchar_t;
-pub type LPCWSTR = *const WCHAR;
-pub type HANDLE = *mut ::std::os::raw::c_void;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct _GUID {
-    pub Data1: ::std::os::raw::c_ulong,
-    pub Data2: ::std::os::raw::c_ushort,
-    pub Data3: ::std::os::raw::c_ushort,
-    pub Data4: [::std::os::raw::c_uchar; 8usize],
-}
-#[test]
-fn bindgen_test_layout__GUID() {
-    assert_eq!(
-        ::std::mem::size_of::<_GUID>(),
-        16usize,
-        concat!("Size of: ", stringify!(_GUID))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<_GUID>(),
-        4usize,
-        concat!("Alignment of ", stringify!(_GUID))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_GUID>())).Data1 as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_GUID),
-            "::",
-            stringify!(Data1)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_GUID>())).Data2 as *const _ as usize },
-        4usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_GUID),
-            "::",
-            stringify!(Data2)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_GUID>())).Data3 as *const _ as usize },
-        6usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_GUID),
-            "::",
-            stringify!(Data3)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_GUID>())).Data4 as *const _ as usize },
-        8usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_GUID),
-            "::",
-            stringify!(Data4)
-        )
-    );
-}
-pub type GUID = _GUID;
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union _NET_LUID_LH {
-    pub Value: ULONG64,
-    pub Info: _NET_LUID_LH__bindgen_ty_1,
-}
-#[repr(C)]
-#[repr(align(8))]
-#[derive(Debug, Copy, Clone)]
-pub struct _NET_LUID_LH__bindgen_ty_1 {
-    pub _bitfield_align_1: [u32; 0],
-    pub _bitfield_1: __BindgenBitfieldUnit<[u8; 8usize]>,
-}
-#[test]
-fn bindgen_test_layout__NET_LUID_LH__bindgen_ty_1() {
-    assert_eq!(
-        ::std::mem::size_of::<_NET_LUID_LH__bindgen_ty_1>(),
-        8usize,
-        concat!("Size of: ", stringify!(_NET_LUID_LH__bindgen_ty_1))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<_NET_LUID_LH__bindgen_ty_1>(),
-        8usize,
-        concat!("Alignment of ", stringify!(_NET_LUID_LH__bindgen_ty_1))
-    );
-}
-impl _NET_LUID_LH__bindgen_ty_1 {
-    #[inline]
-    pub fn Reserved(&self) -> ULONG64 {
-        unsafe { ::std::mem::transmute(self._bitfield_1.get(0usize, 24u8) as u64) }
-    }
-    #[inline]
-    pub fn set_Reserved(&mut self, val: ULONG64) {
-        unsafe {
-            let val: u64 = ::std::mem::transmute(val);
-            self._bitfield_1.set(0usize, 24u8, val as u64)
-        }
-    }
-    #[inline]
-    pub fn NetLuidIndex(&self) -> ULONG64 {
-        unsafe { ::std::mem::transmute(self._bitfield_1.get(24usize, 24u8) as u64) }
-    }
-    #[inline]
-    pub fn set_NetLuidIndex(&mut self, val: ULONG64) {
-        unsafe {
-            let val: u64 = ::std::mem::transmute(val);
-            self._bitfield_1.set(24usize, 24u8, val as u64)
-        }
-    }
-    #[inline]
-    pub fn IfType(&self) -> ULONG64 {
-        unsafe { ::std::mem::transmute(self._bitfield_1.get(48usize, 16u8) as u64) }
-    }
-    #[inline]
-    pub fn set_IfType(&mut self, val: ULONG64) {
-        unsafe {
-            let val: u64 = ::std::mem::transmute(val);
-            self._bitfield_1.set(48usize, 16u8, val as u64)
-        }
-    }
-    #[inline]
-    pub fn new_bitfield_1(
-        Reserved: ULONG64,
-        NetLuidIndex: ULONG64,
-        IfType: ULONG64,
-    ) -> __BindgenBitfieldUnit<[u8; 8usize]> {
-        let mut __bindgen_bitfield_unit: __BindgenBitfieldUnit<[u8; 8usize]> = Default::default();
-        __bindgen_bitfield_unit.set(0usize, 24u8, {
-            let Reserved: u64 = unsafe { ::std::mem::transmute(Reserved) };
-            Reserved as u64
-        });
-        __bindgen_bitfield_unit.set(24usize, 24u8, {
-            let NetLuidIndex: u64 = unsafe { ::std::mem::transmute(NetLuidIndex) };
-            NetLuidIndex as u64
-        });
-        __bindgen_bitfield_unit.set(48usize, 16u8, {
-            let IfType: u64 = unsafe { ::std::mem::transmute(IfType) };
-            IfType as u64
-        });
-        __bindgen_bitfield_unit
-    }
-}
-#[test]
-fn bindgen_test_layout__NET_LUID_LH() {
-    assert_eq!(
-        ::std::mem::size_of::<_NET_LUID_LH>(),
-        8usize,
-        concat!("Size of: ", stringify!(_NET_LUID_LH))
-    );
-    assert_eq!(
-        ::std::mem::align_of::<_NET_LUID_LH>(),
-        8usize,
-        concat!("Alignment of ", stringify!(_NET_LUID_LH))
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_NET_LUID_LH>())).Value as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_NET_LUID_LH),
-            "::",
-            stringify!(Value)
-        )
-    );
-    assert_eq!(
-        unsafe { &(*(::std::ptr::null::<_NET_LUID_LH>())).Info as *const _ as usize },
-        0usize,
-        concat!(
-            "Offset of field: ",
-            stringify!(_NET_LUID_LH),
-            "::",
-            stringify!(Info)
-        )
-    );
-}
-pub type NET_LUID_LH = _NET_LUID_LH;
-pub type NET_LUID = NET_LUID_LH;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct _WINTUN_ADAPTER {
-    _unused: [u8; 0],
-}
-#[doc = " A handle representing Wintun adapter"]
-pub type WINTUN_ADAPTER_HANDLE = *mut _WINTUN_ADAPTER;
-#[doc = "< Informational"]
-pub const WINTUN_LOGGER_LEVEL_WINTUN_LOG_INFO: WINTUN_LOGGER_LEVEL = 0;
-#[doc = "< Warning"]
-pub const WINTUN_LOGGER_LEVEL_WINTUN_LOG_WARN: WINTUN_LOGGER_LEVEL = 1;
-#[doc = "< Error"]
-pub const WINTUN_LOGGER_LEVEL_WINTUN_LOG_ERR: WINTUN_LOGGER_LEVEL = 2;
-#[doc = " Determines the level of logging, passed to WINTUN_LOGGER_CALLBACK."]
-pub type WINTUN_LOGGER_LEVEL = ::std::os::raw::c_int;
-#[doc = " Called by internal logger to report diagnostic messages"]
-#[doc = ""]
-#[doc = " @param Level         Message level."]
-#[doc = ""]
-#[doc = " @param Timestamp     Message timestamp in in 100ns intervals since 1601-01-01 UTC."]
-#[doc = ""]
-#[doc = " @param Message       Message text."]
-pub type WINTUN_LOGGER_CALLBACK = ::std::option::Option<
-    unsafe extern "C" fn(Level: WINTUN_LOGGER_LEVEL, Timestamp: DWORD64, Message: LPCWSTR),
->;
-#[repr(C)]
-#[derive(Debug, Copy, Clone)]
-pub struct _TUN_SESSION {
-    _unused: [u8; 0],
-}
-#[doc = " A handle representing Wintun session"]
-pub type WINTUN_SESSION_HANDLE = *mut _TUN_SESSION;
-extern crate libloading;
-pub struct wintun {
-    __library: ::libloading::Library,
-    pub WintunCreateAdapter: unsafe extern "C" fn(
-        arg1: LPCWSTR,
-        arg2: LPCWSTR,
-        arg3: *const GUID,
-    ) -> WINTUN_ADAPTER_HANDLE,
-    pub WintunCloseAdapter: unsafe extern "C" fn(arg1: WINTUN_ADAPTER_HANDLE),
-    pub WintunOpenAdapter: unsafe extern "C" fn(arg1: LPCWSTR) -> WINTUN_ADAPTER_HANDLE,
-    pub WintunGetAdapterLUID:
-        unsafe extern "C" fn(arg1: WINTUN_ADAPTER_HANDLE, arg2: *mut NET_LUID),
-    pub WintunGetRunningDriverVersion: unsafe extern "C" fn() -> DWORD,
-    pub WintunDeleteDriver: unsafe extern "C" fn() -> BOOL,
-    pub WintunSetLogger: unsafe extern "C" fn(arg1: WINTUN_LOGGER_CALLBACK),
-    pub WintunStartSession:
-        unsafe extern "C" fn(arg1: WINTUN_ADAPTER_HANDLE, arg2: DWORD) -> WINTUN_SESSION_HANDLE,
-    pub WintunEndSession: unsafe extern "C" fn(arg1: WINTUN_SESSION_HANDLE),
-    pub WintunGetReadWaitEvent: unsafe extern "C" fn(arg1: WINTUN_SESSION_HANDLE) -> HANDLE,
-    pub WintunReceivePacket:
-        unsafe extern "C" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *mut DWORD) -> *mut BYTE,
-    pub WintunReleaseReceivePacket:
-        unsafe extern "C" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *const BYTE),
-    pub WintunAllocateSendPacket:
-        unsafe extern "C" fn(arg1: WINTUN_SESSION_HANDLE, arg2: DWORD) -> *mut BYTE,
-    pub WintunSendPacket: unsafe extern "C" fn(arg1: WINTUN_SESSION_HANDLE, arg2: *const BYTE),
-}
-impl wintun {
-    pub unsafe fn new<P>(path: P) -> Result<Self, ::libloading::Error>
-    where
-        P: AsRef<::std::ffi::OsStr>,
-    {
-        let library = ::libloading::Library::new(path)?;
-        Self::from_library(library)
-    }
-    pub unsafe fn from_library<L>(library: L) -> Result<Self, ::libloading::Error>
-    where
-        L: Into<::libloading::Library>,
-    {
-        let __library = library.into();
-        let WintunCreateAdapter = __library.get(b"WintunCreateAdapter\0").map(|sym| *sym)?;
-        let WintunCloseAdapter = __library.get(b"WintunCloseAdapter\0").map(|sym| *sym)?;
-        let WintunOpenAdapter = __library.get(b"WintunOpenAdapter\0").map(|sym| *sym)?;
-        let WintunGetAdapterLUID = __library.get(b"WintunGetAdapterLUID\0").map(|sym| *sym)?;
-        let WintunGetRunningDriverVersion = __library
-            .get(b"WintunGetRunningDriverVersion\0")
-            .map(|sym| *sym)?;
-        let WintunDeleteDriver = __library.get(b"WintunDeleteDriver\0").map(|sym| *sym)?;
-        let WintunSetLogger = __library.get(b"WintunSetLogger\0").map(|sym| *sym)?;
-        let WintunStartSession = __library.get(b"WintunStartSession\0").map(|sym| *sym)?;
-        let WintunEndSession = __library.get(b"WintunEndSession\0").map(|sym| *sym)?;
-        let WintunGetReadWaitEvent = __library.get(b"WintunGetReadWaitEvent\0").map(|sym| *sym)?;
-        let WintunReceivePacket = __library.get(b"WintunReceivePacket\0").map(|sym| *sym)?;
-        let WintunReleaseReceivePacket = __library
-            .get(b"WintunReleaseReceivePacket\0")
-            .map(|sym| *sym)?;
-        let WintunAllocateSendPacket = __library
-            .get(b"WintunAllocateSendPacket\0")
-            .map(|sym| *sym)?;
-        let WintunSendPacket = __library.get(b"WintunSendPacket\0").map(|sym| *sym)?;
-        Ok(wintun {
-            __library,
-            WintunCreateAdapter,
-            WintunCloseAdapter,
-            WintunOpenAdapter,
-            WintunGetAdapterLUID,
-            WintunGetRunningDriverVersion,
-            WintunDeleteDriver,
-            WintunSetLogger,
-            WintunStartSession,
-            WintunEndSession,
-            WintunGetReadWaitEvent,
-            WintunReceivePacket,
-            WintunReleaseReceivePacket,
-            WintunAllocateSendPacket,
-            WintunSendPacket,
-        })
-    }
-    pub unsafe fn WintunCreateAdapter(
-        &self,
-        arg1: LPCWSTR,
-        arg2: LPCWSTR,
-        arg3: *const GUID,
-    ) -> WINTUN_ADAPTER_HANDLE {
-        (self.WintunCreateAdapter)(arg1, arg2, arg3)
-    }
-    pub unsafe fn WintunCloseAdapter(&self, arg1: WINTUN_ADAPTER_HANDLE) -> () {
-        (self.WintunCloseAdapter)(arg1)
-    }
-    pub unsafe fn WintunOpenAdapter(&self, arg1: LPCWSTR) -> WINTUN_ADAPTER_HANDLE {
-        (self.WintunOpenAdapter)(arg1)
-    }
-    pub unsafe fn WintunGetAdapterLUID(
-        &self,
-        arg1: WINTUN_ADAPTER_HANDLE,
-        arg2: *mut NET_LUID,
-    ) -> () {
-        (self.WintunGetAdapterLUID)(arg1, arg2)
-    }
-    pub unsafe fn WintunGetRunningDriverVersion(&self) -> DWORD {
-        (self.WintunGetRunningDriverVersion)()
-    }
-    pub unsafe fn WintunDeleteDriver(&self) -> BOOL {
-        (self.WintunDeleteDriver)()
-    }
-    pub unsafe fn WintunSetLogger(&self, arg1: WINTUN_LOGGER_CALLBACK) -> () {
-        (self.WintunSetLogger)(arg1)
-    }
-    pub unsafe fn WintunStartSession(
-        &self,
-        arg1: WINTUN_ADAPTER_HANDLE,
-        arg2: DWORD,
-    ) -> WINTUN_SESSION_HANDLE {
-        (self.WintunStartSession)(arg1, arg2)
-    }
-    pub unsafe fn WintunEndSession(&self, arg1: WINTUN_SESSION_HANDLE) -> () {
-        (self.WintunEndSession)(arg1)
-    }
-    pub unsafe fn WintunGetReadWaitEvent(&self, arg1: WINTUN_SESSION_HANDLE) -> HANDLE {
-        (self.WintunGetReadWaitEvent)(arg1)
-    }
-    pub unsafe fn WintunReceivePacket(
-        &self,
-        arg1: WINTUN_SESSION_HANDLE,
-        arg2: *mut DWORD,
-    ) -> *mut BYTE {
-        (self.WintunReceivePacket)(arg1, arg2)
-    }
-    pub unsafe fn WintunReleaseReceivePacket(
-        &self,
-        arg1: WINTUN_SESSION_HANDLE,
-        arg2: *const BYTE,
-    ) -> () {
-        (self.WintunReleaseReceivePacket)(arg1, arg2)
-    }
-    pub unsafe fn WintunAllocateSendPacket(
-        &self,
-        arg1: WINTUN_SESSION_HANDLE,
-        arg2: DWORD,
-    ) -> *mut BYTE {
-        (self.WintunAllocateSendPacket)(arg1, arg2)
-    }
-    pub unsafe fn WintunSendPacket(&self, arg1: WINTUN_SESSION_HANDLE, arg2: *const BYTE) -> () {
-        (self.WintunSendPacket)(arg1, arg2)
-    }
-}