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

Allow to have more than min_peers/2 outbound peers (#2537)

Browse source 
* Allow to have more than min_peers/2 outbound peers

Default value is 8, so we allow only 4 outbound peers, unfortunately if a node is behind NAT it can't get inbound peers and it stucks with 4 peers as maximum.
This PR allows a number of outbound peers to be between min_peers and max_peers/2. Node behind NAT will eventually have just min_peers number of peers.

* Extract into healthy_peers_mix function
This commit is contained in:
hashmap 2019-02-07 21:26:23 +01:00 committed by Ignotus Peverell
parent 1f7ea4930e
commit a63cfa7138
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
p2p/src/peers.rs
View file

@ -513,7 +513,13 @@ impl Peers {
} }
pub fn enough_peers(&self) -> bool { pub fn enough_peers(&self) -> bool {
self.connected_peers().len() >= self.config.peer_min_preferred_count() as usize self.peer_count() >= self.config.peer_min_preferred_count()
}
/// We have enough peers, both total connected and outbound connected
pub fn healthy_peers_mix(&self) -> bool {
self.enough_peers()
&& self.peer_outbound_count() >= self.config.peer_min_preferred_count() / 2
} }
/// Removes those peers that seem to have expired /// Removes those peers that seem to have expired

7
servers/src/grin/seed.rs
View file

@ -186,10 +186,7 @@ fn monitor_peers(
// maintenance step first, clean up p2p server peers // maintenance step first, clean up p2p server peers
peers.clean_peers(config.peer_max_count() as usize); peers.clean_peers(config.peer_max_count() as usize);
// We have enough peers, both total connected and outbound connected so we are good. if peers.healthy_peers_mix() {
if peers.peer_count() >= config.peer_min_preferred_count()
&& peers.peer_outbound_count() >= config.peer_min_preferred_count() / 2
{
return; return;
} }
@ -318,7 +315,7 @@ fn listen_for_addrs(
let addrs: Vec<SocketAddr> = rx.try_iter().collect(); let addrs: Vec<SocketAddr> = rx.try_iter().collect();
// If we have a healthy number of outbound peers then we are done here. // If we have a healthy number of outbound peers then we are done here.
if peers.peer_outbound_count() >= p2p.config.peer_min_preferred_count() / 2 { if peers.healthy_peers_mix() {
return; return;
} }