diff --git a/common/Cargo.toml b/common/Cargo.toml index 35afc09..0313b82 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "common" -version = "1.1.1" +version = "1.1.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vnt-cli/Cargo.toml b/vnt-cli/Cargo.toml index 558599d..10c5c43 100644 --- a/vnt-cli/Cargo.toml +++ b/vnt-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vnt-cli" -version = "1.1.1" +version = "1.1.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vnt-cli/src/main.rs b/vnt-cli/src/main.rs index 20ed551..d4c09d9 100644 --- a/vnt-cli/src/main.rs +++ b/vnt-cli/src/main.rs @@ -31,7 +31,6 @@ async fn main0() { let args: Vec = std::env::args().collect(); let program = args[0].clone(); let mut opts = Options::new(); - opts.long_only(false); opts.optopt("k", "", &format!("{}", green("必选,使用相同的token,就能组建一个局域网络".to_string())), ""); opts.optopt("n", "", "给设备一个名字,默认使用系统版本", ""); opts.optopt("d", "", "设备唯一标识符,不使用--ip参数时,服务端凭此参数分配ip", ""); @@ -39,8 +38,8 @@ async fn main0() { opts.optopt("s", "", "注册和中继服务器地址", ""); opts.optopt("e", "", "NAT探测服务器地址,使用逗号分隔", ""); opts.optflag("a", "", "使用tap模式,默认使用tun模式"); - opts.optmulti("i", "", "配置点对网(IP代理)时使用,-i 192.168.0.0/24,10.26.0.3,表示允许接收网段192.168.0.0/24的数据并转发到10.26.0.3", ""); - opts.optmulti("o", "", "配置点对网时使用,-o 192.168.0.0/24,192.168.0.10,表示允许目标为192.168.0.0/24的数据从网卡192.168.0.10转发出去", ""); + opts.optmulti("i", "", "配置点对网(IP代理)时使用,-i 192.168.0.0/24,10.26.0.3 \n表示允许接收网段192.168.0.0/24的数据并转发到10.26.0.3", ""); + opts.optmulti("o", "", "配置点对网时使用,-o 192.168.0.0/24,192.168.0.10 \n表示允许目标为192.168.0.0/24的数据从网卡192.168.0.10转发出去,不指定出口地址则使用默认网卡", ""); opts.optopt("w", "", "使用该密码生成的密钥对客户端数据进行加密,并且服务端无法解密,使用相同密码的客户端才能通信", ""); opts.optflag("m", "", "模拟组播,默认情况下组播数据会被当作广播发送,开启后会模拟真实组播的数据发送"); opts.optopt("u", "", "虚拟网卡mtu值", ""); @@ -310,7 +309,7 @@ async fn main0() { fn print_usage(program: &str, opts: Options) { let brief = format!("Usage: {} [options]", program); - println!("version:1.1.1"); + println!("version:1.1.2"); println!("{}", opts.usage(&brief)); } diff --git a/vnt/Cargo.toml b/vnt/Cargo.toml index 66212df..fced49d 100644 --- a/vnt/Cargo.toml +++ b/vnt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vnt" -version = "1.1.1" +version = "1.1.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vnt/src/handle/registration_handler.rs b/vnt/src/handle/registration_handler.rs index 36130fe..df9f162 100644 --- a/vnt/src/handle/registration_handler.rs +++ b/vnt/src/handle/registration_handler.rs @@ -178,7 +178,7 @@ fn registration_request_packet( request.virtual_ip = ip.into(); request.allow_ip_change = allow_ip_change; request.is_fast = is_fast; - request.version = "1.1.1".to_string(); + request.version = "1.1.2".to_string(); let bytes = request.write_to_bytes()?; let buf = vec![0u8; 12 + bytes.len()]; let mut net_packet = NetPacket::new(buf)?;