projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
proxy config is now saved properly
[quassel.git]
/
src
/
core
/
core.h
diff --git
a/src/core/core.h
b/src/core/core.h
index
2255f56
..
5a125a4
100644
(file)
--- a/
src/core/core.h
+++ b/
src/core/core.h
@@
-26,8
+26,14
@@
#include <QString>
#include <QVariant>
#include <QTimer>
#include <QString>
#include <QVariant>
#include <QTimer>
-#include <QTcpServer>
+
+#ifndef QT_NO_OPENSSL
+#include <QSslSocket>
+#include "sslserver.h"
+#else
#include <QTcpSocket>
#include <QTcpSocket>
+#include <QTcpServer>
+#endif
#include "bufferinfo.h"
#include "message.h"
#include "bufferinfo.h"
#include "message.h"
@@
-179,7
+185,7
@@
class Core : public QObject {
* \param offset Do not return (but DO count) messages with MsgId >= offset, if offset >= 0
* \return The requested list of messages
*/
* \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(
BufferInfo
buffer, int lastmsgs = -1, int offset = -1);
+ static QList<Message> requestMsgs(
UserId user, BufferId
buffer, int lastmsgs = -1, int offset = -1);
//! Request messages stored in a given buffer since a certain point in time.
/** \note This method is threadsafe.
//! Request messages stored in a given buffer since a certain point in time.
/** \note This method is threadsafe.
@@
-189,7
+195,7
@@
class Core : public QObject {
* \param offset Do not return messages with MsgId >= offset, if offset >= 0
* \return The requested list of messages
*/
* \param offset Do not return messages with MsgId >= offset, if offset >= 0
* \return The requested list of messages
*/
- static QList<Message> requestMsgs(
BufferInfo
buffer, QDateTime since, int offset = -1);
+ static QList<Message> requestMsgs(
UserId user, BufferId
buffer, QDateTime since, int offset = -1);
//! Request a range of messages stored in a given buffer.
/** \note This method is threadsafe.
//! Request a range of messages stored in a given buffer.
/** \note This method is threadsafe.
@@
-199,19
+205,16
@@
class Core : public QObject {
* \param last Return messages with first <= MsgId <= last
* \return The requested list of messages
*/
* \param last Return messages with first <= MsgId <= last
* \return The requested list of messages
*/
- static QList<Message> requestMsgRange(
BufferInfo
buffer, int first, int last);
+ 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.
/** 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
* \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
*/
* \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);
//! Remove permanently a buffer and it's content from the storage backend
/** This call cannot be reverted!
//! Remove permanently a buffer and it's content from the storage backend
/** This call cannot be reverted!
@@
-239,17
+242,17
@@
class Core : public QObject {
*
* \param user The Owner of that Buffer
* \param bufferId The buffer id
*
* \param user The Owner of that Buffer
* \param bufferId The buffer id
- * \param
seenDate Time the Buffer has been visited the last time
+ * \param
MsgId The Message id of the message that has been just seen
*/
*/
- static void setBufferLastSeen
(UserId user, const BufferId &bufferId, const QDateTime &seenDate
);
+ static void setBufferLastSeen
Msg(UserId user, const BufferId &bufferId, const MsgId &msgId
);
- //! Get a Hash of all last seen
dates.
- /** This Method is called when the Quassel Core is started to restore the lastSeen
Date
s
+ //! Get a Hash of all last seen
message ids
+ /** This Method is called when the Quassel Core is started to restore the lastSeen
MsgId
s
* \note This method is threadsafe.
*
* \param user The Owner of the buffers
*/
* \note This method is threadsafe.
*
* \param user The Owner of the buffers
*/
- static QHash<BufferId,
QDateTime> bufferLastSeenDate
s(UserId user);
+ static QHash<BufferId,
MsgId> bufferLastSeenMsgId
s(UserId user);
public slots:
//! Make storage data persistent
public slots:
//! Make storage data persistent
@@
-270,6
+273,11
@@
class Core : public QObject {
bool initStorage(QVariantMap dbSettings, bool setup = false);
bool initStorage(QVariantMap dbSettings, bool setup = false);
+#ifndef QT_NO_OPENSSL
+ void sslErrors(const QList<QSslError> &errors);
+#endif
+ void socketError(QAbstractSocket::SocketError);
+
private:
Core();
~Core();
private:
Core();
~Core();
@@
-289,7
+297,12
@@
class Core : public QObject {
Storage *storage;
QTimer _storageSyncTimer;
Storage *storage;
QTimer _storageSyncTimer;
- QTcpServer server; // TODO: implement SSL
+#ifndef QT_NO_OPENSSL
+ SslServer server;
+#else
+ QTcpServer server;
+#endif
+
QHash<QTcpSocket *, quint32> blocksizes;
QHash<QTcpSocket *, QVariantMap> clientInfo;
QHash<QTcpSocket *, quint32> blocksizes;
QHash<QTcpSocket *, QVariantMap> clientInfo;