X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=ebe8061963adb2ab8964e1493a8035ab4bb3adf2;hp=045b8f3c67b4567accd7251a82a8816218a640b8;hb=800b9cc3f9730953c74156f31aeff4d59ec7bade;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/core/core.h b/src/core/core.h
index 045b8f3c..ebe80619 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef CORE_H
@@ -42,9 +42,10 @@
 #include "types.h"
 
 class CoreSession;
+class RemotePeer;
+struct NetworkInfo;
 class SessionThread;
 class SignalProxy;
-struct NetworkInfo;
 
 class AbstractSqlMigrationReader;
 class AbstractSqlMigrationWriter;
@@ -484,7 +485,7 @@ public slots:
     /** \note This method is threadsafe.
      */
     void syncStorage();
-    void setupInternalClientSession(SignalProxy *proxy);
+    void setupInternalClientSession(InternalPeer *clientConnection);
 
 signals:
     //! Sent when a BufferInfo is updated in storage.
@@ -500,7 +501,6 @@ private slots:
     bool startListening();
     void stopListening(const QString &msg = QString());
     void incomingConnection();
-    void clientHasData();
     void clientDisconnected();
 
     bool initStorage(const QString &backend, QVariantMap settings, bool setup = false);
@@ -511,6 +511,8 @@ private slots:
 #endif
     void socketError(QAbstractSocket::SocketError);
 
+    void processClientMessage(const QVariant &data);
+
 private:
     Core();
     ~Core();
@@ -518,9 +520,8 @@ private:
     static Core *instanceptr;
 
     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 setupClientSession(RemotePeer *peer, UserId uid);
+    void addClientHelper(RemotePeer *peer, UserId uid);
     //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
     QString setupCoreForInternalUsage();
     QString setupCore(QVariantMap setupData);
@@ -547,8 +548,7 @@ private:
 
     OidentdConfigGenerator *_oidentdConfigGenerator;
 
-    QHash<QTcpSocket *, quint32> blocksizes;
-    QHash<QTcpSocket *, QVariantMap> clientInfo;
+    QHash<RemotePeer *, QVariantMap> clientInfo;
 
     QHash<QString, Storage *> _storageBackends;