projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Prefer default member init over ctor init
[quassel.git]
/
src
/
common
/
remotepeer.h
diff --git
a/src/common/remotepeer.h
b/src/common/remotepeer.h
index
6c3e35f
..
8a47b0a
100644
(file)
--- a/
src/common/remotepeer.h
+++ b/
src/common/remotepeer.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
8
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,58
+18,65
@@
* 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 "signalproxy.h"
#include "peer.h"
#include "protocol.h"
#include "signalproxy.h"
-class QTcpSocket;
class QTimer;
class QTimer;
-class RemotePeer : public Peer
+class AuthHandler;
+
+class COMMON_EXPORT RemotePeer : public Peer
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- RemotePeer(QTcpSocket *socket, QObject *parent = 0);
- virtual ~RemotePeer() {};
+ // import the virtuals from the baseclass
+ using Peer::handle;
+ using Peer::dispatch;
-
void setSignalProxy(SignalProxy *proxy
);
+
RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = nullptr
);
-
QString description() const
;
+
void setSignalProxy(SignalProxy *proxy) override
;
-
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;
+ 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);
QTcpSocket *socket() const;
bool compressionEnabled() const;
void setCompressionEnabled(bool enabled);
QTcpSocket *socket() const;
- // this is only used for the auth phase and should be replaced by something more generic
- virtual void writeSocketData(const QVariant &item) = 0;
-
public slots:
public slots:
- void close(const QString &reason = QString());
+ void close(const QString &reason = QString())
override
;
signals:
signals:
- // this is only used for the auth phase and should be replaced by something more generic
- void dataReceived(const QVariant &item);
-
void transferProgress(int current, int max);
void transferProgress(int current, int max);
+ void socketError(QAbstractSocket::SocketError error, const QString &errorString);
+ void statusMessage(const QString &msg);
protected:
protected:
- SignalProxy *signalProxy() const;
+ SignalProxy *signalProxy() const
override
;
-
using Peer::handle
;
-
using Peer::dispatch
;
+
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);
// These protocol messages get handled internally and won't reach SignalProxy
void handle(const Protocol::HeartBeat &heartBeat);
@@
-77,16
+84,26
@@
protected:
virtual void dispatch(const Protocol::HeartBeat &msg) = 0;
virtual void dispatch(const Protocol::HeartBeatReply &msg) = 0;
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);
+private:
+ bool readMessage(QByteArray &msg);
+
private:
QTcpSocket *_socket;
private:
QTcpSocket *_socket;
+ Compressor *_compressor;
SignalProxy *_signalProxy;
QTimer *_heartBeatTimer;
int _heartBeatCount;
int _lag;
SignalProxy *_signalProxy;
QTimer *_heartBeatTimer;
int _heartBeatCount;
int _lag;
+ quint32 _msgSize;
};
};
-
-#endif