pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 19:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential panics related to time (#4951)

Browse Source 
* Fix potential peerset panic at initialization

* Also fix legacy_proto/behaviour.rs
This commit is contained in:
Pierre Krieger
2020-02-18 00:29:37 +01:00
committed by GitHub
parent e21bb380d4
commit d67994c561
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/protocol/legacy_proto/behaviour.rs
+6 -4
View File
@@ -379,12 +379,14 @@ impl LegacyProto {
}
};
let now = Instant::now();
match mem::replace(occ_entry.get_mut(), PeerState::Poisoned) {
PeerState::Banned { ref until } if *until > Instant::now() => {
PeerState::Banned { ref until } if *until > now => {
debug!(target: "sub-libp2p", "PSM => Connect({:?}): Will start to connect at \
until {:?}", occ_entry.key(), until);
*occ_entry.into_mut() = PeerState::PendingRequest {
timer: futures_timer::Delay::new(until.clone() - Instant::now()),
timer: futures_timer::Delay::new(until.clone() - now),
timer_deadline: until.clone(),
};
},
@@ -397,13 +399,13 @@ impl LegacyProto {
},
PeerState::Disabled { open, ref connected_point, banned_until: Some(ref banned) }
if *banned > Instant::now() => {
if *banned > now => {
debug!(target: "sub-libp2p", "PSM => Connect({:?}): Has idle connection through \
{:?} but node is banned until {:?}", occ_entry.key(), connected_point, banned);
*occ_entry.into_mut() = PeerState::DisabledPendingEnable {
connected_point: connected_point.clone(),
open,
timer: futures_timer::Delay::new(banned.clone() - Instant::now()),
timer: futures_timer::Delay::new(banned.clone() - now),
timer_deadline: banned.clone(),
};
},