projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename HAVE_KDE define to HAVE_KDE4
[quassel.git]
/
src
/
common
/
remotepeer.h
diff --git
a/src/common/remotepeer.h
b/src/common/remotepeer.h
index
14d49f9
..
5650120
100644
(file)
--- a/
src/common/remotepeer.h
+++ b/
src/common/remotepeer.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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,11
+23,11
@@
#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 AuthHandler;
class QTimer;
class AuthHandler;
@@
-41,12
+41,14
@@
public:
using Peer::handle;
using Peer::dispatch;
using Peer::handle;
using Peer::dispatch;
- RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);
- virtual ~RemotePeer() {};
+ 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;
@@
-70,6
+72,9
@@
signals:
protected:
SignalProxy *signalProxy() const;
protected:
SignalProxy *signalProxy() const;
+ 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);
// These protocol messages get handled internally and won't reach SignalProxy
void handle(const Protocol::HeartBeat &heartBeat);
void handle(const Protocol::HeartBeatReply &heartBeatReply);
@@
-77,20
+82,27
@@
protected:
virtual void dispatch(const Protocol::HeartBeatReply &msg) = 0;
protected slots:
virtual void dispatch(const Protocol::HeartBeatReply &msg) = 0;
protected slots:
- virtual void onSocketDataAvailable() = 0;
virtual void onSocketStateChanged(QAbstractSocket::SocketState state);
virtual void onSocketError(QAbstractSocket::SocketError error);
private 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);
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
};
#endif