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

完善1.2.2

Browse Source
This commit is contained in:
lubeilin
2023-09-03 20:58:48 +08:00
parent a943f5bffc
commit 954f0d2d05
7 changed files with 57 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/rust.yml
+14 -14
View File
@@ -110,40 +110,40 @@ jobs:
# some additional configuration for cross-compilation on linux # some additional configuration for cross-compilation on linux
cat >>~/.cargo/config <<EOF cat >>~/.cargo/config <<EOF
[target.x86_64-unknown-linux-musl] [target.x86_64-unknown-linux-musl]
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.aarch64-unknown-linux-gnu] [target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc" linker = "aarch64-linux-gnu-gcc"
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.aarch64-unknown-linux-musl] [target.aarch64-unknown-linux-musl]
linker = "aarch64-linux-gnu-gcc" linker = "aarch64-linux-gnu-gcc"
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.armv7-unknown-linux-gnueabihf] [target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc" linker = "arm-linux-gnueabihf-gcc"
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.armv7-unknown-linux-musleabihf] [target.armv7-unknown-linux-musleabihf]
linker = "arm-linux-gnueabihf-gcc" linker = "arm-linux-gnueabihf-gcc"
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.arm-unknown-linux-gnueabihf] [target.arm-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc" linker = "arm-linux-gnueabihf-gcc"
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.arm-unknown-linux-musleabihf] [target.arm-unknown-linux-musleabihf]
linker = "arm-linux-gnueabihf-gcc" linker = "arm-linux-gnueabihf-gcc"
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.mipsel-unknown-linux-musl] [target.mipsel-unknown-linux-musl]
linker = "mipsel-linux-gnu-gcc" linker = "mipsel-linux-gnu-gcc"
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.x86_64-pc-windows-msvc] [target.x86_64-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.i686-pc-windows-msvc] [target.i686-pc-windows-msvc]
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.x86_64-apple-darwin] [target.x86_64-apple-darwin]
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.aarch64-apple-darwin] [target.aarch64-apple-darwin]
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.i686-unknown-linux-musl] [target.i686-unknown-linux-musl]
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
[target.x86_64-unknown-linux-gnu] [target.x86_64-unknown-linux-gnu]
rustflags = ["-C", "target-feature=+crt-static","-C", "target-feature=+aes","--cfg","aes_armv8"] rustflags = ["-C", "target-feature=+crt-static","-C", "strip=symbols","--cfg","aes_armv8"]
EOF EOF
- name: Install rust target - name: Install rust target
run: rustup target add $TARGET run: rustup target add $TARGET
vnt-cli/src/command/entity.rs
+1
View File
@@ -29,6 +29,7 @@ pub struct DeviceItem {
pub nat_type: String, pub nat_type: String,
pub public_ips: String, pub public_ips: String,
pub local_ip: String, pub local_ip: String,
pub ipv6: String,
pub nat_traversal_type: String, pub nat_traversal_type: String,
pub rt: String, pub rt: String,
pub status: String, pub status: String,
vnt-cli/src/command/mod.rs
+5 -3
View File
@@ -81,16 +81,17 @@ pub fn command_list(vnt: &Vnt) -> Vec<DeviceItem> {
for peer in device_list { for peer in device_list {
let name = peer.name; let name = peer.name;
let virtual_ip = peer.virtual_ip.to_string(); let virtual_ip = peer.virtual_ip.to_string();
let (nat_type, public_ips, local_ip) = let (nat_type, public_ips, local_ip,ipv6) =
if let Some(nat_info) = vnt.peer_nat_info(&peer.virtual_ip) { if let Some(nat_info) = vnt.peer_nat_info(&peer.virtual_ip) {
let nat_type = format!("{:?}", nat_info.nat_type); let nat_type = format!("{:?}", nat_info.nat_type);
let public_ips: Vec<String> = let public_ips: Vec<String> =
nat_info.public_ips.iter().map(|v| v.to_string()).collect(); nat_info.public_ips.iter().map(|v| v.to_string()).collect();
let public_ips = public_ips.join(","); let public_ips = public_ips.join(",");
let local_ip = nat_info.local_ipv4_addr.ip().to_string(); let local_ip = nat_info.local_ipv4_addr.ip().to_string();
(nat_type, public_ips, local_ip) let ipv6 = nat_info.ipv6_addr.ip().to_string();
(nat_type, public_ips, local_ip,ipv6)
} else { } else {
("".to_string(), "".to_string(), "".to_string()) ("".to_string(), "".to_string(), "".to_string(), "".to_string())
}; };
let (nat_traversal_type, rt) = if let Some(route) = vnt.route(&peer.virtual_ip) { let (nat_traversal_type, rt) = if let Some(route) = vnt.route(&peer.virtual_ip) {
let nat_traversal_type = if route.metric == 1 { let nat_traversal_type = if route.metric == 1 {
@@ -118,6 +119,7 @@ pub fn command_list(vnt: &Vnt) -> Vec<DeviceItem> {
nat_type, nat_type,
public_ips, public_ips,
local_ip, local_ip,
ipv6,
nat_traversal_type, nat_traversal_type,
rt, rt,
status, status,
vnt-cli/src/console_out/mod.rs
+4
View File
@@ -125,6 +125,7 @@ pub fn console_device_list_all(mut list: Vec<DeviceItem>) {
("NAT Type".to_string(), Style::new()), ("NAT Type".to_string(), Style::new()),
("Public Ips".to_string(), Style::new()), ("Public Ips".to_string(), Style::new()),
("Local Ip".to_string(), Style::new()), ("Local Ip".to_string(), Style::new()),
("IPv6".to_string(), Style::new()),
]); ]);
for item in list { for item in list {
if &item.status == "Online" { if &item.status == "Online" {
@@ -138,6 +139,7 @@ pub fn console_device_list_all(mut list: Vec<DeviceItem>) {
(item.nat_type, Style::new().green()), (item.nat_type, Style::new().green()),
(item.public_ips, Style::new().green()), (item.public_ips, Style::new().green()),
(item.local_ip, Style::new().green()), (item.local_ip, Style::new().green()),
(item.ipv6, Style::new().green()),
]); ]);
} else { } else {
out_list.push(vec![ out_list.push(vec![
@@ -149,6 +151,7 @@ pub fn console_device_list_all(mut list: Vec<DeviceItem>) {
(item.nat_type, Style::new().yellow()), (item.nat_type, Style::new().yellow()),
(item.public_ips, Style::new().yellow()), (item.public_ips, Style::new().yellow()),
(item.local_ip, Style::new().yellow()), (item.local_ip, Style::new().yellow()),
(item.ipv6, Style::new().yellow()),
]); ]);
} }
} else { } else {
@@ -161,6 +164,7 @@ pub fn console_device_list_all(mut list: Vec<DeviceItem>) {
("".to_string(), Style::new().color256(102)), ("".to_string(), Style::new().color256(102)),
("".to_string(), Style::new().color256(102)), ("".to_string(), Style::new().color256(102)),
("".to_string(), Style::new().color256(102)), ("".to_string(), Style::new().color256(102)),
("".to_string(), Style::new().color256(102)),
]); ]);
} }
} }
vnt-cli/src/main.rs
+4 -3
View File
@@ -424,8 +424,9 @@ async fn main0(config: Config, show_cmd: bool) {
} }
} }
} }
#[cfg(unix)] }
tokio::select! { #[cfg(unix)]
tokio::select! {
_ = vnt.wait_stop()=>{ _ = vnt.wait_stop()=>{
return; return;
} }
@@ -439,8 +440,8 @@ async fn main0(config: Config, show_cmd: bool) {
vnt.wait_stop_ms(std::time::Duration::from_secs(3)).await; vnt.wait_stop_ms(std::time::Duration::from_secs(3)).await;
return; return;
} }
}
} }
#[cfg(windows)]
vnt.wait_stop().await; vnt.wait_stop().await;
} }
vnt/src/core/status.rs
+4 -3
View File
@@ -10,7 +10,7 @@ pub enum VntStatus {
} }
pub struct VntWorker { pub struct VntWorker {
_name: String, name: String,
wg: WaitGroup, wg: WaitGroup,
status_s: Arc<Sender<VntStatus>>, status_s: Arc<Sender<VntStatus>>,
status_r: Receiver<VntStatus>, status_r: Receiver<VntStatus>,
@@ -20,7 +20,7 @@ impl VntWorker {
pub fn worker(&self, name: &str) -> Self { pub fn worker(&self, name: &str) -> Self {
self.wg.add(); self.wg.add();
VntWorker { VntWorker {
_name: name.to_string(), name: name.to_string(),
wg: self.wg.clone(), wg: self.wg.clone(),
status_s: self.status_s.clone(), status_s: self.status_s.clone(),
status_r: self.status_r.clone(), status_r: self.status_r.clone(),
@@ -30,6 +30,7 @@ impl VntWorker {
impl Drop for VntWorker { impl Drop for VntWorker {
fn drop(&mut self) { fn drop(&mut self) {
log::info!("任务停止:{}", self.name);
self.wg.done(); self.wg.done();
} }
} }
@@ -82,7 +83,7 @@ impl VntStatusManger {
pub fn worker(&self, name: &str) -> VntWorker { pub fn worker(&self, name: &str) -> VntWorker {
self.wg.add(); self.wg.add();
VntWorker { VntWorker {
_name: name.to_string(), name: name.to_string(),
wg: self.wg.clone(), wg: self.wg.clone(),
status_s: self.status_s.clone(), status_s: self.status_s.clone(),
status_r: self.status_r.clone(), status_r: self.status_r.clone(),
vnt/src/handle/heartbeat_handler.rs
+25 -6
View File
@@ -178,17 +178,28 @@ async fn start_heartbeat_(
peer.virtual_ip, peer.virtual_ip,
); );
if let Some(route) = sender.route_one(&peer.virtual_ip) { if let Some(route) = sender.route_one(&peer.virtual_ip) {
let _ = sender if let Err(e) = sender
.send_by_key(client_packet.buffer(), &route.route_key()) .send_by_key(client_packet.buffer(), &route.route_key())
.await; .await
{
log::warn!("virtual_ip:{},route:{:?},e:{:?}", peer.virtual_ip, route, e);
}
if route.is_p2p() { if route.is_p2p() {
continue; continue;
} }
} else { } else {
//没有直连路由则发送到网关 //没有直连路由则发送到网关
let _ = sender if let Err(e) = sender
.send_main(client_packet.buffer(), current_dev.connect_server) .send_main(client_packet.buffer(), current_dev.connect_server)
.await; .await
{
log::warn!(
"virtual_ip:{},connect_server:{:?},e:{:?}",
peer.virtual_ip,
current_dev.connect_server,
e
);
}
} }
//再随机发送到其他地址，看有没有客户端符合转发条件 //再随机发送到其他地址，看有没有客户端符合转发条件
@@ -201,8 +212,16 @@ async fn start_heartbeat_(
'a: for (peer_ip, route_list) in route_list.iter() { 'a: for (peer_ip, route_list) in route_list.iter() {
for route in route_list { for route in route_list {
if peer_ip != &peer.virtual_ip && route.is_p2p() { if peer_ip != &peer.virtual_ip && route.is_p2p() {
let _ = if let Err(e) =
sender.try_send_by_key(client_packet.buffer(), &route.route_key()); sender.try_send_by_key(client_packet.buffer(), &route.route_key())
{
log::warn!(
"virtual_ip:{},route:{:?},e:{:?}",
peer.virtual_ip,
route,
e
);
}
num += 1; num += 1;
break; break;
} }