X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=2b63646daab355aafb00b9d3c7e26313ff168ad2;hp=5a125a4f0f25585c341530b035385c2978863cd2;hb=26b9300ccab24e526a9f43bef95a2a70f59161df;hpb=9204e98848ab202c0117aa1428fa0ea10b4dcd75 diff --git a/src/core/core.h b/src/core/core.h index 5a125a4f..2b63646d 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -27,22 +27,22 @@ #include #include -#ifndef QT_NO_OPENSSL -#include -#include "sslserver.h" +#ifdef HAVE_SSL +# include +# include "sslserver.h" #else -#include -#include +# include +# include #endif #include "bufferinfo.h" #include "message.h" -#include "global.h" #include "sessionthread.h" #include "types.h" class CoreSession; class SessionThread; +class SignalProxy; class Storage; struct NetworkInfo; @@ -59,6 +59,24 @@ class Core : public QObject { /*** Storage access ***/ // These methods are threadsafe. + //! Store a user setting persistently + /** + * \param userId The users Id + * \param settingName The Name of the Setting + * \param data The Value + */ + static void setUserSetting(UserId userId, const QString &settingName, const QVariant &data); + + //! Retrieve a persistent user setting + /** + * \param userId The users Id + * \param settingName The Name of the Setting + * \param default Value to return in case it's unset. + * \return the Value of the Setting or the default value if it is unset. + */ + static QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &data = QVariant()); + + //! Create a Network in the Storage and store it's Id in the given NetworkInfo /** \note This method is thredsafe. * @@ -67,7 +85,7 @@ class Core : public QObject { * \return true if successfull. */ static bool createNetwork(UserId user, NetworkInfo &info); - + //! Apply the changes to NetworkInfo info to the storage engine /** \note This method is thredsafe. * @@ -85,7 +103,7 @@ class Core : public QObject { * \return true if successfull. */ static bool removeNetwork(UserId user, const NetworkId &networkId); - + //! Returns a list of all NetworkInfos for the given UserId user /** \note This method is thredsafe. * @@ -168,7 +186,7 @@ class Core : public QObject { */ static BufferInfo getBufferInfo(UserId user, const BufferId &bufferId); - + //! Store a Message in the backlog. /** \note This method is threadsafe. * @@ -181,11 +199,11 @@ class Core : public QObject { /** \note This method is threadsafe. * * \param buffer The buffer we request messages from - * \param lastmsgs The number of messages we would like to receive, or -1 if we'd like all messages from that buffername + * \param limit The number of messages we would like to receive, or -1 if we'd like all messages from that buffername * \param offset Do not return (but DO count) messages with MsgId >= offset, if offset >= 0 * \return The requested list of messages */ - static QList requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1); + static QList requestMsgs(UserId user, BufferId buffer, int limit = -1, int offset = -1); //! Request messages stored in a given buffer since a certain point in time. /** \note This method is threadsafe. @@ -216,6 +234,16 @@ class Core : public QObject { */ static QList requestBuffers(UserId user); + + //! Request a list of BufferIds for a given NetworkId + /** \note This method is threadsafe. + * + * \param user The user whose buffers we request + * \param networkId The NetworkId of the network in question + * \return List of BufferIds belonging to the Network + */ + static QList requestBufferIdsForNetwork(UserId user, NetworkId networkId); + //! Remove permanently a buffer and it's content from the storage backend /** This call cannot be reverted! * \note This method is threadsafe. @@ -254,26 +282,31 @@ class Core : public QObject { */ static QHash bufferLastSeenMsgIds(UserId user); + const QDateTime &startTime() const { return _startTime; } + public slots: //! Make storage data persistent /** \note This method is threadsafe. */ void syncStorage(); - + void setupInternalClientSession(SignalProxy *proxy); signals: //! Sent when a BufferInfo is updated in storage. void bufferInfoUpdated(UserId user, const BufferInfo &info); + //! Relay From CoreSession::sessionState(const QVariant &). Used for internal connection only + void sessionState(const QVariant &); + private slots: - bool startListening(uint port = Global::defaultPort); - void stopListening(); + bool startListening(); + void stopListening(const QString &msg = QString()); void incomingConnection(); void clientHasData(); void clientDisconnected(); bool initStorage(QVariantMap dbSettings, bool setup = false); -#ifndef QT_NO_OPENSSL +#ifdef HAVE_SSL void sslErrors(const QList &errors); #endif void socketError(QAbstractSocket::SocketError); @@ -288,7 +321,8 @@ class Core : public QObject { void setupClientSession(QTcpSocket *socket, UserId uid); void processClientMessage(QTcpSocket *socket, const QVariantMap &msg); //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg); - QString setupCore(const QVariant &setupData); + QString setupCoreForInternalUsage(); + QString setupCore(QVariantMap setupData); bool registerStorageBackend(Storage *); void unregisterStorageBackend(Storage *); @@ -297,18 +331,18 @@ class Core : public QObject { Storage *storage; QTimer _storageSyncTimer; -#ifndef QT_NO_OPENSSL - SslServer server; +#ifdef HAVE_SSL + SslServer _server, _v6server; #else - QTcpServer server; -#endif + QTcpServer _server, _v6server; +#endif QHash blocksizes; QHash clientInfo; QHash _storageBackends; - QDateTime startTime; + QDateTime _startTime; bool configured;