projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes
[quassel.git]
/
src
/
core
/
core.h
diff --git
a/src/core/core.h
b/src/core/core.h
index
31d01be
..
f32502e
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,7
+205,7
@@
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.
/** This method is used to get a list of all buffers we have stored a backlog from.
//! Request a list of all buffers known to a user since a certain point in time.
/** This method is used to get a list of all buffers we have stored a backlog from.
@@
-270,6
+276,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
+300,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;