X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=4d555cfc4720b59808e2357afc11d22a104ca99c;hp=ebfe4914ce386a3168038a5315f858be175c382a;hb=41dd93ccb2696dced0e27e213ee7a3a75c9044a8;hpb=cb1918d94b5d8ec9f05a192c96fab938782dabf5 diff --git a/src/core/core.cpp b/src/core/core.cpp index ebfe4914..4d555cfc 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -26,9 +26,11 @@ #include "core.h" #include "coresession.h" #include "coresettings.h" +#include "quassel.h" #include "signalproxy.h" #include "sqlitestorage.h" #include "network.h" +#include "logger.h" #include "util.h" @@ -48,13 +50,16 @@ void Core::destroy() { } Core::Core() : storage(0) { - startTime = QDateTime::currentDateTime(); // for uptime :) + _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :) // Register storage backends here! registerStorageBackend(new SqliteStorage(this)); if(!_storageBackends.count()) { - qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); + quWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting...")); + quWarning() << qPrintable(tr("Currently, Quassel only supports SQLite3. You need to build your\n" + "Qt library with the sqlite plugin enabled in order for quasselcore\n" + "to work.")); exit(1); // TODO make this less brutal (especially for mono client -> popup) } connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage())); @@ -67,7 +72,7 @@ void Core::init() { CoreSettings cs; if(!(configured = initStorage(cs.storageSettings().toMap()))) { - qWarning("Core is currently not configured! Please connect with a Quassel Client for basic setup."); + quWarning() << "Core is currently not configured! Please connect with a Quassel Client for basic setup."; // try to migrate old settings QVariantMap old = cs.oldDbSettings().toMap(); @@ -75,19 +80,20 @@ void Core::init() { QVariantMap newSettings; newSettings["Backend"] = "SQLite"; if((configured = initStorage(newSettings))) { - qWarning("...but thankfully I found some old settings to migrate!"); + quWarning() << "...but thankfully I found some old settings to migrate!"; cs.setStorageSettings(newSettings); } } } - connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - if(!startListening(cs.port())) exit(1); // TODO make this less brutal + connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); + connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); + if(!startListening()) exit(1); // TODO make this less brutal } Core::~Core() { - foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys(); - socket->disconnectFromHost(); // disconnect local (i.e. non-authed) clients + foreach(QTcpSocket *socket, blocksizes.keys()) { + socket->disconnectFromHost(); // disconnect non authed clients } qDeleteAll(sessions); qDeleteAll(_storageBackends); @@ -111,7 +117,7 @@ void Core::restoreState() { return; } if(instance()->sessions.count()) { - qWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); + quWarning() << qPrintable(tr("Calling restoreState() even though active sessions exist!")); return; } CoreSettings s; @@ -124,7 +130,7 @@ void Core::restoreState() { */ QVariantList activeSessions = s.coreState().toMap()["ActiveSessions"].toList(); if(activeSessions.count() > 0) { - qDebug() << "Restoring previous core state..."; + quInfo() << "Restoring previous core state..."; foreach(QVariant v, activeSessions) { UserId user = v.value(); instance()->createSession(user, true); @@ -146,7 +152,7 @@ QString Core::setupCore(const QVariant &setupData_) { } CoreSettings s; s.setStorageSettings(setupData); - qDebug() << qPrintable(tr("Creating admin user...")); + quInfo() << qPrintable(tr("Creating admin user...")); mutex.lock(); storage->addUser(user, password); mutex.unlock(); @@ -183,12 +189,12 @@ bool Core::initStorage(QVariantMap dbSettings, bool setup) { if(_storageBackends.contains(backend)) { storage = _storageBackends[backend]; } else { - qWarning() << "Selected storage backend is not available:" << backend; + quError() << "Selected storage backend is not available:" << backend; return configured = false; } if(!storage->init(dbSettings)) { if(!setup || !(storage->setup(dbSettings) && storage->init(dbSettings))) { - qWarning() << "Could not init storage!"; + quError() << "Could not init storage!"; storage = 0; return configured = false; } @@ -309,6 +315,11 @@ QList Core::requestBuffers(UserId user) { return instance()->storage->requestBuffers(user); } +QList Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) { + QMutexLocker locker(&mutex); + return instance()->storage->requestBufferIdsForNetwork(user, networkId); +} + bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) { QMutexLocker locker(&mutex); return instance()->storage->removeBuffer(user, bufferId); @@ -331,34 +342,49 @@ QHash Core::bufferLastSeenMsgIds(UserId user) { /*** Network Management ***/ -bool Core::startListening(uint port) { - if(!server.listen(QHostAddress::Any, port)) { - qWarning(qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()))); - return false; +bool Core::startListening() { + bool success = false; + uint port = Quassel::optionValue("port").toUInt(); + + if(_server.listen(QHostAddress::Any, port)) { + quInfo() << "Listening for GUI clients on IPv6 port" << _server.serverPort() << "using protocol version" << Global::protocolVersion; + success = true; } - qDebug() << "Listening for GUI clients on port" << server.serverPort(); - return true; + if(_v6server.listen(QHostAddress::AnyIPv6, port)) { + quInfo() << "Listening for GUI clients on IPv4 port" << _v6server.serverPort() << "using protocol version" << Global::protocolVersion; + success = true; + } + + if(!success) { + quError() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(_server.errorString())); + } + + return success; } void Core::stopListening() { - server.close(); - qDebug() << "No longer listening for GUI clients."; + _server.close(); + _v6server.close(); + quInfo() << "No longer listening for GUI clients."; } void Core::incomingConnection() { - while(server.hasPendingConnections()) { - QTcpSocket *socket = server.nextPendingConnection(); + QTcpServer *server = qobject_cast(sender()); + Q_ASSERT(server); + while(server->hasPendingConnections()) { + QTcpSocket *socket = server->nextPendingConnection(); connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected())); connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData())); connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); - + QVariantMap clientInfo; blocksizes.insert(socket, (quint32)0); - qDebug() << "Client connected from" << qPrintable(socket->peerAddress().toString()); + quInfo() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString()); - if (!configured) { - server.close(); - qDebug() << "Closing server for basic setup."; + if(!configured) { + _server.close(); + _v6server.close(); + quDebug() << "Closing server for basic setup."; } } } @@ -377,7 +403,7 @@ void Core::clientHasData() { void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { 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.")); + quWarning() << qPrintable(tr("Antique client trying to connect... refusing.")); socket->close(); return; } @@ -386,14 +412,16 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { QVariantMap reply; // Just version information -- check it! - if(msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732 - || !msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol) { + uint ver = 0; + if(!msg.contains("ProtocolVersion") && msg["ClientBuild"].toUInt() >= 732) ver = 1; // FIXME legacy + if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt(); + if(ver < Global::coreNeedsProtocol) { reply["MsgType"] = "ClientInitReject"; reply["Error"] = tr("Your Quassel Client is too old!
" "This core needs at least client/core protocol version %1.
" "Please consider upgrading your client.").arg(Global::coreNeedsProtocol); SignalProxy::writeDataToDevice(socket, reply); - qWarning() << qPrintable(tr("Client %1 too old, rejecting.").arg(socket->peerAddress().toString())); + quWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting.")); socket->close(); return; } @@ -402,17 +430,17 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["CoreBuild"] = 860; // FIXME legacy reply["ProtocolVersion"] = Global::protocolVersion; // TODO: Make the core info configurable - int uptime = startTime.secsTo(QDateTime::currentDateTime()); + int uptime = startTime().secsTo(QDateTime::currentDateTime().toUTC()); int updays = uptime / 86400; uptime %= 86400; int uphours = uptime / 3600; uptime %= 3600; int upmins = uptime / 60; reply["CoreInfo"] = tr("Quassel Core Version %1
" - "Built: %2
" - "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate) - .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate)); + "Built: %2
" + "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate) + .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate)); -#ifndef QT_NO_OPENSSL - SslServer *sslServer = qobject_cast(&server); +#ifdef HAVE_SSL + SslServer *sslServer = qobject_cast(&_server); QSslSocket *sslSocket = qobject_cast(socket); bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid(); #else @@ -450,10 +478,10 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["MsgType"] = "ClientInitAck"; SignalProxy::writeDataToDevice(socket, reply); -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL // after we told the client that we are ssl capable we switch to ssl mode if(supportSsl && msg["UseSsl"].toBool()) { - qDebug() << "Starting TLS for Client:" << qPrintable(socket->peerAddress().toString()); + quDebug() << qPrintable(tr("Starting TLS for Client:")) << qPrintable(socket->peerAddress().toString()); connect(sslSocket, SIGNAL(sslErrors(const QList &)), this, SLOT(sslErrors(const QList &))); sslSocket->startServerEncryption(); } @@ -462,10 +490,10 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { #ifndef QT_NO_COMPRESS if(supportsCompression && msg["UseCompression"].toBool()) { socket->setProperty("UseCompression", true); - qDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString()); + quDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString()); } #endif - + } else { // for the rest, we need an initialized connection if(!clientInfo.contains(socket)) { @@ -473,7 +501,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { 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())); + quWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("did not send an init message before trying to login, rejecting.")); socket->close(); return; } if(msg["MsgType"] == "CoreSetupData") { @@ -499,7 +527,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { } reply["MsgType"] = "ClientLoginAck"; SignalProxy::writeDataToDevice(socket, reply); - qDebug() << qPrintable(tr("Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3).").arg(socket->peerAddress().toString(), msg["User"].toString()).arg(uid.toInt())); + quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("initialized and authenticated successfully as \"%1\" (UserId: %2).").arg(msg["User"].toString()).arg(uid.toInt())); setupClientSession(socket, uid); } } @@ -507,13 +535,37 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { // Potentially called during the initialization phase (before handing the connection off to the session) void Core::clientDisconnected() { - QTcpSocket *socket = dynamic_cast(sender()); // Note: This might be a QObject* already (if called by ~Core())! - Q_ASSERT(socket); - blocksizes.remove(socket); - clientInfo.remove(socket); - qDebug() << qPrintable(tr("Non-authed client disconnected.")); - socket->deleteLater(); - socket = 0; + QTcpSocket *socket = qobject_cast(sender()); + if(socket) { + // here it's safe to call methods on socket! + quInfo() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString()); + blocksizes.remove(socket); + clientInfo.remove(socket); + socket->deleteLater(); + } else { + // we have to crawl through the hashes and see if we find a victim to remove + quDebug() << qPrintable(tr("Non-authed client disconnected. (socket allready destroyed)")); + + // DO NOT CALL ANY METHODS ON socket!! + socket = static_cast(sender()); + + QHash::iterator blockSizeIter = blocksizes.begin(); + while(blockSizeIter != blocksizes.end()) { + if(blockSizeIter.key() == socket) { + blocksizes.erase(blockSizeIter); + } + blockSizeIter++; + } + + QHash::iterator clientInfoIter = clientInfo.begin(); + while(clientInfoIter != clientInfo.end()) { + if(clientInfoIter.key() == socket) { + clientInfo.erase(clientInfoIter); + } + clientInfoIter++; + } + } + // make server listen again if still not configured if (!configured) { @@ -534,7 +586,7 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) { blocksizes.remove(socket); clientInfo.remove(socket); if(!sess) { - qWarning() << qPrintable(tr("Could not initialize session for client %1!").arg(socket->peerAddress().toString())); + quWarning() << qPrintable(tr("Could not initialize session for client:")) << qPrintable(socket->peerAddress().toString()); socket->close(); } sess->addClient(socket); @@ -542,7 +594,7 @@ void Core::setupClientSession(QTcpSocket *socket, UserId uid) { SessionThread *Core::createSession(UserId uid, bool restore) { if(sessions.contains(uid)) { - qWarning() << "Calling createSession() when a session for the user already exists!"; + quWarning() << "Calling createSession() when a session for the user already exists!"; return 0; } SessionThread *sess = new SessionThread(uid, restore, this); @@ -551,7 +603,7 @@ SessionThread *Core::createSession(UserId uid, bool restore) { return sess; } -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL void Core::sslErrors(const QList &errors) { Q_UNUSED(errors); QSslSocket *socket = qobject_cast(sender()); @@ -563,5 +615,5 @@ void Core::sslErrors(const QList &errors) { void Core::socketError(QAbstractSocket::SocketError err) { QAbstractSocket *socket = qobject_cast(sender()); if(socket && err != QAbstractSocket::RemoteHostClosedError) - qDebug() << "Core::socketError()" << socket << err << socket->errorString(); + quWarning() << "Core::socketError()" << socket << err << socket->errorString(); }