mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-05-07 10:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor sym to cone punch (#515)

Browse Source
This commit is contained in:
Sijie.Sun
2024-12-18 23:56:47 +08:00
committed by GitHub
parent 8588c9201a
commit c4d8ea4fec
3 changed files with 224 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/connector/udp_hole_punch/common.rs
+16 -7
View File
@@ -26,7 +26,7 @@ use crate::{
},
};
pub(crate) const HOLE_PUNCH_PACKET_BODY_LEN: u16 = 16;
pub(crate) const HOLE_PUNCH_PACKET_BODY_LEN: u16 = 32;
fn generate_shuffled_port_vec() -> Vec<u16> {
let mut rng = rand::thread_rng();
@@ -285,9 +285,16 @@ impl UdpSocketArray {
pub async fn send_with_all(&self, data: &[u8], addr: SocketAddr) -> Result<(), anyhow::Error> {
tracing::info!(?addr, "sending hole punching packet");
for socket in self.sockets.iter() {
let socket = socket.value();
socket.send_to(data, addr).await?;
let sockets = self
.sockets
.iter()
.map(|s| s.value().clone())
.collect::<Vec<_>>();
for socket in sockets.iter() {
for _ in 0..3 {
socket.send_to(data, addr).await?;
}
}
Ok(())
@@ -558,12 +565,14 @@ pub(crate) async fn send_symmetric_hole_punch_packet(
let port = ports[cur_port_idx % ports.len()];
for pub_ip in public_ips {
let addr = SocketAddr::V4(SocketAddrV4::new(*pub_ip, port));
let packet = new_hole_punch_packet(transaction_id, HOLE_PUNCH_PACKET_BODY_LEN);
udp.send_to(&packet.into_bytes(), addr).await?;
for _ in 0..3 {
let packet = new_hole_punch_packet(transaction_id, HOLE_PUNCH_PACKET_BODY_LEN);
udp.send_to(&packet.into_bytes(), addr).await?;
}
sent_packets += 1;
}
cur_port_idx = cur_port_idx.wrapping_add(1);
tokio::time::sleep(Duration::from_millis(3)).await;
tokio::time::sleep(Duration::from_millis(1)).await;
}
Ok(cur_port_idx % ports.len())
}