suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 05:37:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix rpc packet route before first route info exchange (#516)

Browse Source 
* fix rpc packet route before first route info exchange
* fix install script
* update config server help
This commit is contained in:
Sijie.Sun
2024-12-19 09:25:25 +08:00
committed by GitHub
parent c4d8ea4fec
commit 4bb72b5606
9 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
easytier/src/connector/udp_hole_punch/common.rs
View File

@@ -26,7 +26,7 @@ use crate::{
},
};
pub(crate) const HOLE_PUNCH_PACKET_BODY_LEN: u16 = 32;
pub(crate) const HOLE_PUNCH_PACKET_BODY_LEN: u16 = 16;
fn generate_shuffled_port_vec() -> Vec<u16> {
let mut rng = rand::thread_rng();

9
easytier/src/easytier-core.rs
View File

@@ -783,12 +783,9 @@ async fn run_main(cli: Cli) -> anyhow::Result<()> {
let config_server_url_s = cli.config_server.clone().unwrap();
let config_server_url = match url::Url::parse(&config_server_url_s) {
Ok(u) => u,
Err(_) => format!(
"udp://config-server.easytier.top:22020/{}",
config_server_url_s
)
.parse()
.unwrap(),
Err(_) => format!("udp://easytier.cn:22020/{}", config_server_url_s)
.parse()
.unwrap(),
};
let mut c_url = config_server_url.clone();

10
easytier/src/peers/peer_manager.rs
View File

@@ -79,7 +79,12 @@ impl PeerRpcManagerTransport for RpcTransport {
async fn send(&self, mut msg: ZCPacket, dst_peer_id: PeerId) -> Result<(), Error> {
let peers = self.peers.upgrade().ok_or(Error::Unknown)?;
if !peers.need_relay_by_foreign_network(dst_peer_id).await? {
// NOTE: if route info is not exchanged, this will return error. treat it as need relay
if !peers
.need_relay_by_foreign_network(dst_peer_id)
.await
.unwrap_or(true)
{
self.encryptor
.encrypt(&mut msg)
.with_context(|| "encrypt failed")?;
@@ -706,6 +711,9 @@ impl PeerManager {
);
Err(Error::RouteError(None))
}
} else if foreign_network_client.has_next_hop(dst_peer_id) {
// check foreign network again. so in happy path we can avoid extra check
foreign_network_client.send_msg(msg, dst_peer_id).await
} else {
tracing::debug!(?dst_peer_id, "no gateway for peer");
Err(Error::RouteError(None))

4
easytier/src/peers/peer_ospf_route.rs
View File

@@ -1395,7 +1395,7 @@ impl PeerRouteServiceImpl {
let my_peer_id = self.my_peer_id;
let (peer_infos, conn_bitmap, foreign_network) = self.build_sync_request(&session);
tracing::info!(?foreign_network, "building sync_route request. my_id {:?}, pper_id: {:?}, peer_infos: {:?}, conn_bitmap: {:?}, synced_route_info: {:?} session: {:?}",
tracing::trace!(?foreign_network, "building sync_route request. my_id {:?}, pper_id: {:?}, peer_infos: {:?}, conn_bitmap: {:?}, synced_route_info: {:?} session: {:?}",
my_peer_id, dst_peer_id, peer_infos, conn_bitmap, self.synced_route_info, session);
if peer_infos.is_none()
@@ -1683,7 +1683,7 @@ impl RouteSessionManager {
.map(|x| *x)
.collect::<Vec<_>>();
tracing::debug!(?service_impl.my_peer_id, ?peers, ?session_peers, ?initiator_candidates, "maintain_sessions begin");
tracing::trace!(?service_impl.my_peer_id, ?peers, ?session_peers, ?initiator_candidates, "maintain_sessions begin");
if initiator_candidates.is_empty() {
next_sleep_ms = 1000;

2
easytier/src/tunnel/udp.rs
View File

@@ -658,7 +658,7 @@ impl UdpTunnelConnector {
return;
}
_ = udp_recv_from_socket_forward_task(socket_clone,false, |zc_packet, addr| {
tracing::debug!(?addr, "connector udp forward task done");
tracing::trace!(?addr, "connector udp forward task done");
if let Err(e) = udp_conn.handle_packet_from_remote(zc_packet) {
tracing::trace!(?e, ?addr, "udp forward packet error");
}