yeyinlaoying/vnt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加打洞选项

Browse Source
This commit is contained in:
lubeilin
2023-09-04 20:34:43 +08:00
parent 954f0d2d05
commit 073c820da6
5 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vnt-cli/src/main.rs
+16 -2
View File
@@ -11,6 +11,7 @@ use tokio::signal;
use tokio::signal::unix::{signal, SignalKind};
use common::args_parse::{ips_parse, out_ips_parse};
use vnt::channel::punch::PunchModel;
use vnt::cipher::CipherModel;
use vnt::core::{Config, Vnt, VntUtil};
use vnt::handle::handshake_handler::HandshakeEnum;
@@ -55,6 +56,12 @@ fn main() {
opts.optopt("", "thread", "线程数(必须为正整数)", "<thread>");
opts.optopt("", "model", "加密模式", "<model>");
opts.optflag("", "finger", "指纹校验");
opts.optopt(
"",
"punch",
"取值ipv4/ipv6，表示仅使用ipv4或ipv6打洞",
"<punch>",
);
//"后台运行时,查看其他设备列表"
opts.optflag("", "list", "后台运行时,查看其他设备列表");
opts.optflag("", "all", "后台运行时,查看其他设备完整信息");
@@ -220,6 +227,10 @@ fn main() {
return;
}
let finger = matches.opt_present("finger");
let punch_model = matches
.opt_get::<PunchModel>("punch")
.unwrap()
.unwrap_or(PunchModel::All);
println!("version {}", vnt::VNT_VERSION);
let config = Config::new(
tap,
@@ -241,6 +252,7 @@ fn main() {
parallel,
cipher_model,
finger,
punch_model,
);
let runtime = tokio::runtime::Builder::new_multi_thread()
.enable_all()
@@ -361,12 +373,12 @@ async fn main0(config: Config, show_cmd: bool) {
println!("command error :{}", e);
}
});
#[cfg(unix)]
let mut sigterm = signal(SignalKind::terminate()).expect("Error setting SIGTERM handler");
if show_cmd {
let stdin = tokio::io::stdin();
let mut cmd = String::new();
let mut reader = BufReader::new(stdin);
#[cfg(unix)]
let mut sigterm = signal(SignalKind::terminate()).expect("Error setting SIGTERM handler");
loop {
cmd.clear();
println!("input:list,info,route,all,stop");
@@ -504,6 +516,8 @@ fn print_usage(program: &str, _opts: Options) {
println!(" --thread <thread> 线程数(必须为正整数),默认为核心数乘2");
println!(" --model <model> 加密模式(默认aes_gcm)，可选值aes_gcm/aes_cbc/aes_ecb，通常性能aes_ecb>aes_cbc>aes_gcm,安全性则相反");
println!(" --finger 增加数据指纹校验，可增加安全性，如果服务端开启指纹校验，则客户端也必须开启");
println!(" --punch <punch> 取值ipv4/ipv6，ipv4表示仅使用ipv4打洞");
println!();
println!(
" --list {}",
vnt-jni/src/vnt_util.rs
+2
View File
@@ -8,6 +8,7 @@ use jni::objects::{JClass, JObject, JString, JValue};
use jni::sys::jboolean;
use jni::sys::{jint, jlong, jobject};
use jni::JNIEnv;
use vnt::channel::punch::PunchModel;
use vnt::cipher::CipherModel;
use vnt::core::sync::VntUtilSync;
use vnt::core::Config;
@@ -117,6 +118,7 @@ fn new_sync(env: &mut JNIEnv, config: JObject) -> Result<VntUtilSync, Error> {
1,
cipher_model,
finger,
PunchModel::All,
);
match VntUtilSync::new(config) {
Ok(vnt_util) => Ok(vnt_util),
vnt/src/channel/punch.rs
+30 -2
View File
@@ -1,12 +1,32 @@
use std::collections::HashMap;
use std::io;
use std::net::{Ipv4Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
use std::str::FromStr;
use std::time::Duration;
use rand::prelude::SliceRandom;
use crate::channel::channel::Context;
#[derive(Copy, Clone, Eq, PartialEq, Debug)]
pub enum PunchModel {
IPv4,
IPv6,
All,
}
impl FromStr for PunchModel {
type Err = String;
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s.to_lowercase().trim() {
"ipv4" => Ok(PunchModel::IPv4),
"ipv6" => Ok(PunchModel::IPv6),
_ => Ok(PunchModel::All),
}
}
}
#[derive(Clone, Debug)]
pub struct NatInfo {
pub public_ips: Vec<Ipv4Addr>,
@@ -49,10 +69,11 @@ pub struct Punch {
context: Context,
port_vec: Vec<u16>,
port_index: HashMap<Ipv4Addr, usize>,
punch_model: PunchModel,
}
impl Punch {
pub fn new(context: Context) -> Self {
pub fn new(context: Context, punch_model: PunchModel) -> Self {
let mut port_vec: Vec<u16> = (1..65535).collect();
port_vec.push(65535);
let mut rng = rand::thread_rng();
@@ -61,6 +82,7 @@ impl Punch {
context,
port_vec,
port_index: HashMap::new(),
punch_model,
}
}
}
@@ -76,12 +98,18 @@ impl Punch {
.send_main_udp(buf, SocketAddr::V4(nat_info.local_ipv4_addr))
.await;
}
if !nat_info.ipv6_addr.ip().is_unspecified() && nat_info.ipv6_addr.port() != 0 {
if self.punch_model != PunchModel::IPv4
&& !nat_info.ipv6_addr.ip().is_unspecified()
&& nat_info.ipv6_addr.port() != 0
{
let rs = self
.context
.send_main_udp(buf, SocketAddr::V6(nat_info.ipv6_addr))
.await;
log::info!("发送到ipv6地址:{:?},rs={:?}", nat_info.ipv6_addr, rs);
if rs.is_ok() && self.punch_model == PunchModel::IPv6 {
return Ok(());
}
}
match nat_info.nat_type {
NatType::Symmetric => {
vnt/src/core/mod.rs
+5 -4
View File
@@ -12,7 +12,7 @@ use tokio::sync::mpsc::channel;
use crate::channel::channel::{Channel, Context};
use crate::channel::idle::Idle;
use crate::channel::punch::{NatInfo, Punch};
use crate::channel::punch::{NatInfo, Punch, PunchModel};
use crate::channel::sender::ChannelSender;
use crate::channel::{Route, RouteKey};
use crate::cipher::{Cipher, CipherModel, RsaCipher};
@@ -164,14 +164,12 @@ impl VntUtil {
Some(res) => res,
};
let device_type = if self.config.tap {
#[cfg(windows)]
{
//删除tun网卡避免ip冲突，因为非正常退出会保留网卡
tun_tap_device::delete_device(tun_tap_device::DeviceType::Tun);
}
tun_tap_device::DeviceType::Tap
} else {
#[cfg(windows)]
{
//删除tap网卡避免ip冲突，非正常退出会保留网卡
tun_tap_device::delete_device(tun_tap_device::DeviceType::Tap);
@@ -253,7 +251,7 @@ impl VntUtil {
current_device.clone(),
1,
);
let punch = Punch::new(context.clone());
let punch = Punch::new(context.clone(), config.punch_model);
let idle = Idle::new(Duration::from_secs(16), context.clone());
let channel_sender = ChannelSender::new(context.clone());
@@ -553,6 +551,7 @@ pub struct Config {
pub parallel: usize,
pub cipher_model: CipherModel,
pub finger: bool,
pub punch_model: PunchModel,
}
impl Config {
@@ -576,6 +575,7 @@ impl Config {
parallel: usize,
cipher_model: CipherModel,
finger: bool,
punch_model: PunchModel,
) -> Self {
for x in stun_server.iter_mut() {
if !x.contains(":") {
@@ -602,6 +602,7 @@ impl Config {
parallel,
cipher_model,
finger,
punch_model,
}
}
}
vnt/src/handle/punch_handler.rs
+2 -1
View File
@@ -135,7 +135,8 @@ async fn start_punch_(
current_device.virtual_ip(),
&nat_info,
info.virtual_ip,
)?;
)
.unwrap();
let _ = sender
.send_main(packet.buffer(), current_device.connect_server)
.await;