Merge branch 'develop' into p2p

libethereum/EthereumPeer.cpp

@@ -48,6 +48,7 @@ EthereumPeer::EthereumPeer(Session* _s, HostCapabilityFace* _h, unsigned _i):
 
 EthereumPeer::~EthereumPeer()
 {
+	clogS(NetMessageSummary) << "Aborting Sync :-(";
 	abortSync();
 }
 

libp2p/Host.cpp

@@ -42,6 +42,12 @@ using namespace std;
 using namespace dev;
 using namespace dev::p2p;
 
+/// Interval at which Host::run will call keepAlivePeers to ping peers.
+std::chrono::seconds const c_keepAliveInterval = std::chrono::seconds(30);
+
+/// Disconnect timeout after failure to respond to keepAlivePeers ping.
+std::chrono::milliseconds const c_keepAliveTimeOut = std::chrono::milliseconds(1000);
+
 HostNodeTableHandler::HostNodeTableHandler(Host& _host): m_host(_host) {}
 
 void HostNodeTableHandler::processEvent(NodeId const& _n, NodeTableEventType const& _e)

libp2p/Host.h

@@ -94,12 +94,6 @@ public:
 	/// Will block on network process events.
 	virtual ~Host();
 
-	/// Interval at which Host::run will call keepAlivePeers to ping peers.
-	std::chrono::seconds const c_keepAliveInterval = std::chrono::seconds(30);
-
-	/// Disconnect timeout after failure to respond to keepAlivePeers ping.
-	std::chrono::milliseconds const c_keepAliveTimeOut = std::chrono::milliseconds(1000);
-
 	/// Default host for current version of client.
 	static std::string pocHost();
 

libp2p/Session.cpp

@@ -51,6 +51,7 @@ Session::Session(Host* _s, RLPXFrameIO* _io, std::shared_ptr<Peer> const& _n, Pe
 
 Session::~Session()
 {
+	clogS(NetMessageSummary) << "Closing Peer Session :-(";
 	m_peer->m_lastConnected = m_peer->m_lastAttempted - chrono::seconds(1);
 
 	// Read-chain finished for one reason or another.