kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-05-25 10:12:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix timeout checks

Browse Source
This commit is contained in:
Jude Nelson
2020-05-17 01:02:31 -04:00
parent 9487011cce
commit 6d9fd825be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/p2p.rs
View File

@@ -1384,18 +1384,18 @@ impl PeerNetwork {
}
for (event_id, convo) in self.peers.iter() {
if convo.stats.last_handshake_time > 0 {
if convo.is_authenticated() {
// have handshaked with this remote peer
if convo.stats.last_contact_time + (convo.peer_heartbeat as u64) + NEIGHBOR_REQUEST_TIMEOUT < now {
// we haven't heard from this peer in too long a time
debug!("{:?}: Disconnect unresponsive authenticated peer {:?}", &self.local_peer, &convo);
debug!("{:?}: Disconnect unresponsive authenticated peer {:?}: {} + {} + {} < {}", &self.local_peer, &convo, convo.stats.last_contact_time, convo.peer_heartbeat, NEIGHBOR_REQUEST_TIMEOUT, now);
to_remove.push(*event_id);
}
}
else {
// have not handshaked with this remote peer
if convo.instantiated + self.connection_opts.handshake_timeout < now {
debug!("{:?}: Disconnect unresponsive unauthenticated peer {:?}", &self.local_peer, &convo);
debug!("{:?}: Disconnect unresponsive unauthenticated peer {:?}: {} + {} < {}", &self.local_peer, &convo, convo.instantiated, self.connection_opts.handshake_timeout, now);
to_remove.push(*event_id);
}
}
@@ -2053,7 +2053,7 @@ impl PeerNetwork {
continue;
}
debug!("{:?}: will ping back {:?} to see if it's routable from us", &self.local_peer, &nk);
debug!("{:?}: will ping back {:?} ({:?}) to see if it's routable from us", &self.local_peer, &nk, convo);
self.walk_pingbacks.insert(addr, NeighborPingback {
peer_version: nk.peer_version,
network_id: nk.network_id,