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

extra server logging, server memory leak fixed, m12

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-07-11 23:01:59 +02:00
parent 380a8b2d41
commit c8813bb2aa
6 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
servatrice/src/servatrice.cpp
View file

@ -37,9 +37,8 @@ void Servatrice_TcpServer::incomingConnection(int socketDescriptor)
} else {
QTcpSocket *socket = new QTcpSocket;
socket->setSocketDescriptor(socketDescriptor);
logger->logMessage(QString("incoming connection: %1").arg(socket->peerAddress().toString()));
new ServerSocketInterface(server, socket);
ServerSocketInterface *ssi = new ServerSocketInterface(server, socket);
logger->logMessage(QString("incoming connection: %1").arg(socket->peerAddress().toString()), ssi);
}
}
@ -188,18 +187,27 @@ AuthenticationResult Servatrice::checkUserPassword(Server_ProtocolHandler *handl
QSqlQuery query;
query.prepare("select a.password, time_to_sec(timediff(now(), date_add(b.time_from, interval b.minutes minute))) < 0, b.minutes <=> 0 from " + dbPrefix + "_users a left join " + dbPrefix + "_bans b on b.id_user = a.id and b.time_from = (select max(c.time_from) from " + dbPrefix + "_bans c where c.id_user = a.id) where a.name = :name and a.active = 1");
query.bindValue(":name", user);
if (!execSqlQuery(query))
if (!execSqlQuery(query)) {
qDebug("Login denied: SQL error");
return PasswordWrong;
}
if (query.next()) {
if (query.value(1).toInt() || query.value(2).toInt())
if (query.value(1).toInt() || query.value(2).toInt()) {
qDebug("Login denied: banned");
return PasswordWrong;
if (query.value(0).toString() == password)
}
if (query.value(0).toString() == password) {
qDebug("Login accepted: password right");
return PasswordRight;
else
} else {
qDebug("Login denied: password wrong");
return PasswordWrong;
} else
}
} else {
qDebug("Login accepted: unknown user");
return UnknownUser;
}
} else
return UnknownUser;
}