sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implement close log in log.cpp again

Browse Source
This commit is contained in:
doitux
2010-07-13 20:55:01 +00:00
parent bebc215e88
commit 7213e10ba8
3 changed files with 168 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chatcleaner/cleanerserver.cpp
+142 -142
View File
@@ -13,85 +13,85 @@ using namespace std;
CleanerServer::CleanerServer(): config(0), blockConnection(false), m_recvBufUsed(0), secondsSinceLastConfigChange(0) CleanerServer::CleanerServer(): config(0), blockConnection(false), m_recvBufUsed(0), secondsSinceLastConfigChange(0)
{ {
config = new CleanerConfig; config = new CleanerConfig;
clientSecret = QString::fromUtf8(config->readConfigString("ClientAuthString").c_str()); clientSecret = QString::fromUtf8(config->readConfigString("ClientAuthString").c_str());
serverSecret = QString::fromUtf8(config->readConfigString("ServerAuthString").c_str()); serverSecret = QString::fromUtf8(config->readConfigString("ServerAuthString").c_str());
myMessageFilter = new MessageFilter(config);
tcpServer = new QTcpServer();
tcpServer->setMaxPendingConnections(1);
if (!tcpServer->listen(QHostAddress(QString::fromUtf8(config->readConfigString("HostAddress").c_str())), config->readConfigInt("DefaultListenPort")) ) {
qDebug() << QString("Unable to start the server: %1.").arg(tcpServer->errorString());
return;
}
qDebug() << QString("The server is running on port %1.").arg(tcpServer->serverPort());
configRefreshTimer = new QTimer(); myMessageFilter = new MessageFilter(config);
tcpServer = new QTcpServer();
connect(configRefreshTimer, SIGNAL(timeout()), this, SLOT(refreshConfig())); tcpServer->setMaxPendingConnections(1);
connect(tcpServer, SIGNAL(newConnection()), this, SLOT(newCon()));
if (!tcpServer->listen(QHostAddress(QString::fromUtf8(config->readConfigString("HostAddress").c_str())), config->readConfigInt("DefaultListenPort")) ) {
refreshConfig(); qDebug() << QString("Unable to start the server: %1.").arg(tcpServer->errorString());
configRefreshTimer->start(10000); return;
}
qDebug() << QString("The server is running on port %1.").arg(tcpServer->serverPort());
configRefreshTimer = new QTimer();
connect(configRefreshTimer, SIGNAL(timeout()), this, SLOT(refreshConfig()));
connect(tcpServer, SIGNAL(newConnection()), this, SLOT(newCon()));
refreshConfig();
configRefreshTimer->start(10000);
} }
CleanerServer::~CleanerServer() CleanerServer::~CleanerServer()
{ {
delete config; delete config;
delete myMessageFilter; delete myMessageFilter;
delete tcpServer; delete tcpServer;
delete configRefreshTimer; delete configRefreshTimer;
} }
void CleanerServer::newCon() void CleanerServer::newCon()
{ {
if(!blockConnection) { if(!blockConnection) {
tcpSocket = tcpServer->nextPendingConnection(); tcpSocket = tcpServer->nextPendingConnection();
connect(tcpSocket, SIGNAL(readyRead()), this, SLOT(onRead())); connect(tcpSocket, SIGNAL(readyRead()), this, SLOT(onRead()));
connect(tcpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState))); connect(tcpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
blockConnection = true; blockConnection = true;
} }
} }
void CleanerServer::onRead() void CleanerServer::onRead()
{ {
qint64 bytesRead = tcpSocket->read((char *)m_recvBuf + m_recvBufUsed, sizeof(m_recvBuf) - m_recvBufUsed); qint64 bytesRead = tcpSocket->read((char *)m_recvBuf + m_recvBufUsed, sizeof(m_recvBuf) - m_recvBufUsed);
bool error = bytesRead < 1; bool error = bytesRead < 1;
if (!error) if (!error)
{ {
m_recvBufUsed += bytesRead; m_recvBufUsed += bytesRead;
asn_dec_rval_t retVal; asn_dec_rval_t retVal;
do do
{ {
// Try to decode the packets. // Try to decode the packets.
InternalChatCleanerPacket recvMsg; InternalChatCleanerPacket recvMsg;
retVal = ber_decode(0, &asn_DEF_ChatCleanerMessage, (void **)recvMsg.GetMsgPtr(), m_recvBuf, m_recvBufUsed); retVal = ber_decode(0, &asn_DEF_ChatCleanerMessage, (void **)recvMsg.GetMsgPtr(), m_recvBuf, m_recvBufUsed);
if(retVal.code == RC_OK) if(retVal.code == RC_OK)
{ {
if (retVal.consumed < m_recvBufUsed) if (retVal.consumed < m_recvBufUsed)
{ {
m_recvBufUsed -= retVal.consumed; m_recvBufUsed -= retVal.consumed;
memmove(m_recvBuf, m_recvBuf + retVal.consumed, m_recvBufUsed); memmove(m_recvBuf, m_recvBuf + retVal.consumed, m_recvBufUsed);
} }
else else
m_recvBufUsed = 0; m_recvBufUsed = 0;
// Handle the packets. // Handle the packets.
error = handleMessage(recvMsg); error = handleMessage(recvMsg);
} }
} while (!error && retVal.code == RC_OK); } while (!error && retVal.code == RC_OK);
} }
if (error) if (error)
{ {
qDebug() << "Error handling packets from client."; qDebug() << "Error handling packets from client.";
tcpSocket->close(); tcpSocket->close();
} }
/* char buf[1024]; /* char buf[1024];
tcpSocket->readLine(buf, sizeof(buf)); tcpSocket->readLine(buf, sizeof(buf));
QString message = QString::fromUtf8("%1").arg(buf); QString message = QString::fromUtf8("%1").arg(buf);
@@ -105,100 +105,100 @@ void CleanerServer::onRead()
} }
bool CleanerServer::handleMessage(InternalChatCleanerPacket &msg) { bool CleanerServer::handleMessage(InternalChatCleanerPacket &msg) {
bool error = true; bool error = true;
if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerInitMessage) if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerInitMessage)
{ {
CleanerInitMessage_t *netInit = &msg.GetMsg()->choice.cleanerInitMessage; CleanerInitMessage_t *netInit = &msg.GetMsg()->choice.cleanerInitMessage;
if (netInit->requestedVersion == CLEANER_PROTOCOL_VERSION) if (netInit->requestedVersion == CLEANER_PROTOCOL_VERSION)
{ {
string tmpClientSecret((const char *)netInit->clientSecret.buf, netInit->clientSecret.size); string tmpClientSecret((const char *)netInit->clientSecret.buf, netInit->clientSecret.size);
if (clientSecret == QString::fromStdString(tmpClientSecret)) if (clientSecret == QString::fromStdString(tmpClientSecret))
{ {
error = false; error = false;
InternalChatCleanerPacket tmpAck; InternalChatCleanerPacket tmpAck;
tmpAck.GetMsg()->present = ChatCleanerMessage_PR_cleanerInitAckMessage; tmpAck.GetMsg()->present = ChatCleanerMessage_PR_cleanerInitAckMessage;
CleanerInitAckMessage_t *netAck = &tmpAck.GetMsg()->choice.cleanerInitAckMessage; CleanerInitAckMessage_t *netAck = &tmpAck.GetMsg()->choice.cleanerInitAckMessage;
netAck->serverVersion = CLEANER_PROTOCOL_VERSION; netAck->serverVersion = CLEANER_PROTOCOL_VERSION;
string tmpServerSecret(serverSecret.toStdString()); string tmpServerSecret(serverSecret.toStdString());
OCTET_STRING_fromBuf(&netAck->serverSecret, OCTET_STRING_fromBuf(&netAck->serverSecret,
tmpServerSecret.c_str(), tmpServerSecret.c_str(),
tmpServerSecret.length()); tmpServerSecret.length());
sendMessageToClient(tmpAck); sendMessageToClient(tmpAck);
} }
else else
qDebug() << "Invalid client secret."; qDebug() << "Invalid client secret.";
} }
else else
qDebug() << "Invalid client version: " << netInit->requestedVersion; qDebug() << "Invalid client version: " << netInit->requestedVersion;
} }
else if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerChatRequestMessage) else if (msg.GetMsg()->present == ChatCleanerMessage_PR_cleanerChatRequestMessage)
{ {
error = false; error = false;
CleanerChatRequestMessage_t *netRequest = &msg.GetMsg()->choice.cleanerChatRequestMessage; CleanerChatRequestMessage_t *netRequest = &msg.GetMsg()->choice.cleanerChatRequestMessage;
unsigned playerId = netRequest->playerId; unsigned playerId = netRequest->playerId;
QString nick(QString::fromUtf8( QString nick(QString::fromUtf8(
string((const char *)netRequest->playerName.buf, netRequest->playerName.size).c_str())); string((const char *)netRequest->playerName.buf, netRequest->playerName.size).c_str()));
QString message(QString::fromUtf8( QString message(QString::fromUtf8(
string((const char *)netRequest->chatMessage.buf, netRequest->chatMessage.size).c_str())); string((const char *)netRequest->chatMessage.buf, netRequest->chatMessage.size).c_str()));
QStringList checkreturn = myMessageFilter->check(playerId, nick, message); QStringList checkreturn = myMessageFilter->check(playerId, nick, message);
QString checkAction = checkreturn.at(0); QString checkAction = checkreturn.at(0);
QString checkMessage = checkreturn.at(1); QString checkMessage = checkreturn.at(1);
if (!checkAction.isEmpty()) if (!checkAction.isEmpty())
{ {
InternalChatCleanerPacket tmpReply; InternalChatCleanerPacket tmpReply;
tmpReply.GetMsg()->present = ChatCleanerMessage_PR_cleanerChatReplyMessage; tmpReply.GetMsg()->present = ChatCleanerMessage_PR_cleanerChatReplyMessage;
CleanerChatReplyMessage_t *netReply = &tmpReply.GetMsg()->choice.cleanerChatReplyMessage; CleanerChatReplyMessage_t *netReply = &tmpReply.GetMsg()->choice.cleanerChatReplyMessage;
netReply->requestId = netRequest->requestId; netReply->requestId = netRequest->requestId;
netReply->playerId = netRequest->playerId; netReply->playerId = netRequest->playerId;
if(checkAction == "warn") { if(checkAction == "warn") {
netReply->cleanerActionType = cleanerActionType_cleanerActionWarning; netReply->cleanerActionType = cleanerActionType_cleanerActionWarning;
} }
else if(checkAction == "kick") { else if(checkAction == "kick") {
netReply->cleanerActionType = cleanerActionType_cleanerActionKick; netReply->cleanerActionType = cleanerActionType_cleanerActionKick;
} }
else if(checkAction == "kickban") { else if(checkAction == "kickban") {
netReply->cleanerActionType = cleanerActionType_cleanerActionBan; netReply->cleanerActionType = cleanerActionType_cleanerActionBan;
} }
string tmpCheck(checkMessage.toUtf8()); string tmpCheck(checkMessage.toUtf8());
netReply->cleanerText = netReply->cleanerText =
OCTET_STRING_new_fromBuf( OCTET_STRING_new_fromBuf(
&asn_DEF_OCTET_STRING, &asn_DEF_OCTET_STRING,
(const char *)tmpCheck.c_str(), (const char *)tmpCheck.c_str(),
tmpCheck.length()); tmpCheck.length());
sendMessageToClient(tmpReply); sendMessageToClient(tmpReply);
} }
} }
return error; return error;
} }
void CleanerServer::socketStateChanged(QAbstractSocket::SocketState state) { void CleanerServer::socketStateChanged(QAbstractSocket::SocketState state) {
qDebug() << "Socket state changed to: " << QAbstractSocket::UnconnectedState; qDebug() << "Socket state changed to: " << QAbstractSocket::UnconnectedState;
if(state == QAbstractSocket::UnconnectedState) blockConnection = false; if(state == QAbstractSocket::UnconnectedState) blockConnection = false;
} }
void CleanerServer::refreshConfig() { void CleanerServer::refreshConfig() {
QFileInfo configFileInfo(QString::fromUtf8(config->getConfigFileName().c_str())); QFileInfo configFileInfo(QString::fromUtf8(config->getConfigFileName().c_str()));
if(configFileInfo.lastModified().secsTo(QDateTime::currentDateTime()) < 20) { if(configFileInfo.lastModified().secsTo(QDateTime::currentDateTime()) < 20) {
config->fillBuffer(); config->fillBuffer();
} }
myMessageFilter->refreshConfig(); myMessageFilter->refreshConfig();
} }
void CleanerServer::sendMessageToClient(InternalChatCleanerPacket &msg) void CleanerServer::sendMessageToClient(InternalChatCleanerPacket &msg)
{ {
unsigned char buf[MAX_CLEANER_PACKET_SIZE]; unsigned char buf[MAX_CLEANER_PACKET_SIZE];
asn_enc_rval_t e = der_encode_to_buffer(&asn_DEF_ChatCleanerMessage, msg.GetMsg(), buf, MAX_CLEANER_PACKET_SIZE); asn_enc_rval_t e = der_encode_to_buffer(&asn_DEF_ChatCleanerMessage, msg.GetMsg(), buf, MAX_CLEANER_PACKET_SIZE);
if (e.encoded == -1) if (e.encoded == -1)
qDebug() << "Failed to encode chat cleaner packet: " << msg.GetMsg()->present; qDebug() << "Failed to encode chat cleaner packet: " << msg.GetMsg()->present;
else else
tcpSocket->write((const char *)buf, e.encoded); tcpSocket->write((const char *)buf, e.encoded);
} }
src/gui/qt/gametable/log/log.cpp
+13 -9
View File
@@ -197,17 +197,21 @@ Log::Log(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), my
Log::~Log() Log::~Log()
{ {
qDebug() << "close log"; cerr << "log destruktor";
delete myConfig;
delete myLogDir;
delete myHtmlLogFile;
delete mySqliteLogDb;
// Datenbank schließe myConfig = 0;
mySqliteLogDb->close(); }
delete myConfig; void Log::closeLogDbAtExit()
delete myLogDir; {
delete myHtmlLogFile; // Datenbank schließen
delete mySqliteLogDb; mySqliteLogDb->close();
delete mySqliteLogDb;
myConfig = 0; mySqliteLogDb = NULL;
} }
void Log::logPlayerActionMsg(QString msg, int playerID, int action, int setValue) { void Log::logPlayerActionMsg(QString msg, int playerID, int action, int setValue) {
src/gui/qt/startwindow/startwindowimpl.cpp
+13 -13
View File
@@ -176,19 +176,19 @@ startWindowImpl::startWindowImpl(ConfigFile *c)
startWindowImpl::~startWindowImpl() startWindowImpl::~startWindowImpl()
{ {
delete myNewGameDialog; // delete myNewGameDialog;
delete mySelectAvatarDialog; // delete mySelectAvatarDialog;
delete mySettingsDialog; // delete mySettingsDialog;
delete myChangeHumanPlayerNameDialog; // delete myChangeHumanPlayerNameDialog;
delete myJoinNetworkGameDialog; // delete myJoinNetworkGameDialog;
delete myConnectToServerDialog; // delete myConnectToServerDialog;
delete myStartNetworkGameDialog; // delete myStartNetworkGameDialog;
delete myCreateNetworkGameDialog; // delete myCreateNetworkGameDialog;
delete myAboutPokerthDialog; // delete myAboutPokerthDialog;
delete myGameLobbyDialog; // delete myGameLobbyDialog;
delete myTimeoutDialog; // delete myTimeoutDialog;
delete myServerListDialog; // delete myServerListDialog;
delete myInternetGameLoginDialog; // delete myInternetGameLoginDialog;
} }
void startWindowImpl::callNewGameDialog() { void startWindowImpl::callNewGameDialog() {