Display an access denied message when client detects a server timeout

kahrl · kahrl · commit 9c76f379acb1 · 2015-07-17T12:06:30.000+02:00
diff --git a/src/client.cpp b/src/client.cpp
@@ -743,14 +743,19 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
 // Virtual methods from con::PeerHandler
 void Client::peerAdded(con::Peer *peer)
 {
-	infostream<<"Client::peerAdded(): peer->id="
-			<<peer->id<<std::endl;
+	infostream << "Client::peerAdded(): peer->id="
+			<< peer->id << std::endl;
 }
 void Client::deletingPeer(con::Peer *peer, bool timeout)
 {
-	infostream<<"Client::deletingPeer(): "
+	infostream << "Client::deletingPeer(): "
 			"Server Peer is getting deleted "
-			<<"(timeout="<<timeout<<")"<<std::endl;
+			<< "(timeout=" << timeout << ")" << std::endl;
+
+	if (timeout) {
+		m_access_denied = true;
+		m_access_denied_reason = gettext("Connection timed out.");
+	}
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -743,14 +743,19 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)`
`743`	`743`	`// Virtual methods from con::PeerHandler`
`744`	`744`	`void Client::peerAdded(con::Peer *peer)`
`745`	`745`	`{`
`746`		`- infostream<<"Client::peerAdded(): peer->id="`
`747`		`- <<peer->id<<std::endl;`
	`746`	`+ infostream << "Client::peerAdded(): peer->id="`
	`747`	`+ << peer->id << std::endl;`
`748`	`748`	`}`
`749`	`749`	`void Client::deletingPeer(con::Peer *peer, bool timeout)`
`750`	`750`	`{`
`751`		`- infostream<<"Client::deletingPeer(): "`
	`751`	`+ infostream << "Client::deletingPeer(): "`
`752`	`752`	`"Server Peer is getting deleted "`
`753`		`- <<"(timeout="<<timeout<<")"<<std::endl;`
	`753`	`+ << "(timeout=" << timeout << ")" << std::endl;`
	`754`	`+`
	`755`	`+ if (timeout) {`
	`756`	`+ m_access_denied = true;`
	`757`	`+ m_access_denied_reason = gettext("Connection timed out.");`
	`758`	`+ }`
`754`	`759`	`}`
`755`	`760`
`756`	`761`	`/*`