More node list UX nicities.

alethzero/MainWin.cpp

@@ -772,10 +772,10 @@ void Main::refreshNetwork()
 		auto ns = web3()->nodes();
 		for (p2p::Node const& i: ns)
 			if (!i.dead)
-				ui->nodes->insertItem(i.isOffline() ? ui->nodes->count() : 0, QString("[%1 %3] %2 - ( =%5s | /%4s%6 ) - *%7 $%8")
+				ui->nodes->insertItem(clients.count(i.id) ? 0 : ui->nodes->count(), QString("[%1 %3] %2 - ( =%5s | /%4s%6 ) - *%7 $%8")
 							   .arg(QString::fromStdString(i.id.abridged()))
 							   .arg(QString::fromStdString(toString(i.address)))
-							   .arg(i.id == web3()->id() ? "self" : i.isOffline() ? i.secondsSinceLastAttempted() > -1 ? i.secondsSinceLastAttempted() < (int)i.fallbackSeconds() ? "retry-" + QString::number(i.fallbackSeconds() - i.secondsSinceLastAttempted()) + "s" : "retrying..." : "session-fail" : clients[i.id])
+							   .arg(i.id == web3()->id() ? "self" : clients.count(i.id) ? clients[i.id] : i.secondsSinceLastAttempted() == -1 ? "session-fail" : i.secondsSinceLastAttempted() >= (int)i.fallbackSeconds() ? "retrying..." : "retry-" + QString::number(i.fallbackSeconds() - i.secondsSinceLastAttempted()) + "s")
 							   .arg(i.secondsSinceLastAttempted())
 							   .arg(i.secondsSinceLastConnected())
 							   .arg(i.isOffline() ? " | " + QString::fromStdString(reasonOf(i.lastDisconnect)) + " | " + QString::number(i.failedAttempts) + "x" : "")

libp2p/Session.cpp

@@ -61,8 +61,12 @@ Session::Session(Host* _s, bi::tcp::socket _socket, std::shared_ptr<Node> const&
 Session::~Session()
 {
 	if (m_node)
+	{
 		if (id() && !isPermanentProblem(m_node->lastDisconnect) && !m_node->dead)
 			m_server->m_ready += m_node->index;
+		else
+			m_node->lastConnected = m_node->lastAttempted - chrono::seconds(1);
+	}
 
 	// Read-chain finished for one reason or another.
 	for (auto& i: m_capabilities)