X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=5159f93a449f3e3c52b0eec6f327844e8bc45198;hp=f9bc84fad955138d435851f19a2097efd61ab780;hb=c7ad7451b1e899ba0de2ded9ac08359dff5cca61;hpb=8836fdc8e4107437e5fff0e10e18d581297d59e4 diff --git a/src/core/core.cpp b/src/core/core.cpp index f9bc84fa..5159f93a 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -19,14 +19,9 @@ ***************************************************************************/ #include "core.h" -#include "server.h" -#include "global.h" -#include "util.h" -#include "coreproxy.h" +#include "coresession.h" #include "sqlitestorage.h" - -#include -#include +#include "util.h" Core *Core::instanceptr = 0; @@ -52,40 +47,12 @@ void Core::init() { } //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 + startListening(); // FIXME make configurable guiUser = 0; - /* - 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(); } Core::~Core() { - foreach(QTcpSocket *sock, validClients.keys()) { - delete sock; - } qDeleteAll(sessions); delete storage; } @@ -107,7 +74,6 @@ CoreSession *Core::createSession(UserId uid) { 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; } @@ -128,6 +94,7 @@ void Core::stopListening() { void Core::incomingConnection() { // TODO implement SSL + // TODO While QTcpSocket *socket = server.nextPendingConnection(); connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData())); @@ -140,37 +107,27 @@ void Core::clientHasData() { 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; - } + if(readDataFromDevice(socket, bsize, item)) { + // we need to auth the client + try { + processClientInit(socket, item); + } 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; } - blockSizes[socket] = bsize = 0; } - blockSizes[socket] = bsize; + blockSizes[socket] = bsize = 0; // FIXME blockSizes aufräum0rn! } +// FIXME: no longer called, since connection handling is now in SignalProxy void Core::clientDisconnected() { QTcpSocket *socket = dynamic_cast(sender()); blockSizes.remove(socket); - validClients.remove(socket); qDebug() << "Client disconnected."; // TODO remove unneeded sessions - if necessary/possible... } @@ -179,30 +136,28 @@ QVariant Core::connectLocalClient(QString user, QString passwd) { UserId uid = instance()->storage->validateUser(user, passwd); QVariant reply = instance()->initSession(uid); instance()->guiUser = uid; - Global::setGuiUser(uid); qDebug() << "Local client connected."; return reply; } -QVariant Core::disconnectLocalClient() { +void Core::disconnectLocalClient() { qDebug() << "Local client disconnected."; instance()->guiUser = 0; - Global::setGuiUser(0); } void Core::processClientInit(QTcpSocket *socket, const QVariant &v) { - VarMap msg = v.toMap(); - if(msg["GUIProtocol"].toUInt() != GUI_PROTOCOL) { + QVariantMap msg = v.toMap(); + if(msg["GuiProtocol"].toUInt() != GUI_PROTOCOL) { //qWarning() << "Client version mismatch."; throw Exception("GUI client version mismatch"); } // Auth UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString()); // throws exception if this failed - VarMap reply = initSession(uid).toMap(); - validClients[socket] = uid; - QList sigdata; - sigdata.append(CS_CORE_STATE); sigdata.append(QVariant(reply)); sigdata.append(QVariant()); sigdata.append(QVariant()); - writeDataToDevice(socket, QVariant(sigdata)); + QVariant reply = initSession(uid); + disconnect(socket, 0, this, 0); + sessions[uid]->addClient(socket); + qDebug() << "Client initialized successfully."; + writeDataToDevice(socket, reply); } QVariant Core::initSession(UserId uid) { @@ -211,220 +166,8 @@ QVariant Core::initSession(UserId uid) { if(sessions.contains(uid)) sess = sessions[uid]; else { sess = createSession(uid); - //validClients[socket] = uid; - } - VarMap reply; - VarMap coreData; - QStringList dataKeys = Global::keys(uid); - foreach(QString key, dataKeys) { - coreData[key] = Global::data(uid, key); } - reply["CoreData"] = coreData; + QVariantMap reply; reply["SessionState"] = sess->sessionState(); return reply; } - -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::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)); - } -} - -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)); - } -} - -/* - // 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(coreProxy, SIGNAL(gsRequestNetworkStates()), this, SLOT(sendServerStates())); - 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))); -} - -CoreSession::~CoreSession() { - -} - -UserId CoreSession::userId() { - return user; -} - -void CoreSession::processSignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) { - coreProxy->recv(sig, arg1, arg2, arg3); -} - -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); -} - -void CoreSession::connectToIrc(QStringList networks) { - foreach(QString net, networks) { - if(servers.contains(net)) { - - } 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); - } -} - -void CoreSession::serverConnected(QString net) { - storage->getBufferId(userId(), net); // create status buffer -} - -void CoreSession::serverDisconnected(QString net) { - delete servers[net]; - servers.remove(net); - coreProxy->csServerDisconnected(net); -} - -void CoreSession::msgFromGui(BufferId bufid, QString msg) { - emit msgFromGui(bufid.network(), bufid.buffer(), msg); -} - -// 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. - -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)); - } else { - buf = storage->getBufferId(user, s->getNetwork(), target); - } - 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 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()); - } - - // 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(); - } - } - if(log.count() > 0) emit backlogData(id, log, true); -} - - -//Core *core = 0;