Fixes #682 - Core crashes on client connection

[quassel.git] / src / core / core.h

diff --git a/src/core/core.h b/src/core/core.h
index 3e19474..c1f397a 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -45,11 +45,14 @@ class SessionThread;
 class SignalProxy;
 struct NetworkInfo;
 
 class SignalProxy;
 struct NetworkInfo;
 

+class AbstractSqlMigrationReader;
+class AbstractSqlMigrationWriter;
+

 class Core : public QObject {
   Q_OBJECT
 
 class Core : public QObject {
   Q_OBJECT
 

-  public:
-  static Core * instance();
+public:
+  static Core *instance();

   static void destroy();
 
   static void saveState();
   static void destroy();
 
   static void saveState();


@@ -379,12 +382,15 @@ class Core : public QObject {
 
   static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; }
 
 
   static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; }
 

+  static const int AddClientEventId;
+

 public slots:
   //! Make storage data persistent
   /** \note This method is threadsafe.
    */
   void syncStorage();
   void setupInternalClientSession(SignalProxy *proxy);
 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);
 signals:
   //! Sent when a BufferInfo is updated in storage.
   void bufferInfoUpdated(UserId user, const BufferInfo &info);


@@ -392,6 +398,9 @@ signals:
   //! Relay From CoreSession::sessionState(const QVariant &). Used for internal connection only
   void sessionState(const QVariant &);
 
   //! Relay From CoreSession::sessionState(const QVariant &). Used for internal connection only
   void sessionState(const QVariant &);
 

+protected:
+  virtual void customEvent(QEvent *event);
+

 private slots:
   bool startListening();
   void stopListening(const QString &msg = QString());
 private slots:
   bool startListening();
   void stopListening(const QString &msg = QString());


@@ -399,6 +408,7 @@ private slots:
   void clientHasData();
   void clientDisconnected();
 
   void clientHasData();
   void clientDisconnected();
 

+  bool initStorage(const QString &backend, QVariantMap settings, bool setup = false);

   bool initStorage(QVariantMap dbSettings, bool setup = false);
 
 #ifdef HAVE_SSL
   bool initStorage(QVariantMap dbSettings, bool setup = false);
 
 #ifdef HAVE_SSL


@@ -414,13 +424,21 @@ private:
 
   SessionThread *createSession(UserId userId, bool restoreState = false);
   void setupClientSession(QTcpSocket *socket, UserId uid);
 
   SessionThread *createSession(UserId userId, bool restoreState = false);
   void setupClientSession(QTcpSocket *socket, UserId uid);

+  void addClientHelper(QTcpSocket *socket, UserId uid);

   void processClientMessage(QTcpSocket *socket, const QVariantMap &msg);
   //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
   QString setupCoreForInternalUsage();
   QString setupCore(QVariantMap setupData);
 
   void processClientMessage(QTcpSocket *socket, const QVariantMap &msg);
   //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
   QString setupCoreForInternalUsage();
   QString setupCore(QVariantMap setupData);
 

+  void registerStorageBackends();

   bool registerStorageBackend(Storage *);
   bool registerStorageBackend(Storage *);

+  void unregisterStorageBackends();

   void unregisterStorageBackend(Storage *);
   void unregisterStorageBackend(Storage *);

+  bool selectBackend(const QString &backend);
+  void createUser();
+  void changeUserPass(const QString &username);
+  void saveBackendSettings(const QString &backend, const QVariantMap &settings);
+  QVariantMap promptForSettings(const Storage *storage);

 
   QHash<UserId, SessionThread *> sessions;
   Storage *_storage;
 
   QHash<UserId, SessionThread *> sessions;
   Storage *_storage;


@@ -440,6 +458,13 @@ private:
   QDateTime _startTime;
 
   bool _configured;
   QDateTime _startTime;
 
   bool _configured;

+
+
+  static AbstractSqlMigrationReader *getMigrationReader(Storage *storage);
+  static AbstractSqlMigrationWriter *getMigrationWriter(Storage *storage);
+  static void stdInEcho(bool on);
+  static inline void enableStdInEcho() { stdInEcho(true); }
+  static inline void disableStdInEcho() { stdInEcho(false); }

 };
 
 #endif
 };
 
 #endif