X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=a2a15ae4e61c23d3f2cccddf8d1bd6c86b237c07;hp=eddaf7f3d8b2561602bcee58a6795c91eb5787a9;hb=1eb21546673535f5707aa6346e8c749b928cd772;hpb=a0c839394a714783966a4282b30b4025fe9fa76e

diff --git a/src/core/core.h b/src/core/core.h
index eddaf7f3..a2a15ae4 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -37,12 +37,12 @@
 
 #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.
      *
@@ -289,14 +289,17 @@ 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::parser.value("port").toUInt());
-    void stopListening();
+    bool startListening();
+    void stopListening(const QString &msg = QString());
     void incomingConnection();
     void clientHasData();
     void clientDisconnected();
@@ -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;
 
-#ifdef HAVE_SSL  
+#ifdef HAVE_SSL
   SslServer _server, _v6server;
 #else
   QTcpServer _server, _v6server;
-#endif  
+#endif
 
     QHash<QTcpSocket *, quint32> blocksizes;
     QHash<QTcpSocket *, QVariantMap> clientInfo;