suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-15 22:27:26 +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

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))