projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version for release 0.14-rc2
[quassel.git]
/
src
/
common
/
remotepeer.h
diff --git
a/src/common/remotepeer.h
b/src/common/remotepeer.h
index
a40edc4
..
4a82492
100644
(file)
--- a/
src/common/remotepeer.h
+++ b/
src/common/remotepeer.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
14
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,76
+18,101
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 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 <QDateTime>
+#include "compressor.h"
#include "peer.h"
#include "protocol.h"
#include "peer.h"
#include "protocol.h"
+#include "proxyline.h"
#include "signalproxy.h"
#include "signalproxy.h"
-class QTcpSocket;
class QTimer;
class AuthHandler;
class QTimer;
class AuthHandler;
-class RemotePeer : public Peer
+class
COMMON_EXPORT
RemotePeer : public Peer
{
Q_OBJECT
public:
// import the virtuals from the baseclass
{
Q_OBJECT
public:
// import the virtuals from the baseclass
- using Peer::handle;
using Peer::dispatch;
using Peer::dispatch;
+ using Peer::handle;
- 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)
;
+ void setSignalProxy(SignalProxy
* proxy) override
;
-
QString description() const
;
+
void setProxyLine(ProxyLine proxyLine)
;
-
bool isOpen() const
;
-
bool isSecure() const
;
- bool isLocal() const;
+
virtual QString protocolName() const = 0
;
+
QString description() const override
;
+ virtual quint16 enabledFeatures() const { return 0; }
- int lag() const;
+ QString address() const override;
+ QHostAddress hostAddress() const;
+ quint16 port() const override;
+
+ bool isOpen() const override;
+ bool isSecure() const override;
+ bool isLocal() const override;
+
+ int lag() const override;
bool compressionEnabled() const;
void setCompressionEnabled(bool enabled);
bool compressionEnabled() const;
void setCompressionEnabled(bool enabled);
- QTcpSocket
*
socket() const;
+ QTcpSocket
*
socket() const;
public slots:
public slots:
- void close(const QString
&reason = QString())
;
+ void close(const QString
& reason = QString()) override
;
signals:
void transferProgress(int current, int max);
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:
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
// 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);
+ virtual void onSocketError(QAbstractSocket::SocketError error);
private slots:
private slots:
+ void onReadyRead();
+ void onCompressionError(Compressor::Error error);
+
void sendHeartBeat();
void changeHeartBeatInterval(int secs);
void sendHeartBeat();
void changeHeartBeatInterval(int secs);
- void onSocketStateChanged(QAbstractSocket::SocketState state);
- void onSocketError(QAbstractSocket::SocketError error);
private:
private:
- QTcpSocket *_socket;
- SignalProxy *_signalProxy;
- QTimer *_heartBeatTimer;
+ bool readMessage(QByteArray& msg);
+
+private:
+ QTcpSocket* _socket;
+ Compressor* _compressor;
+ SignalProxy* _signalProxy;
+ ProxyLine _proxyLine;
+ bool _useProxyLine;
+ QTimer* _heartBeatTimer;
int _heartBeatCount;
int _lag;
int _heartBeatCount;
int _lag;
+ quint32 _msgSize;
};
};
-
-#endif