X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=2b63646daab355aafb00b9d3c7e26313ff168ad2;hp=e6da7abae26c4215a2e431e6640245f5c46d710d;hb=26b9300ccab24e526a9f43bef95a2a70f59161df;hpb=52df0969e22249e6758714eec9e5afd7d4fe9b83;ds=sidebyside

diff --git a/src/core/core.h b/src/core/core.h
index e6da7aba..2b63646d 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -27,22 +27,22 @@
 #include <QVariant>
 #include <QTimer>
 
-#ifndef QT_NO_OPENSSL
-#include <QSslSocket>
-#include "sslserver.h"
+#ifdef HAVE_SSL
+#  include <QSslSocket>
+#  include "sslserver.h"
 #else
-#include <QTcpSocket>
-#include <QTcpServer>
+#  include <QTcpSocket>
+#  include <QTcpServer>
 #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;
 
@@ -66,7 +66,7 @@ class Core : public QObject {
      * \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
@@ -76,7 +76,7 @@ class Core : public QObject {
      */
     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.
      *
@@ -85,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.
      *
@@ -103,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.
      *
@@ -186,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.
      *
@@ -199,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<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.
@@ -289,21 +289,24 @@ class Core : public QObject {
     /** \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<QSslError> &errors);
 #endif
     void socketError(QAbstractSocket::SocketError);
@@ -318,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 *);
@@ -327,11 +331,11 @@ 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<QTcpSocket *, quint32> blocksizes;
     QHash<QTcpSocket *, QVariantMap> clientInfo;