X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=2e3da6d9f4395cf2b9a9382d37d2d21b0ba938aa;hp=1df55da2b1e5ac9836f29b5d55f7c7e60e4cacde;hb=9d4aff06284de98df1eed1179b958833221f5f85;hpb=6869909402a4dc807ee5261cc2a0999ac33053ee diff --git a/src/core/core.cpp b/src/core/core.cpp index 1df55da2..2e3da6d9 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel IRC Development Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -18,19 +18,22 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include +#include +#include +#include + #include "core.h" -#include "server.h" -#include "global.h" -#include "util.h" -#include "coreproxy.h" +#include "coresession.h" +#include "coresettings.h" +#include "signalproxy.h" #include "sqlitestorage.h" - -#include -#include +#include "network.h" Core *Core::instanceptr = 0; +QMutex Core::mutex; -Core * Core::instance() { +Core *Core::instance() { if(instanceptr) return instanceptr; instanceptr = new Core(); instanceptr->init(); @@ -42,369 +45,353 @@ void Core::destroy() { instanceptr = 0; } -Core::Core() { - qDebug() << "core"; +Core::Core() + : storage(0) +{ + startTime = QDateTime::currentDateTime(); // for uptime :) + + connect(&_storageSyncTimer, SIGNAL(timeout()), + this, SLOT(syncStorage())); + _storageSyncTimer.start(10 * 60 * 1000); // in msecs } void Core::init() { - if(!SqliteStorage::isAvailable()) { - qFatal("Sqlite is currently required! Please make sure your Qt library has sqlite support enabled."); - } - //SqliteStorage::init(); - storage = new SqliteStorage(); - connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(updateGlobalData(UserId, QString))); - connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - //startListening(); // FIXME - if(Global::runMode == Global::Monolithic) { // TODO Make GUI user configurable - try { - guiUser = storage->validateUser("Default", "password"); - } catch(Storage::AuthError) { - guiUser = storage->addUser("Default", "password"); - } - Q_ASSERT(guiUser); - Global::setGuiUser(guiUser); - createSession(guiUser); - } else guiUser = 0; - - // Read global settings from config file - QSettings s; - s.beginGroup("Global"); - foreach(QString unum, s.childGroups()) { - UserId uid = unum.toUInt(); - s.beginGroup(unum); - foreach(QString key, s.childKeys()) { - Global::updateData(uid, key, s.value(key)); - } - s.endGroup(); - } - s.endGroup(); -} + configured = false; -Core::~Core() { - foreach(QTcpSocket *sock, validClients.keys()) { - delete sock; + CoreSettings cs; + if(!(configured = initStorage(cs.databaseSettings().toMap()))) { + qWarning("Core is currently not configured!"); } - qDeleteAll(sessions); - delete storage; -} -CoreSession *Core::session(UserId uid) { - Core *core = instance(); - if(core->sessions.contains(uid)) return core->sessions[uid]; - else return 0; -} + connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); + startListening(cs.port()); + guiUser = 0; -CoreSession *Core::localSession() { - Core *core = instance(); - if(core->guiUser && core->sessions.contains(core->guiUser)) return core->sessions[core->guiUser]; - else return 0; } -CoreSession *Core::createSession(UserId uid) { - Core *core = instance(); - Q_ASSERT(!core->sessions.contains(uid)); - CoreSession *sess = new CoreSession(uid, core->storage); - core->sessions[uid] = sess; - connect(sess, SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), core, SLOT(recvProxySignal(CoreSignal, QVariant, QVariant, QVariant))); - return sess; -} +bool Core::initStorage(QVariantMap dbSettings, bool setup) { + QString engine = dbSettings["Type"].toString().toLower(); + if(storage) { + qDebug() << "Deleting old storage object."; + storage->deleteLater(); + storage = 0; + } -bool Core::startListening(uint port) { - if(!server.listen(QHostAddress::Any, port)) { - qWarning(QString(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())).toAscii()); - return false; + // FIXME register new storageProviders here + if(engine == "sqlite" && SqliteStorage::isAvailable()) { + storage = new SqliteStorage(this); + connect(storage, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &)), this, SIGNAL(bufferInfoUpdated(UserId, const BufferInfo &))); + } else { + qWarning() << "Selected StorageBackend is not available:" << dbSettings["Type"].toString(); + return configured = false; } - qDebug() << "Listening for GUI clients on port" << server.serverPort(); - return true; -} -void Core::stopListening() { - server.close(); - qDebug() << "No longer listening for GUI clients."; -} + if(setup && !storage->setup(dbSettings)) { + return configured = false; + } -void Core::incomingConnection() { - // TODO implement SSL - QTcpSocket *socket = server.nextPendingConnection(); - connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); - connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData())); - blockSizes.insert(socket, (quint32)0); - qDebug() << "Client connected from " << socket->peerAddress().toString(); + return configured = storage->init(dbSettings); } -void Core::clientHasData() { - QTcpSocket *socket = dynamic_cast(sender()); - Q_ASSERT(socket && blockSizes.contains(socket)); - quint32 bsize = blockSizes.value(socket); - QVariant item; - while(readDataFromDevice(socket, bsize, item)) { - if(validClients.contains(socket)) { - QList sigdata = item.toList(); - if((ClientSignal)sigdata[0].toInt() == GS_UPDATE_GLOBAL_DATA) { - processClientUpdate(socket, sigdata[1].toString(), sigdata[2]); - } else { - sessions[validClients[socket]]->processSignal((ClientSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]); - } - } else { - // we need to auth the client - try { - processClientInit(socket, item); - } catch(Storage::AuthError) { - qWarning() << "Authentification error!"; // FIXME - socket->close(); - return; - } catch(Exception e) { - qWarning() << "Client init error:" << e.msg(); - socket->close(); - return; - } - } - blockSizes[socket] = bsize = 0; - } - blockSizes[socket] = bsize; +Core::~Core() { + // FIXME properly shutdown the sessions + qDeleteAll(sessions); } -void Core::clientDisconnected() { - QTcpSocket *socket = dynamic_cast(sender()); - blockSizes.remove(socket); - validClients.remove(socket); - qDebug() << "Client disconnected."; - // TODO remove unneeded sessions - if necessary/possible... +void Core::syncStorage() { + QMutexLocker locker(&mutex); + return instance()->storage->sync(); } -void Core::processClientInit(QTcpSocket *socket, const QVariant &v) { - VarMap msg = v.toMap(); - if(msg["GUIProtocol"].toUInt() != GUI_PROTOCOL) { - //qWarning() << "Client version mismatch."; - throw Exception("GUI client version mismatch"); +void Core::restoreState() { + if(instance()->sessions.count()) { + qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); + return; } - // Auth - UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); // throws exception if this failed - - // Find or create session for validated user - CoreSession *sess; - if(sessions.contains(uid)) sess = sessions[uid]; - else { - sess = createSession(uid); - validClients[socket] = uid; + CoreSettings s; + uint build = s.coreState().toMap()["CoreBuild"].toUInt(); + if(build < 362) { + qWarning() << qPrintable(tr("Core state too old, ignoring...")); + return; } - VarMap reply; - VarMap coreData; - // FIXME - QStringList dataKeys = Global::keys(uid); - QString key; - foreach(key, dataKeys) { - coreData[key] = Global::data(key); + QVariantList activeSessions = s.coreState().toMap()["ActiveSessions"].toList(); + if(activeSessions.count() > 0) { + qDebug() << "Restoring previous core state..."; + foreach(QVariant v, activeSessions) { + UserId user = v.value(); + instance()->createSession(user, true); + } + qDebug() << "...done."; } - reply["CoreData"] = coreData; - reply["SessionState"] = sess->sessionState(); - QList sigdata; - sigdata.append(CS_CORE_STATE); sigdata.append(QVariant(reply)); sigdata.append(QVariant()); sigdata.append(QVariant()); - writeDataToDevice(socket, QVariant(sigdata)); - sess->sendServerStates(); } -void Core::processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data) { - UserId uid = validClients[socket]; - Global::updateData(uid, key, data); - QList sigdata; - sigdata.append(CS_UPDATE_GLOBAL_DATA); sigdata.append(key); sigdata.append(data); sigdata.append(QVariant()); - foreach(QTcpSocket *s, validClients.keys()) { - if(validClients[s] == uid && s != socket) writeDataToDevice(s, QVariant(sigdata)); - } +void Core::saveState() { + CoreSettings s; + QVariantMap state; + QVariantList activeSessions; + foreach(UserId user, instance()->sessions.keys()) activeSessions << QVariant::fromValue(user); + state["CoreBuild"] = Global::quasselBuild; + state["ActiveSessions"] = activeSessions; + s.setCoreState(state); } -void Core::updateGlobalData(UserId uid, QString key) { - QVariant data = Global::data(uid, key); - QList sigdata; - sigdata.append(CS_UPDATE_GLOBAL_DATA); sigdata.append(key); sigdata.append(data); sigdata.append(QVariant()); - foreach(QTcpSocket *socket, validClients.keys()) { - if(validClients[socket] == uid) writeDataToDevice(socket, QVariant(sigdata)); - } +/*** Storage Access ***/ +bool Core::createNetworkId(UserId user, NetworkInfo &info) { + QMutexLocker locker(&mutex); + NetworkId networkId = instance()->storage->createNetworkId(user, info); + if(!networkId.isValid()) + return false; + + info.networkId = networkId; + return true; } -void Core::recvProxySignal(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) { - CoreSession *sess = qobject_cast(sender()); - Q_ASSERT(sess); - UserId uid = sess->userId(); - QList sigdata; - sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3); - //qDebug() << "Sending signal: " << sigdata; - foreach(QTcpSocket *socket, validClients.keys()) { - if(validClients[socket] == uid) writeDataToDevice(socket, QVariant(sigdata)); - } +NetworkId Core::networkId(UserId user, const QString &network) { + QMutexLocker locker(&mutex); + return instance()->storage->getNetworkId(user, network); } -/* - // Read global settings from config file - QSettings s; - s.beginGroup("Global"); - QString key; - foreach(key, s.childKeys()) { - global->updateData(key, s.value(key)); - } - - global->updateData("CoreReady", true); - // Now that we are in sync, we can connect signals to automatically store further updates. - // I don't think we care if global data changed locally or if it was updated by a client. - connect(global, SIGNAL(dataUpdatedRemotely(QString)), SLOT(globalDataUpdated(QString))); - connect(global, SIGNAL(dataPutLocally(QString)), SLOT(globalDataUpdated(QString))); - -} - */ - -CoreSession::CoreSession(UserId uid, Storage *_storage) : user(uid), storage(_storage) { - coreProxy = new CoreProxy(); - - connect(coreProxy, SIGNAL(send(CoreSignal, QVariant, QVariant, QVariant)), this, SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant))); - connect(coreProxy, SIGNAL(requestServerStates()), this, SIGNAL(serverStateRequested())); - connect(coreProxy, SIGNAL(gsRequestConnect(QStringList)), this, SLOT(connectToIrc(QStringList))); - connect(coreProxy, SIGNAL(gsUserInput(BufferId, QString)), this, SLOT(msgFromGui(BufferId, QString))); - connect(coreProxy, SIGNAL(gsImportBacklog()), storage, SLOT(importOldBacklog())); - connect(coreProxy, SIGNAL(gsRequestBacklog(BufferId, QVariant, QVariant)), this, SLOT(sendBacklog(BufferId, QVariant, QVariant))); - connect(this, SIGNAL(displayMsg(Message)), coreProxy, SLOT(csDisplayMsg(Message))); - connect(this, SIGNAL(displayStatusMsg(QString, QString)), coreProxy, SLOT(csDisplayStatusMsg(QString, QString))); - connect(this, SIGNAL(backlogData(BufferId, QList, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList, bool))); - connect(this, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId))); - connect(storage, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId))); - connect(Global::instance(), SIGNAL(dataUpdatedRemotely(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString))); - connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString))); +BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, const QString &buffer) { + QMutexLocker locker(&mutex); + return instance()->storage->getBufferInfo(user, networkId, buffer); } -CoreSession::~CoreSession() { +MsgId Core::storeMessage(const Message &message) { + QMutexLocker locker(&mutex); + return instance()->storage->logMessage(message); +} +QList Core::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgs(buffer, lastmsgs, offset); } -UserId CoreSession::userId() { - return user; +QList Core::requestMsgs(BufferInfo buffer, QDateTime since, int offset) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgs(buffer, since, offset); } -void CoreSession::processSignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) { - coreProxy->recv(sig, arg1, arg2, arg3); +QList Core::requestMsgRange(BufferInfo buffer, int first, int last) { + QMutexLocker locker(&mutex); + return instance()->storage->requestMsgRange(buffer, first, last); } -void CoreSession::globalDataUpdated(UserId uid, QString key) { - Q_ASSERT(uid == userId()); - QVariant data = Global::data(userId(), key); - QSettings s; - s.setValue(QString("Global/%1/").arg(userId())+key, data); +QList Core::requestBuffers(UserId user, QDateTime since) { + QMutexLocker locker(&mutex); + return instance()->storage->requestBuffers(user, since); } -void CoreSession::connectToIrc(QStringList networks) { - foreach(QString net, networks) { - if(servers.contains(net)) { +/*** Network Management ***/ - } else { - Server *server = new Server(userId(), net); - connect(this, SIGNAL(serverStateRequested()), server, SLOT(sendState())); - connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString))); - connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString))); - connect(this, SIGNAL(msgFromGui(QString, QString, QString)), server, SLOT(userInput(QString, QString, QString))); - - connect(server, SIGNAL(connected(QString)), this, SLOT(serverConnected(QString))); - connect(server, SIGNAL(disconnected(QString)), this, SLOT(serverDisconnected(QString))); - - connect(server, SIGNAL(serverState(QString, VarMap)), coreProxy, SLOT(csServerState(QString, VarMap))); - //connect(server, SIGNAL(displayMsg(Message)), this, SLOT(recvMessageFromServer(Message))); - connect(server, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8))); - connect(server, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString))); - connect(server, SIGNAL(modeSet(QString, QString, QString)), coreProxy, SLOT(csModeSet(QString, QString, QString))); - connect(server, SIGNAL(topicSet(QString, QString, QString)), coreProxy, SLOT(csTopicSet(QString, QString, QString))); - connect(server, SIGNAL(nickAdded(QString, QString, VarMap)), coreProxy, SLOT(csNickAdded(QString, QString, VarMap))); - connect(server, SIGNAL(nickRenamed(QString, QString, QString)), coreProxy, SLOT(csNickRenamed(QString, QString, QString))); - connect(server, SIGNAL(nickRemoved(QString, QString)), coreProxy, SLOT(csNickRemoved(QString, QString))); - connect(server, SIGNAL(nickUpdated(QString, QString, VarMap)), coreProxy, SLOT(csNickUpdated(QString, QString, VarMap))); - connect(server, SIGNAL(ownNickSet(QString, QString)), coreProxy, SLOT(csOwnNickSet(QString, QString))); - connect(server, SIGNAL(queryRequested(QString, QString)), coreProxy, SLOT(csQueryRequested(QString, QString))); - // TODO add error handling - connect(server, SIGNAL(connected(QString)), coreProxy, SLOT(csServerConnected(QString))); - connect(server, SIGNAL(disconnected(QString)), coreProxy, SLOT(csServerDisconnected(QString))); - - server->start(); - servers[net] = server; - } - emit connectToIrc(net); +bool Core::startListening(uint port) { + if(!server.listen(QHostAddress::Any, port)) { + qWarning(QString(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())).toAscii()); + return false; } + qDebug() << "Listening for GUI clients on port" << server.serverPort(); + return true; } -void CoreSession::serverConnected(QString net) { - storage->getBufferId(userId(), net); // create status buffer +void Core::stopListening() { + server.close(); + qDebug() << "No longer listening for GUI clients."; } -void CoreSession::serverDisconnected(QString net) { - delete servers[net]; - servers.remove(net); - coreProxy->csServerDisconnected(net); +void Core::incomingConnection() { + // TODO implement SSL + while (server.hasPendingConnections()) { + QTcpSocket *socket = server.nextPendingConnection(); + connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); + connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData())); + QVariantMap clientInfo; + blocksizes.insert(socket, (quint32)0); + qDebug() << "Client connected from" << qPrintable(socket->peerAddress().toString()); + + if (!configured) { + server.close(); + qDebug() << "Closing server for basic setup."; + } + } } -void CoreSession::msgFromGui(BufferId bufid, QString msg) { - emit msgFromGui(bufid.network(), bufid.buffer(), msg); +void Core::clientHasData() { + QTcpSocket *socket = dynamic_cast(sender()); + Q_ASSERT(socket && blocksizes.contains(socket)); + QVariant item; + while(SignalProxy::readDataFromDevice(socket, blocksizes[socket], item)) { + QVariantMap msg = item.toMap(); + if(!msg.contains("MsgType")) { + // Client is way too old, does not even use the current init format + qWarning() << qPrintable(tr("Antique client trying to connect... refusing.")); + socket->close(); + return; + } + // OK, so we have at least an init message format we can understand + if(msg["MsgType"] == "ClientInit") { + QVariantMap reply; + reply["CoreVersion"] = Global::quasselVersion; + reply["CoreDate"] = Global::quasselDate; + reply["CoreBuild"] = Global::quasselBuild; + // TODO: Make the core info configurable + int uptime = startTime.secsTo(QDateTime::currentDateTime()); + int updays = uptime / 86400; uptime %= 86400; + int uphours = uptime / 3600; uptime %= 3600; + int upmins = uptime / 60; + reply["CoreInfo"] = tr("Quassel Core Version %1 (Build >= %2)
" + "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuild) + .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate)); + + reply["SupportSsl"] = false; + reply["LoginEnabled"] = true; + // TODO: check if we are configured, start wizard otherwise + + // Just version information -- check it! + if(msg["ClientBuild"].toUInt() < Global::clientBuildNeeded) { + reply["MsgType"] = "ClientInitReject"; + reply["Error"] = tr("Your Quassel Client is too old!
" + "This core needs at least client version %1 (Build >= %2).
" + "Please consider upgrading your client.").arg(Global::quasselVersion).arg(Global::quasselBuild); + SignalProxy::writeDataToDevice(socket, reply); + qWarning() << qPrintable(tr("Client %1 too old, rejecting.").arg(socket->peerAddress().toString())); + socket->close(); return; + } + clientInfo[socket] = msg; // store for future reference + reply["MsgType"] = "ClientInitAck"; + SignalProxy::writeDataToDevice(socket, reply); + } else if(msg["MsgType"] == "ClientLogin") { + QVariantMap reply; + if(!clientInfo.contains(socket)) { + reply["MsgType"] = "ClientLoginReject"; + reply["Error"] = tr("Client not initialized!
You need to send an init message before trying to login."); + SignalProxy::writeDataToDevice(socket, reply); + qWarning() << qPrintable(tr("Client %1 did not send an init message before trying to login, rejecting.").arg(socket->peerAddress().toString())); + socket->close(); return; + } + mutex.lock(); + UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); + mutex.unlock(); + if(uid == 0) { + reply["MsgType"] = "ClientLoginReject"; + reply["Error"] = tr("Invalid username or password!
The username/password combination you supplied could not be found in the database."); + SignalProxy::writeDataToDevice(socket, reply); + continue; + } + reply["MsgType"] = "ClientLoginAck"; + SignalProxy::writeDataToDevice(socket, reply); + qDebug() << qPrintable(tr("Client %1 initialized and authentificated successfully as \"%2\".").arg(socket->peerAddress().toString(), msg["User"].toString())); + setupClientSession(socket, uid); + } + //socket->close(); return; + /* + // we need to auth the client + try { + QVariantMap msg = item.toMap(); + if (msg["GuiProtocol"].toUInt() != GUI_PROTOCOL) { + throw Exception("GUI client version mismatch"); + } + if (configured) { + processClientInit(socket, msg); + } else { + processCoreSetup(socket, msg); + } + } catch(Storage::AuthError) { + qWarning() << "Authentification error!"; // FIXME: send auth error to client + socket->close(); + return; + } catch(Exception e) { + qWarning() << "Client init error:" << e.msg(); + socket->close(); + return; + } */ + } } -// ALL messages coming pass through these functions before going to the GUI. -// So this is the perfect place for storing the backlog and log stuff. +// Potentially called during the initialization phase (before handing the connection off to the session) +void Core::clientDisconnected() { + QTcpSocket *socket = dynamic_cast(sender()); + blocksizes.remove(socket); + clientInfo.remove(socket); + qDebug() << qPrintable(tr("Client %1 disconnected.").arg(socket->peerAddress().toString())); + socket->deleteLater(); + socket = 0; + + // make server listen again if still not configured FIXME + if (!configured) { + startListening(); + } -void CoreSession::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) { - Server *s = qobject_cast(this->sender()); - Q_ASSERT(s); - BufferId buf; - if((flags & Message::PrivMsg) && !(flags & Message::Self)) { - buf = storage->getBufferId(user, s->getNetwork(), nickFromMask(sender)); + // TODO remove unneeded sessions - if necessary/possible... + // Suggestion: kill sessions if they are not connected to any network and client. +} + +void Core::processCoreSetup(QTcpSocket *socket, QVariantMap &msg) { + if(msg["HasSettings"].toBool()) { + QVariantMap auth; + auth["User"] = msg["User"]; + auth["Password"] = msg["Password"]; + msg.remove("User"); + msg.remove("Password"); + qDebug() << "Initializing storage provider" << msg["Type"].toString(); + + if(!initStorage(msg, true)) { + // notify client to start wizard again + qWarning("Core is currently not configured!"); + QVariantMap reply; + reply["StartWizard"] = true; + reply["StorageProviders"] = availableStorageProviders(); + SignalProxy::writeDataToDevice(socket, reply); + } else { + // write coresettings + CoreSettings s; + s.setDatabaseSettings(msg); + // write admin user to database & make the core listen again to connections + storage->addUser(auth["User"].toString(), auth["Password"].toString()); + startListening(); + // continue the normal procedure + //processClientInit(socket, auth); + } } else { - buf = storage->getBufferId(user, s->getNetwork(), target); + // notify client to start wizard + QVariantMap reply; + reply["StartWizard"] = true; + reply["StorageProviders"] = availableStorageProviders(); + SignalProxy::writeDataToDevice(socket, reply); } - Message msg(buf, type, text, sender, flags); - msg.msgId = storage->logMessage(msg); //qDebug() << msg.msgId; - Q_ASSERT(msg.msgId); - emit displayMsg(msg); -} - -void CoreSession::recvStatusMsgFromServer(QString msg) { - Server *s = qobject_cast(sender()); - Q_ASSERT(s); - emit displayStatusMsg(s->getNetwork(), msg); } - -QList CoreSession::buffers() const { - return storage->requestBuffers(user); -} - - -QVariant CoreSession::sessionState() { - VarMap v; - QList bufs; - foreach(BufferId id, storage->requestBuffers(user)) { bufs.append(QVariant::fromValue(id)); } - v["Buffers"] = bufs; - - return v; -} - -void CoreSession::sendServerStates() { - emit serverStateRequested(); +void Core::setupClientSession(QTcpSocket *socket, UserId uid) { + // Find or create session for validated user + SessionThread *sess; + if(sessions.contains(uid)) sess = sessions[uid]; + else sess = createSession(uid); + // Hand over socket, session then sends state itself + disconnect(socket, 0, this, 0); + if(!sess) { + qWarning() << qPrintable(tr("Could not initialize session for client %1!").arg(socket->peerAddress().toString())); + socket->close(); + } + sess->addClient(socket); } -void CoreSession::sendBacklog(BufferId id, QVariant v1, QVariant v2) { - QList log; - QList msglist; - if(v1.type() == QVariant::DateTime) { - - - } else { - msglist = storage->requestMsgs(id, v1.toInt(), v2.toInt()); +SessionThread *Core::createSession(UserId uid, bool restore) { + if(sessions.contains(uid)) { + qWarning() << "Calling createSession() when a session for the user already exists!"; + return 0; } + SessionThread *sess = new SessionThread(uid, restore, this); + sessions[uid] = sess; + sess->start(); + return sess; +} - // Send messages out in smaller packages - we don't want to make the signal data too large! - for(int i = 0; i < msglist.count(); i++) { - log.append(QVariant::fromValue(msglist[i])); - if(log.count() >= 5) { - emit backlogData(id, log, i >= msglist.count() - 1); - log.clear(); - } +QStringList Core::availableStorageProviders() { + QStringList storageProviders; + if (SqliteStorage::isAvailable()) { + storageProviders.append(SqliteStorage::displayName()); } - if(log.count() > 0) emit backlogData(id, log, true); + // TODO: temporary + // storageProviders.append("MySQL"); + + return storageProviders; } - - -//Core *core = 0;