mirror of
https://github.com/EasyTier/EasyTier.git
synced 2026-05-10 16:05:37 +00:00
fix dead loop in direct connecto if disable-p2p is enabled in dst (#1206)
This commit is contained in:
@@ -260,7 +260,7 @@ impl PunchBothEasySymHoleClient {
|
||||
)
|
||||
.await;
|
||||
|
||||
let remote_ret = handle_rpc_result(remote_ret, dst_peer_id, self.blacklist.clone())?;
|
||||
let remote_ret = handle_rpc_result(remote_ret, dst_peer_id, &self.blacklist)?;
|
||||
|
||||
if remote_ret.is_busy {
|
||||
*is_busy = true;
|
||||
|
||||
@@ -154,7 +154,7 @@ impl PunchConeHoleClient {
|
||||
)
|
||||
.await;
|
||||
|
||||
let resp = handle_rpc_result(resp, dst_peer_id, self.blacklist.clone())?;
|
||||
let resp = handle_rpc_result(resp, dst_peer_id, &self.blacklist)?;
|
||||
|
||||
let remote_mapped_addr = resp.listener_mapped_addr.ok_or(anyhow::anyhow!(
|
||||
"select_punch_listener response missing listener_mapped_addr"
|
||||
|
||||
@@ -183,7 +183,7 @@ impl BackOff {
|
||||
pub fn handle_rpc_result<T>(
|
||||
ret: Result<T, rpc_types::error::Error>,
|
||||
dst_peer_id: PeerId,
|
||||
blacklist: Arc<timedmap::TimedMap<PeerId, ()>>,
|
||||
blacklist: &timedmap::TimedMap<PeerId, ()>,
|
||||
) -> Result<T, rpc_types::error::Error> {
|
||||
match ret {
|
||||
Ok(ret) => Ok(ret),
|
||||
|
||||
@@ -437,7 +437,7 @@ impl PunchSymToConeHoleClient {
|
||||
)
|
||||
.await;
|
||||
|
||||
let resp = handle_rpc_result(resp, dst_peer_id, self.blacklist.clone())?;
|
||||
let resp = handle_rpc_result(resp, dst_peer_id, &self.blacklist)?;
|
||||
|
||||
let remote_mapped_addr = resp.listener_mapped_addr.ok_or(anyhow::anyhow!(
|
||||
"select_punch_listener response missing listener_mapped_addr"
|
||||
|
||||
Reference in New Issue
Block a user