X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fremotepeer.h;h=8a47b0a716e6849c83496a2fdc843e8d08431a89;hp=a40edc4975aff0ad78e67f409ec7e776a15c3bdd;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=b654b2f908590b6f69a7edadf9dacf1277a4493b

diff --git a/src/common/remotepeer.h b/src/common/remotepeer.h
index a40edc49..8a47b0a7 100644
--- a/src/common/remotepeer.h
+++ b/src/common/remotepeer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,21 +18,22 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef REMOTEPEER_H
-#define REMOTEPEER_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QDateTime>
 
+#include "compressor.h"
 #include "peer.h"
 #include "protocol.h"
 #include "signalproxy.h"
 
-class QTcpSocket;
 class QTimer;
 
 class AuthHandler;
 
-class RemotePeer : public Peer
+class COMMON_EXPORT RemotePeer : public Peer
 {
     Q_OBJECT
 
@@ -41,18 +42,22 @@ 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 = nullptr);
+
+    void setSignalProxy(SignalProxy *proxy) override;
 
-    void setSignalProxy(SignalProxy *proxy);
+    virtual QString protocolName() const = 0;
+    QString description() const override;
+    virtual quint16 enabledFeatures() const { return 0; }
 
-    QString description() const;
+    QString address() const override;
+    quint16 port() const override;
 
-    bool isOpen() const;
-    bool isSecure() const;
-    bool isLocal() const;
+    bool isOpen() const override;
+    bool isSecure() const override;
+    bool isLocal() const override;
 
-    int lag() const;
+    int lag() const override;
 
     bool compressionEnabled() const;
     void setCompressionEnabled(bool enabled);
@@ -60,7 +65,7 @@ public:
     QTcpSocket *socket() const;
 
 public slots:
-    void close(const QString &reason = QString());
+    void close(const QString &reason = QString()) override;
 
 signals:
     void transferProgress(int current, int max);
@@ -68,7 +73,10 @@ signals:
     void statusMessage(const QString &msg);
 
 protected:
-    SignalProxy *signalProxy() const;
+    SignalProxy *signalProxy() const override;
+
+    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);
@@ -76,18 +84,26 @@ protected:
     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