jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

raised server timeout, added ping widget

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2009-10-17 18:29:30 +02:00
parent 3c8f2b878b
commit b8690627c8
4 changed files with 62 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cockatrice/src/client.cpp
View file

@ -74,12 +74,6 @@ void PendingCommand::responseReceived(ServerResponse resp)
deleteLater();
}
void PendingCommand::checkTimeout()
{
if (++time > 5)
emit timeout();
}
void PendingCommand_ListPlayers::responseReceived(ServerResponse resp)
{
if (resp == RespOk)
@ -138,12 +132,6 @@ Client::~Client()
disconnectFromServer();
}
void Client::timeout()
{
emit serverTimeout();
disconnectFromServer();
}
void Client::slotSocketError(QAbstractSocket::SocketError /*error*/)
{
emit logSocketError(socket->errorString());
@ -376,8 +364,6 @@ PendingCommand *Client::cmd(const QString &s, PendingCommand *_pc)
pc = new PendingCommand(MsgId);
pendingCommands.insert(MsgId, pc);
connect(pc, SIGNAL(finished(ServerResponse)), this, SLOT(removePendingCommand()));
connect(pc, SIGNAL(timeout()), this, SLOT(timeout()));
connect(timer, SIGNAL(timeout()), pc, SLOT(checkTimeout()));
return pc;
}
@ -406,7 +392,19 @@ void Client::disconnectFromServer()
void Client::ping()
{
cmd("ping");
int maxTime = 0;
QMapIterator<int, PendingCommand *> i(pendingCommands);
while (i.hasNext()) {
int time = i.next().value()->tick();
if (time > maxTime)
maxTime = time;
}
emit maxPingTime(maxTime, maxTimeout);
if (maxTime >= maxTimeout) {
emit serverTimeout();
disconnectFromServer();
} else
cmd("ping");
}
PendingCommand *Client::chatListChannels()