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

完善tcp通道

Browse Source
This commit is contained in:
lubeilin
2023-08-27 14:07:35 +08:00
parent 0472b1590e
commit 7b770a1bb0
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vnt/src/channel/channel.rs
+3
View File
@@ -68,6 +68,9 @@ impl Context {
pub fn close(&self) {
let _ = self.inner.status_sender.send(Status::Close);
}
pub fn is_main_tcp(&self)->bool{
self.inner.main_tcp_channel.is_some()
}
pub fn switch(&self, nat_type: NatType) {
match nat_type {
NatType::Symmetric => {
vnt/src/handle/handshake_handler.rs
+3
View File
@@ -207,5 +207,8 @@ pub async fn secret_handshake_req(context: &Context,
server_address: SocketAddr, rsa_cipher: &RsaCipher, server_cipher: &Cipher, token: String, ) -> crate::Result<()> {
let secret_packet = secret_handshake_request_packet(rsa_cipher, token, server_cipher.key().unwrap())?;
context.send_main(secret_packet.buffer(), server_address).await?;
if context.is_main_tcp(){
context.send_main_udp(secret_packet.buffer(),server_address).await?;
}
Ok(())
}
vnt/src/handle/heartbeat_handler.rs
+7 -6
View File
@@ -71,7 +71,7 @@ pub fn start_heartbeat(
}
fn heartbeat_packet( device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,client_cipher: &Cipher, server_cipher: &Cipher, gateway: bool, src: Ipv4Addr, dest: Ipv4Addr) -> NetPacket<[u8; 48]> {
fn heartbeat_packet(device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>, client_cipher: &Cipher, server_cipher: &Cipher, gateway: bool, src: Ipv4Addr, dest: Ipv4Addr) -> NetPacket<[u8; 48]> {
let mut net_packet = NetPacket::new_encrypt([0u8; 12 + 4 + ENCRYPTION_RESERVED]).unwrap();
net_packet.set_version(Version::V1);
net_packet.set_protocol(Protocol::Control);
@@ -84,7 +84,7 @@ fn heartbeat_packet( device_list: &Mutex<(u16, Vec<PeerDeviceInfo>)>,client_ciph
let mut ping = PingPacket::new(net_packet.payload_mut()).unwrap();
let epoch = { device_list.lock().0 };
ping.set_epoch(epoch);
ping.set_time( crate::handle::now_time() as u16);
ping.set_time(crate::handle::now_time() as u16);
}
if gateway {
net_packet.set_gateway_flag(true);
@@ -109,7 +109,8 @@ async fn start_heartbeat_(
return Ok(());
}
let mut current_dev = current_device.load();
if count % 20 == 2 {
//如果和服务端使用tcp连接，则维持udp洞的频率要更高些
if (sender.is_main_tcp() && count % 2 == 0) || (!sender.is_main_tcp() && count % 20 == 1) {
let mut packet = NetPacket::new_encrypt([0; 12 + ENCRYPTION_RESERVED])?;
packet.set_version(Version::V1);
packet.set_gateway_flag(true);
@@ -137,7 +138,7 @@ async fn start_heartbeat_(
}
}
let src = current_dev.virtual_ip();
let server_packet = heartbeat_packet(&device_list,&client_cipher, &server_cipher, true, src, current_dev.virtual_gateway);
let server_packet = heartbeat_packet(&device_list, &client_cipher, &server_cipher, true, src, current_dev.virtual_gateway);
if let Err(e) = sender.send_main(server_packet.buffer(), current_dev.connect_server).await
{
log::warn!(
@@ -153,7 +154,7 @@ async fn start_heartbeat_(
if peer.virtual_ip == current_dev.virtual_ip {
continue;
}
let client_packet = heartbeat_packet(&device_list,&client_cipher, &server_cipher, false, src, peer.virtual_ip);
let client_packet = heartbeat_packet(&device_list, &client_cipher, &server_cipher, false, src, peer.virtual_ip);
if let Some(route) = sender.route_one(&peer.virtual_ip) {
let _ = sender.send_by_key(client_packet.buffer(), &route.route_key()).await;
if route.is_p2p() {
@@ -190,7 +191,7 @@ async fn start_heartbeat_(
if peer_ip == &current_dev.virtual_gateway {
continue;
}
let client_packet = heartbeat_packet(&device_list,&client_cipher, &server_cipher, false, src, *peer_ip);
let client_packet = heartbeat_packet(&device_list, &client_cipher, &server_cipher, false, src, *peer_ip);
for route in route_list {
if let Err(e) = sender.send_by_key(client_packet.buffer(), &route.route_key()).await {
log::warn!("peer_ip:{:?},route:{:?},e:{:?}", peer_ip, route, e);
vnt/src/protocol/mod.rs
+2 -2
View File
@@ -6,7 +6,7 @@ use crate::protocol::body::ENCRYPTION_RESERVED;
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) |
|e |s |u |u| 版本(4) | 协议(8) | 上层协议(8) | 初始ttl(4) | 生存时间(4) |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| 源ip地址(32) |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -14,7 +14,7 @@ use crate::protocol::body::ENCRYPTION_RESERVED;
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
| 数据体 |
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
注：e为是否加密标志，s为服务端通信包标志
注：e为是否加密标志，s为服务端通信包标志，u未使用
*/