/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2015 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#define REMOTEPEER_H
#include <QDateTime>
-#include <QTcpSocket>
+#include "compressor.h"
+#include "peer.h"
#include "protocol.h"
#include "signalproxy.h"
class QTimer;
-class RemotePeer : public SignalProxy::AbstractPeer
+class AuthHandler;
+
+class RemotePeer : public Peer
{
Q_OBJECT
public:
- RemotePeer(QTcpSocket *socket, QObject *parent = 0);
- virtual ~RemotePeer() {};
+ // import the virtuals from the baseclass
+ using Peer::handle;
+ using Peer::dispatch;
+
+ RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = 0);
void setSignalProxy(SignalProxy *proxy);
- QString description() const;
+ virtual QString protocolName() const = 0;
+ virtual QString description() const;
+ virtual quint16 enabledFeatures() const { return 0; }
bool isOpen() const;
bool isSecure() const;
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:
void close(const QString &reason = QString());
signals:
- // this is only used for the auth phase and should be replaced by something more generic
- void dataReceived(const QVariant &item);
-
- void disconnected();
- void error(QAbstractSocket::SocketError);
-
void transferProgress(int current, int max);
+ void socketError(QAbstractSocket::SocketError error, const QString &errorString);
+ void statusMessage(const QString &msg);
protected:
SignalProxy *signalProxy() const;
- template<class T>
- void handle(const T &protoMessage);
+ 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);
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);
+private:
+ bool readMessage(QByteArray &msg);
+
private:
QTcpSocket *_socket;
+ Compressor *_compressor;
SignalProxy *_signalProxy;
QTimer *_heartBeatTimer;
int _heartBeatCount;
int _lag;
+ quint32 _msgSize;
};
-// Template methods we need in the header
-template<class T> inline
-void RemotePeer::handle(const T &protoMessage)
-{
- if (!signalProxy()) {
- qWarning() << Q_FUNC_INFO << "Cannot handle messages without a SignalProxy!";
- return;
- }
-
- // _heartBeatCount = 0;
-
- signalProxy()->handle(this, protoMessage);
-}
-
-
#endif