Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1435 from yourowncrypto/fix-peer-ban

Browse source 
Fix non-atomic peer update
This commit is contained in:
hashmap 2018-08-28 15:58:23 +02:00 committed by GitHub
commit 3dacc6a397
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
p2p/src/peers.rs
View file

@ -109,7 +109,8 @@ impl Peers {
/// Get vec of peers we are currently connected to. /// Get vec of peers we are currently connected to.
pub fn connected_peers(&self) -> Vec<Arc<RwLock<Peer>>> { pub fn connected_peers(&self) -> Vec<Arc<RwLock<Peer>>> {
let mut res = self.peers let mut res = self
.peers
.read() .read()
.unwrap() .unwrap()
.values() .values()
@ -254,13 +255,6 @@ impl Peers {
error!(LOGGER, "Couldn't ban {}: {:?}", peer_addr, e); error!(LOGGER, "Couldn't ban {}: {:?}", peer_addr, e);
} }
if let Err(e) = self.update_last_banned(*peer_addr, Utc::now().timestamp()) {
error!(
LOGGER,
"Couldn't update last_banned time {}: {:?}", peer_addr, e
);
}
if let Some(peer) = self.get_connected_peer(peer_addr) { if let Some(peer) = self.get_connected_peer(peer_addr) {
debug!(LOGGER, "Banning peer {}", peer_addr); debug!(LOGGER, "Banning peer {}", peer_addr);
// setting peer status will get it removed at the next clean_peer // setting peer status will get it removed at the next clean_peer
@ -443,13 +437,6 @@ impl Peers {
.map_err(From::from) .map_err(From::from)
} }
/// Updates the last banned time of a peer in store
pub fn update_last_banned(&self, peer_addr: SocketAddr, last_banned: i64) -> Result<(), Error> {
self.store
.update_last_banned(peer_addr, last_banned)
.map_err(From::from)
}
/// Iterate over the peer list and prune all peers we have /// Iterate over the peer list and prune all peers we have
/// lost connection to or have been deemed problematic. /// lost connection to or have been deemed problematic.
/// Also avoid connected peer count getting too high. /// Also avoid connected peer count getting too high.

24
p2p/src/store.rs
View file

@ -14,6 +14,7 @@
//! Storage implementation for peer data. //! Storage implementation for peer data.
use chrono::Utc;
use num::FromPrimitive; use num::FromPrimitive;
use rand::{thread_rng, Rng}; use rand::{thread_rng, Rng};
use std::net::SocketAddr; use std::net::SocketAddr;
@ -137,7 +138,8 @@ impl PeerStore {
} }
pub fn find_peers(&self, state: State, cap: Capabilities, count: usize) -> Vec<PeerData> { pub fn find_peers(&self, state: State, cap: Capabilities, count: usize) -> Vec<PeerData> {
let mut peers = self.db let mut peers = self
.db
.iter::<PeerData>(&to_key(PEER_PREFIX, &mut "".to_string().into_bytes())) .iter::<PeerData>(&to_key(PEER_PREFIX, &mut "".to_string().into_bytes()))
.unwrap() .unwrap()
.filter(|p| p.flags == state && p.capabilities.contains(cap)) .filter(|p| p.flags == state && p.capabilities.contains(cap))
@ -154,19 +156,21 @@ impl PeerStore {
} }
/// Convenience method to load a peer data, update its status and save it /// Convenience method to load a peer data, update its status and save it
/// back. /// back. If new state is Banned its last banned time will be updated too.
pub fn update_state(&self, peer_addr: SocketAddr, new_state: State) -> Result<(), Error> { pub fn update_state(&self, peer_addr: SocketAddr, new_state: State) -> Result<(), Error> {
let mut peer = self.get_peer(peer_addr)?; let batch = self.db.batch()?;
let mut peer = option_to_not_found(
batch.get_ser::<PeerData>(&peer_key(peer_addr)[..]),
&format!("Peer at address: {}", peer_addr),
)?;
peer.flags = new_state; peer.flags = new_state;
self.save_peer(&peer) if new_state == State::Banned {
peer.last_banned = Utc::now().timestamp();
} }
/// Convenience method to load a peer data, update its last banned time and batch.put_ser(&peer_key(peer.addr)[..], &peer)?;
/// save it back. batch.commit()
pub fn update_last_banned(&self, peer_addr: SocketAddr, last_banned: i64) -> Result<(), Error> {
let mut peer = self.get_peer(peer_addr)?;
peer.last_banned = last_banned;
self.save_peer(&peer)
} }
} }