summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9ad83fb)
Instead of reading from/writing to the socket directly, RemotePeer now
goes through a Compressor instance. At this time, no actual compression
will happen though.
Note that the legacy protocol does not support streaming compression, which
is why it sets a compression level of NoCompression.
using namespace Protocol;
DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent)
using namespace Protocol;
DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent)
- : RemotePeer(authHandler, socket, parent)
+ : RemotePeer(authHandler, socket, Compressor::BestCompression, parent)
using namespace Protocol;
LegacyPeer::LegacyPeer(::AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
using namespace Protocol;
LegacyPeer::LegacyPeer(::AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
- : RemotePeer(authHandler, socket, parent),
+ : RemotePeer(authHandler, socket, Compressor::NoCompression, parent),
const quint32 maxMessageSize = 64 * 1024 * 1024; // This is uncompressed size. 64 MB should be enough for any sort of initData or backlog chunk
const quint32 maxMessageSize = 64 * 1024 * 1024; // This is uncompressed size. 64 MB should be enough for any sort of initData or backlog chunk
-RemotePeer::RemotePeer(::AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
+RemotePeer::RemotePeer(::AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent)
: Peer(authHandler, parent),
_socket(socket),
: Peer(authHandler, parent),
_socket(socket),
+ _compressor(new Compressor(socket, level, this)),
_signalProxy(0),
_heartBeatTimer(new QTimer(this)),
_heartBeatCount(0),
_signalProxy(0),
_heartBeatTimer(new QTimer(this)),
_heartBeatCount(0),
_msgSize(0)
{
socket->setParent(this);
_msgSize(0)
{
socket->setParent(this);
- connect(socket, SIGNAL(readyRead()), SLOT(onReadyRead()));
connect(socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SLOT(onSocketStateChanged(QAbstractSocket::SocketState)));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
connect(socket, SIGNAL(disconnected()), SIGNAL(disconnected()));
connect(socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SLOT(onSocketStateChanged(QAbstractSocket::SocketState)));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(onSocketError(QAbstractSocket::SocketError)));
connect(socket, SIGNAL(disconnected()), SIGNAL(disconnected()));
connect(sslSocket, SIGNAL(encrypted()), SIGNAL(secureStateChanged()));
#endif
connect(sslSocket, SIGNAL(encrypted()), SIGNAL(secureStateChanged()));
#endif
- connect(_heartBeatTimer, SIGNAL(timeout()), SLOT(sendHeartBeat()));
+ connect(_compressor, SIGNAL(readyRead()), SLOT(onReadyRead()));
+ connect(_compressor, SIGNAL(error(Compressor::Error)), SLOT(onCompressionError(Compressor::Error)));
- // It's possible that more data has already arrived during the handshake, so readyRead() wouldn't be triggered.
- // However, we can't call a virtual function from the ctor, so let's do it asynchronously.
- if (socket->bytesAvailable())
- QTimer::singleShot(0, this, SLOT(onReadyRead()));
+ connect(_heartBeatTimer, SIGNAL(timeout()), SLOT(sendHeartBeat()));
+void RemotePeer::onCompressionError(Compressor::Error error)
+{
+ close(QString("Compression error %1").arg(error));
+}
+
+
QString RemotePeer::description() const
{
if (socket())
QString RemotePeer::description() const
{
if (socket())
void RemotePeer::onReadyRead()
{
void RemotePeer::onReadyRead()
{
- // don't try to read more data if we're already closing
- if (socket()->state() != QAbstractSocket::ConnectedState)
- return;
-
QByteArray msg;
while (readMessage(msg))
processMessage(msg);
QByteArray msg;
while (readMessage(msg))
processMessage(msg);
bool RemotePeer::readMessage(QByteArray &msg)
{
if (_msgSize == 0) {
bool RemotePeer::readMessage(QByteArray &msg)
{
if (_msgSize == 0) {
- if (socket()->bytesAvailable() < 4)
+ if (_compressor->bytesAvailable() < 4)
- socket()->read((char*)&_msgSize, 4);
+ _compressor->read((char*)&_msgSize, 4);
_msgSize = qFromBigEndian<quint32>(_msgSize);
if (_msgSize > maxMessageSize) {
_msgSize = qFromBigEndian<quint32>(_msgSize);
if (_msgSize > maxMessageSize) {
- if (socket()->bytesAvailable() < _msgSize) {
+ if (_compressor->bytesAvailable() < _msgSize) {
emit transferProgress(socket()->bytesAvailable(), _msgSize);
return false;
}
emit transferProgress(socket()->bytesAvailable(), _msgSize);
return false;
}
emit transferProgress(_msgSize, _msgSize);
msg.resize(_msgSize);
emit transferProgress(_msgSize, _msgSize);
msg.resize(_msgSize);
- qint64 bytesRead = socket()->read(msg.data(), _msgSize);
+ qint64 bytesRead = _compressor->read(msg.data(), _msgSize);
if (bytesRead != _msgSize) {
close("Premature end of data stream!");
return false;
if (bytesRead != _msgSize) {
close("Premature end of data stream!");
return false;
void RemotePeer::writeMessage(const QByteArray &msg)
{
quint32 size = qToBigEndian<quint32>(msg.size());
void RemotePeer::writeMessage(const QByteArray &msg)
{
quint32 size = qToBigEndian<quint32>(msg.size());
- socket()->write((const char*)&size, 4);
- socket()->write(msg.constData(), msg.size());
+ _compressor->write((const char*)&size, 4, Compressor::NoFlush);
+ _compressor->write(msg.constData(), msg.size());
#include "peer.h"
#include "protocol.h"
#include "signalproxy.h"
#include "peer.h"
#include "protocol.h"
#include "signalproxy.h"
class QTimer;
class AuthHandler;
class QTimer;
class AuthHandler;
using Peer::handle;
using Peer::dispatch;
using Peer::handle;
using Peer::dispatch;
- RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);
+ RemotePeer(AuthHandler *authHandler, QTcpSocket *socket, Compressor::CompressionLevel level, QObject *parent = 0);
void setSignalProxy(SignalProxy *proxy);
void setSignalProxy(SignalProxy *proxy);
private slots:
void onReadyRead();
private slots:
void onReadyRead();
+ void onCompressionError(Compressor::Error error);
void sendHeartBeat();
void changeHeartBeatInterval(int secs);
void sendHeartBeat();
void changeHeartBeatInterval(int secs);
private:
QTcpSocket *_socket;
private:
QTcpSocket *_socket;
+ Compressor *_compressor;
SignalProxy *_signalProxy;
QTimer *_heartBeatTimer;
int _heartBeatCount;
SignalProxy *_signalProxy;
QTimer *_heartBeatTimer;
int _heartBeatCount;