diff --git a/Cargo.lock b/Cargo.lock index 0f9ed98..c9e5943 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -307,7 +307,7 @@ dependencies = [ [[package]] name = "common" -version = "1.2.11" +version = "1.2.12" dependencies = [ "anyhow", "chrono", @@ -881,7 +881,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsm" version = "0.5.1" -source = "git+https://github.com/lbl8603/libsm#f9e1b8cf20d0829efb4934a940d0ba4f3ee0ac14" +source = "git+https://github.com/vnt-dev/libsm#f9e1b8cf20d0829efb4934a940d0ba4f3ee0ac14" dependencies = [ "byteorder", "getrandom", @@ -955,7 +955,7 @@ dependencies = [ [[package]] name = "lwip-rs" version = "0.1.0" -source = "git+https://github.com/lbl8603/lwip-rs#3133f0c3bde55333a27641182ae3550e7acc2a39" +source = "git+https://github.com/vnt-dev/lwip-rs#3133f0c3bde55333a27641182ae3550e7acc2a39" dependencies = [ "bindgen", "cc", @@ -1121,7 +1121,7 @@ dependencies = [ [[package]] name = "openssl-sys" version = "0.9.93" -source = "git+https://github.com/lbl8603/rust-openssl#e8b3d2c02d2d07a0e4a82ff4e4bef210f4bc71c8" +source = "git+https://github.com/vnt-dev/rust-openssl#e8b3d2c02d2d07a0e4a82ff4e4bef210f4bc71c8" dependencies = [ "cc", "libc", @@ -2105,7 +2105,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vn-link" -version = "1.2.11" +version = "1.2.12" dependencies = [ "anyhow", "crossbeam-utils", @@ -2118,7 +2118,7 @@ dependencies = [ [[package]] name = "vn-link-cli" -version = "1.2.11" +version = "1.2.12" dependencies = [ "common", "log", @@ -2128,7 +2128,7 @@ dependencies = [ [[package]] name = "vnt" -version = "1.2.11" +version = "1.2.12" dependencies = [ "aes", "aes-gcm", @@ -2175,7 +2175,7 @@ dependencies = [ [[package]] name = "vnt-cli" -version = "1.2.11" +version = "1.2.12" dependencies = [ "anyhow", "chrono", diff --git a/README.md b/README.md index 26a92ba..a1006bc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A virtual network tool (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) ### 快速使用： @@ -39,7 +39,7 @@ A virtual network tool (VPN) ``` 4. 最后可以用虚拟ip实现设备间相互访问 - ssh + ssh 5. 帮助，使用-h命令查看 ### 更多玩法 @@ -56,7 +56,7 @@ A virtual network tool (VPN) - 需要root/管理员权限 - vnt-cli需要使用命令行运行 - Mac和Linux下需要加可执行权限(例如:chmod +x ./vnt-cli) -- 可以自己搭注册和中继服务器([server](https://github.com/lbl8603/vnts)) +- 可以自己搭注册和中继服务器([server](https://github.com/vnt-dev/vnts)) - vnt使用stun服务器探测网络NAT类型，默认使用谷歌和腾讯的stun服务器，也可自己搭建(-e参数指定) ### 编译 @@ -181,7 +181,7 @@ sudo pfctl -f /etc/pf.conf -e ### GUI -支持安卓和Windows [下载](https://github.com/lbl8603/VntApp/releases/) +支持安卓和Windows [下载](https://github.com/vnt-dev/VntApp/releases/) ### 特性 @@ -291,7 +291,7 @@ QQ: 1034868233 ### 赞助 如果VNT对你有帮助，欢迎打赏作者 - + ### 其他 @@ -302,6 +302,6 @@ QQ: 1034868233 ### 参与贡献 - - + + diff --git a/common/Cargo.toml b/common/Cargo.toml index fae5719..e7dd42b 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common" -version = "1.2.11" +version = "1.2.12" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vn-link-cli/Cargo.toml b/vn-link-cli/Cargo.toml index e4e3559..9f8ada2 100644 --- a/vn-link-cli/Cargo.toml +++ b/vn-link-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vn-link-cli" -version = "1.2.11" +version = "1.2.12" edition = "2021" [dependencies] diff --git a/vn-link/Cargo.toml b/vn-link/Cargo.toml index 5e44997..476a804 100644 --- a/vn-link/Cargo.toml +++ b/vn-link/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "vn-link" -version = "1.2.11" +version = "1.2.12" edition = "2021" [dependencies] -lwip-rs = { git = "https://github.com/lbl8603/lwip-rs" } +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" diff --git a/vnt-cli/Cargo.toml b/vnt-cli/Cargo.toml index f4675e4..5d4c665 100644 --- a/vnt-cli/Cargo.toml +++ b/vnt-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vnt-cli" -version = "1.2.11" +version = "1.2.12" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vnt-cli/README.md b/vnt-cli/README.md index 92518ae..69da1df 100644 --- a/vnt-cli/README.md +++ b/vnt-cli/README.md @@ -135,7 +135,7 @@ aes_gcm/aes_cbc/aes_ecb/sm4_cbc/chacha20_poly1305/chacha20/xor，默认使用aes ### --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>` @@ -201,6 +201,8 @@ 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是必须的 @@ -223,6 +225,14 @@ token: xxx #组网token 模拟延迟,整数,单位毫秒(ms),程序会按设定的值延迟发包,可用于模拟弱网 +### --disable-stats + +关闭流量统计 + +### --allow-wg + +允许接入WireGuard客户端，和wg混用时必须开启此参数 + ### --list 在后台运行时,查看其他设备列表 diff --git a/vnt/Cargo.toml b/vnt/Cargo.toml index dd95ec4..63d8c8a 100644 --- a/vnt/Cargo.toml +++ b/vnt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vnt" -version = "1.2.11" +version = "1.2.12" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -29,8 +29,8 @@ 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 } +openssl-sys = { git = "https://github.com/vnt-dev/rust-openssl", optional = true } +libsm = { git = "https://github.com/vnt-dev/libsm", optional = true } mio = { version = "=0.8.11", features = ["os-poll", "net", "os-ext"] } crossbeam-queue = "0.3.11"