Merge pull request #96 from mwcproject/v5.3.3/sync

Fix inbound connection for tor

p2p/src/peers.rs

@@ -390,6 +390,11 @@ impl Peers {
 		self.store.get_peer(peer_addr).map_err(From::from)
 	}
 
+	/// Get and delete peer from the store by address. It is needed for peer renaming
+	pub fn delete_peer(&self, peer_addr: &PeerAddr) -> Result<(), Error> {
+		self.store.delete_peer(peer_addr).map_err(From::from)
+	}
+
 	/// Whether we've already seen a peer with the provided address
 	pub fn exists_peer(&self, peer_addr: &PeerAddr) -> Result<bool, Error> {
 		self.store.exists_peer(peer_addr).map_err(From::from)

p2p/src/protocol.rs

@@ -153,22 +153,46 @@ impl MessageHandler for Protocol {
 				Consumed::None
 			}
 			Message::TorAddress(tor_address) => {
-				info!(
+				debug!(
 					"TorAddress received from {:?}, address = {:?}",
 					self.peer_info, tor_address
 				);
 
 				let new_peer_addr = PeerAddr::Onion(tor_address.address.clone());
-				error!("new peer = {:?}", new_peer_addr);
+				info!("Adding newly connected Healthy peer {:?}", new_peer_addr);
+
+				let peer = self.server.peers.get_peer(&self.peer_info.addr);
+				if let Err(e) = self.server.peers.delete_peer(&self.peer_info.addr) {
+					warn!(
+						"Unable to delete expected TOR temp peer: {}, Error: {}",
+						self.peer_info.addr, e
+					);
+				}
+				match peer {
+					Ok(mut peer) => {
+						peer.addr = new_peer_addr.clone();
+						self.server.peers.save_peer(&peer)?;
+					}
+					Err(e) => {
+						warn!(
+							"Unable to delete expected TOR temp peer: {}, Error: {}",
+							self.peer_info.addr, e
+						);
+					}
+				}
+
 				if self.server.peers.is_banned(&new_peer_addr) {
 					let peer = self.server.peers.get_peer(&self.peer_info.addr)?;
 					warn!("banned peer tried to connect! {:?}", peer);
-				} else {
-					let peer = self.server.peers.get_peer(&self.peer_info.addr);
-					if peer.is_ok() {
-						let mut peer = peer.unwrap();
-						peer.addr = new_peer_addr;
-						self.server.peers.save_peer(&peer)?;
+					if let Err(e) = self.server.peers.ban_peer(
+						&peer.addr,
+						ReasonForBan::BadHandshake,
+						"banned peer tried to connect",
+					) {
+						warn!(
+							"Unable to ban tried to connect peer {}, Error: {}",
+							peer.addr, e
+						);
 					}
 				}
 				Consumed::None

p2p/src/serv.rs

@@ -345,11 +345,9 @@ impl Server {
 			self.sync_state.clone(),
 			self.clone(),
 		)?;
-		// if we are using TOR, we must reject the local addressed because it comes from the proxy
-		// Will add peer after it share the TOR address
-		if self.self_onion_address.is_none() {
-			self.peers.add_connected(Arc::new(peer))?;
-		}
+		// if we are using TOR, it will be the local addressed because it comes from the proxy
+		// Will still need to save all the peers and renameit after peer will share the TOR address
+		self.peers.add_connected(Arc::new(peer))?;
 		Ok(())
 	}
 

p2p/src/store.rs

@@ -160,7 +160,6 @@ impl PeerStore {
 	}
 
 	/// TODO - allow below added to avoid github issue reports
-	#[allow(dead_code)]
 	pub fn delete_peer(&self, peer_addr: &PeerAddr) -> Result<(), Error> {
 		let batch = self.db.batch_write()?;
 		batch.delete(&peer_key(peer_addr)[..])?;