X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fremotepeer.h;h=4a82492372c967157702a6e031bcbdc629daca14;hp=677ff21cc9c5598b3a694cdce536a3961bc657b4;hb=097f625c4bd147f4127573ad8ab48555f9dc62d3;hpb=5e6f3661d30bc760f912dfe0627e5c62c6f2c144

diff --git a/src/common/remotepeer.h b/src/common/remotepeer.h
index 677ff21c..4a824923 100644
--- a/src/common/remotepeer.h
+++ b/src/common/remotepeer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,67 +18,78 @@
  *   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 "proxyline.h"
 #include "signalproxy.h"
 
 class QTimer;
 
 class AuthHandler;
 
-class RemotePeer : public Peer
+class COMMON_EXPORT RemotePeer : public Peer
 {
     Q_OBJECT
 
 public:
     // import the virtuals from the baseclass
-    using Peer::handle;
     using Peer::dispatch;
+    using Peer::handle;
+
+    RemotePeer(AuthHandler* authHandler, QTcpSocket* socket, Compressor::CompressionLevel level, QObject* parent = nullptr);
 
-    RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = 0);
+    void setSignalProxy(SignalProxy* proxy) override;
 
-    void setSignalProxy(SignalProxy *proxy);
+    void setProxyLine(ProxyLine proxyLine);
 
     virtual QString protocolName() const = 0;
-    virtual QString description() const;
+    QString description() const override;
     virtual quint16 enabledFeatures() const { return 0; }
 
-    bool isOpen() const;
-    bool isSecure() const;
-    bool isLocal() const;
+    QString address() const override;
+    QHostAddress hostAddress() const;
+    quint16 port() const override;
 
-    int lag() const;
+    bool isOpen() const override;
+    bool isSecure() const override;
+    bool isLocal() const override;
+
+    int lag() const override;
 
     bool compressionEnabled() const;
     void setCompressionEnabled(bool enabled);
 
-    QTcpSocket *socket() const;
+    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);
-    void socketError(QAbstractSocket::SocketError error, const QString &errorString);
-    void statusMessage(const QString &msg);
+    void socketError(QAbstractSocket::SocketError error, const QString& errorString);
+    void statusMessage(const QString& msg);
+
+    // Only used by LegacyPeer
+    void protocolVersionMismatch(int actual, int expected);
 
 protected:
-    SignalProxy *signalProxy() const;
+    SignalProxy* signalProxy() const override;
 
-    void writeMessage(const QByteArray &msg);
-    virtual void processMessage(const QByteArray &msg) = 0;
+    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;
+    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);
@@ -92,16 +103,16 @@ private slots:
     void changeHeartBeatInterval(int secs);
 
 private:
-    bool readMessage(QByteArray &msg);
+    bool readMessage(QByteArray& msg);
 
 private:
-    QTcpSocket *_socket;
-    Compressor *_compressor;
-    SignalProxy *_signalProxy;
-    QTimer *_heartBeatTimer;
+    QTcpSocket* _socket;
+    Compressor* _compressor;
+    SignalProxy* _signalProxy;
+    ProxyLine _proxyLine;
+    bool _useProxyLine;
+    QTimer* _heartBeatTimer;
     int _heartBeatCount;
     int _lag;
     quint32 _msgSize;
 };
-
-#endif