Merge pull request #1514 from subtly/pacify

less tolerant peer fallback timer

libp2p/Host.cpp

@@ -182,10 +182,8 @@ void Host::startPeerSession(Public const& _id, RLP const& _rlp, RLPXFrameIO* _io
 	}
 	else
 		p = m_peers[_id];
-	p->m_lastDisconnect = NoDisconnect;
 	if (p->isOffline())
 		p->m_lastConnected = std::chrono::system_clock::now();
-	p->m_failedAttempts = 0;
 	p->endpoint.tcp.address(_endpoint.address());
 
 	auto protocolVersion = _rlp[0].toInt<unsigned>();
@@ -484,12 +482,14 @@ void Host::connect(std::shared_ptr<Peer> const& _p)
 	auto socket = make_shared<RLPXSocket>(new bi::tcp::socket(m_ioService));
 	socket->ref().async_connect(_p->peerEndpoint(), [=](boost::system::error_code const& ec)
 	{
+		_p->m_lastAttempted = std::chrono::system_clock::now();
+		_p->m_failedAttempts++;
+		
 		if (ec)
 		{
 			clog(NetConnect) << "Connection refused to node" << _p->id.abridged() << "@" << _p->peerEndpoint() << "(" << ec.message() << ")";
+			// Manually set error (session not present)
 			_p->m_lastDisconnect = TCPError;
-			_p->m_lastAttempted = std::chrono::system_clock::now();
-			_p->m_failedAttempts++;
 		}
 		else
 		{
@@ -499,9 +499,7 @@ void Host::connect(std::shared_ptr<Peer> const& _p)
 				Guard l(x_connecting);
 				m_connecting.push_back(handshake);
 			}
-			
-			// preempt setting failedAttempts; this value is cleared upon success
-			_p->m_failedAttempts++;
+
 			handshake->start();
 		}
 		

libp2p/Peer.cpp

@@ -44,6 +44,7 @@ unsigned Peer::fallbackSeconds() const
 		return 30 * (m_failedAttempts + 1);
 	case UselessPeer:
 	case TooManyPeers:
+		return 25 * (m_failedAttempts + 1);
 	case ClientQuit:
 		return 15 * (m_failedAttempts + 1);
 	case NoDisconnect:

libp2p/Peer.h

@@ -75,6 +75,9 @@ public:
 	/// Reason peer was previously disconnected.
 	DisconnectReason lastDisconnect() const { return m_lastDisconnect; }
 	
+	/// Peer session is noted as useful.
+	void noteSessionGood() { m_failedAttempts = 0; }
+	
 protected:
 	/// Returns number of seconds to wait until attempting connection, based on attempted connection history.
 	unsigned fallbackSeconds() const;

libp2p/Session.cpp

@@ -46,6 +46,7 @@ Session::Session(Host* _s, RLPXFrameIO* _io, std::shared_ptr<Peer> const& _n, Pe
 	m_info(_info),
 	m_ping(chrono::steady_clock::time_point::max())
 {
+	m_peer->m_lastDisconnect = NoDisconnect;
 	m_lastReceived = m_connect = chrono::steady_clock::now();
 }
 
@@ -358,16 +359,11 @@ void Session::drop(DisconnectReason _reason)
 		}
 		catch (...) {}
 
-	if (m_peer)
+	m_peer->m_lastDisconnect = _reason;
+	if (_reason == BadProtocol)
 	{
-		if (_reason != m_peer->m_lastDisconnect || _reason == NoDisconnect || _reason == ClientQuit || _reason == DisconnectRequested)
-			m_peer->m_failedAttempts = 0;
-		m_peer->m_lastDisconnect = _reason;
-		if (_reason == BadProtocol)
-		{
-			m_peer->m_rating /= 2;
-			m_peer->m_score /= 2;
-		}
+		m_peer->m_rating /= 2;
+		m_peer->m_score /= 2;
 	}
 	m_dropped = true;
 }