projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
silence some warnings
[quassel.git]
/
src
/
common
/
remotepeer.h
diff --git
a/src/common/remotepeer.h
b/src/common/remotepeer.h
index
5751dfb
..
4489829
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
4
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 *
@@
-23,24
+23,32
@@
#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 AuthHandler;
+
class RemotePeer : public Peer
{
Q_OBJECT
public:
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);
void setSignalProxy(SignalProxy *proxy);
- QString description() const;
+ virtual Protocol::Type protocol() const = 0;
+ virtual QString protocolName() const = 0;
+ virtual QString description() const;
+ virtual quint16 enabledFeatures() const { return 0; }
bool isOpen() const;
bool isSecure() const;
bool isOpen() const;
bool isSecure() const;
@@
-53,23
+61,19
@@
public:
QTcpSocket *socket() 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:
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 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:
SignalProxy *signalProxy() const;
protected:
SignalProxy *signalProxy() const;
- template<class T>
- v
oid handle(const T &protoMessage)
;
+ void writeMessage(const QByteArray &msg);
+ v
irtual 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,24
+81,28
@@
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;
};
};
-
-template<class T> inline
-void RemotePeer::handle(const T &protoMessage)
-{
- Peer::handle(protoMessage);
-}
-
-
#endif
#endif