Do not disconnect from preferred peers when there is enough outbound

p2p/src/peer.rs

@@ -434,8 +434,8 @@ impl Peer {
 	}
 
 	/// Stops the peer
-	pub fn stop(&self) {
-		debug!("Stopping peer {:?}", self.info.addr);
+	pub fn stop(&self, reason: &str) {
+		debug!("Stopping peer {:?}, reason: {}", self.info.addr, reason);
 		match self.stop_handle.try_lock() {
 			Some(handle) => handle.stop(),
 			None => error!("can't get stop lock for peer"),

p2p/src/peers.rs

@@ -188,7 +188,7 @@ impl Peers {
 				// setting peer status will get it removed at the next clean_peer
 				peer.send_ban_reason(ban_reason)?;
 				peer.set_banned();
-				peer.stop();
+				peer.stop("banning peer");
 				let mut peers = self.peers.try_write_for(LOCK_TIMEOUT).ok_or_else(|| {
 					error!("ban_peer: failed to get peers lock");
 					Error::PeerException
@@ -233,7 +233,7 @@ impl Peers {
 							break;
 						}
 					};
-					p.stop();
+					p.stop("error broadcast");
 					peers.remove(&p.info.addr);
 				}
 			}
@@ -295,7 +295,7 @@ impl Peers {
 				};
 				// Mark peer as defunct after ping failure.
 				let _ = self.update_state(p.info.addr, State::Defunct);
-				p.stop();
+				p.stop("Error pinging");
 				peers.remove(&p.info.addr);
 			}
 		}
@@ -464,7 +464,7 @@ impl Peers {
 				}
 			};
 			for addr in rm {
-				let _ = peers.get(&addr).map(|peer| peer.stop());
+				let _ = peers.get(&addr).map(|peer| peer.stop("clean peers"));
 				peers.remove(&addr);
 			}
 		}
@@ -473,7 +473,7 @@ impl Peers {
 	pub fn stop(&self) {
 		let mut peers = self.peers.write();
 		for peer in peers.values() {
-			peer.stop();
+			peer.stop("stop all peers");
 		}
 		for (_, peer) in peers.drain() {
 			peer.wait();
@@ -489,7 +489,7 @@ impl Peers {
 		match peers.remove(&peer_addr) {
 			Some(peer) => {
 				warn!("disconnecting peer {} ({})", peer_addr, reason);
-				peer.stop();
+				peer.stop("disconnect_peer");
 				Ok(())
 			}
 			None => Ok(()),

p2p/src/serv.rs

@@ -28,6 +28,7 @@ use crate::core::core::{OutputIdentifier, Segment, SegmentIdentifier, TxKernel};
 use crate::core::global;
 use crate::core::pow::Difficulty;
 use crate::handshake::Handshake;
+use crate::msg::PeerAddrs;
 use crate::peer::Peer;
 use crate::peers::Peers;
 use crate::store::PeerStore;
@@ -208,8 +209,15 @@ impl Server {
 					&self.handshake,
 					self.peers.clone(),
 				)?;
-				if self.peers.enough_outbound_peers() {
-					peer.stop();
+				if self.peers.enough_outbound_peers()
+					&& !self
+						.config
+						.peers_preferred
+						.as_ref()
+						.unwrap_or(&PeerAddrs::default())
+						.matches_addr(&peer.info.addr)
+				{
+					peer.stop("enough outbound peers");
 				}
 				let peer = Arc::new(peer);
 				self.peers.add_connected(peer.clone())?;

servers/src/grin/sync/body_sync.rs

@@ -153,7 +153,7 @@ impl BodySync {
 				if let Some(peer) = peers.choose(&mut rng) {
 					if let Err(e) = peer.send_block_request(hash, chain::Options::SYNC) {
 						debug!("Skipped request to {}: {:?}", peer.info.addr, e);
-						peer.stop();
+						peer.stop("error sending block request");
 					} else {
 						self.blocks_requested += 1;
 					}

src/bin/tools/seedcheck.rs

@@ -149,7 +149,7 @@ pub fn check_seeds(is_testnet: bool, seed: Option<&str>) -> Vec<SeedCheckResult>
 					"SUCCESS - Performed Handshake with seed for {} at {}. {} - {:?}",
 					s, r, user_agent, p.info.capabilities
 				);
-				p.stop();
+				p.stop("resolved seed");
 				p.wait();
 				seed_result.success = true;
 				seed_result