X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fremotepeer.h;h=448982975ae2ca7567d894896b634a045e4d57d0;hp=a40edc4975aff0ad78e67f409ec7e776a15c3bdd;hb=249a178a775bce425a83aefd7c7c39a868ebfe98;hpb=b654b2f908590b6f69a7edadf9dacf1277a4493b

diff --git a/src/common/remotepeer.h b/src/common/remotepeer.h
index a40edc49..44898297 100644
--- a/src/common/remotepeer.h
+++ b/src/common/remotepeer.h
@@ -23,11 +23,11 @@
 
 #include <QDateTime>
 
+#include "compressor.h"
 #include "peer.h"
 #include "protocol.h"
 #include "signalproxy.h"
 
-class QTcpSocket;
 class QTimer;
 
 class AuthHandler;
@@ -41,12 +41,14 @@ public:
     using Peer::handle;
     using Peer::dispatch;
 
-    RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);
-    virtual ~RemotePeer() {};
+    RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = 0);
 
     void setSignalProxy(SignalProxy *proxy);
 
-    QString description() const;
+    virtual Protocol::Type protocol() const = 0;
+    virtual QString protocolName() const = 0;
+    virtual QString description() const;
+    virtual quint16 enabledFeatures() const { return 0; }
 
     bool isOpen() const;
     bool isSecure() const;
@@ -70,24 +72,37 @@ signals:
 protected:
     SignalProxy *signalProxy() const;
 
+    void writeMessage(const QByteArray &msg);
+    virtual void processMessage(const QByteArray &msg) = 0;
+
     // These protocol messages get handled internally and won't reach SignalProxy
     void handle(const Protocol::HeartBeat &heartBeat);
     void handle(const Protocol::HeartBeatReply &heartBeatReply);
     virtual void dispatch(const Protocol::HeartBeat &msg) = 0;
     virtual void dispatch(const Protocol::HeartBeatReply &msg) = 0;
 
+protected slots:
+    virtual void onSocketStateChanged(QAbstractSocket::SocketState state);
+    virtual void onSocketError(QAbstractSocket::SocketError error);
+
 private slots:
+    void onReadyRead();
+    void onCompressionError(Compressor::Error error);
+
     void sendHeartBeat();
     void changeHeartBeatInterval(int secs);
-    void onSocketStateChanged(QAbstractSocket::SocketState state);
-    void onSocketError(QAbstractSocket::SocketError error);
+
+private:
+    bool readMessage(QByteArray &msg);
 
 private:
     QTcpSocket *_socket;
+    Compressor *_compressor;
     SignalProxy *_signalProxy;
     QTimer *_heartBeatTimer;
     int _heartBeatCount;
     int _lag;
+    quint32 _msgSize;
 };
 
 #endif