#include <QString>
#include <QVariant>
#include <QTimer>
-#include <QTcpSocket>
-#include <QSslSocket>
+
+#ifdef HAVE_SSL
+# include <QSslSocket>
+# include "sslserver.h"
+#else
+# include <QTcpSocket>
+# include <QTcpServer>
+#endif
#include "bufferinfo.h"
#include "message.h"
-#include "global.h"
#include "sessionthread.h"
-#include "sslserver.h"
#include "types.h"
class CoreSession;
class SessionThread;
+class SignalProxy;
class Storage;
struct NetworkInfo;
/*** 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.
*
* \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.
*
* \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.
*
*/
static BufferInfo getBufferInfo(UserId user, const BufferId &bufferId);
-
+
//! Store a Message in the backlog.
/** \note This method is threadsafe.
*
/** \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<Message> requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1);
+ static QList<Message> 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.
*/
static QList<Message> requestMsgRange(UserId user, BufferId buffer, int first, int last);
- //! Request a list of all buffers known to a user since a certain point in time.
+ //! Request a list of all buffers known to a user.
/** This method is used to get a list of all buffers we have stored a backlog from.
- * Optionally, a QDateTime can be given, so that only buffers are listed that were active
- * since that point in time.
* \note This method is threadsafe.
*
* \param user The user whose buffers we request
- * \param since If this is defined, older buffers will be ignored
* \return A list of the BufferInfos for all buffers as requested
*/
- static QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
+ static QList<BufferInfo> 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<BufferId> requestBufferIdsForNetwork(UserId user, NetworkId networkId);
//! Remove permanently a buffer and it's content from the storage backend
/** This call cannot be reverted!
*/
static QHash<BufferId, MsgId> 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);
+#ifdef HAVE_SSL
void sslErrors(const QList<QSslError> &errors);
+#endif
void socketError(QAbstractSocket::SocketError);
private:
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 *);
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<QTcpSocket *, quint32> blocksizes;
QHash<QTcpSocket *, QVariantMap> clientInfo;
QHash<QString, Storage *> _storageBackends;
- QDateTime startTime;
+ QDateTime _startTime;
bool configured;
projects / quassel.git / blobdiff