summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
cb18c44)
With the new handshake, we're going to use streaming compression, which
is negotiated and initiated before the peer is instantiated.
DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent)
: RemotePeer(authHandler, socket, parent),
DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent)
: RemotePeer(authHandler, socket, parent),
- _blockSize(0),
- _useCompression(false)
-void DataStreamPeer::setSignalProxy(::SignalProxy *proxy)
-{
- RemotePeer::setSignalProxy(proxy);
-
- // FIXME only in compat mode
- if (proxy) {
- // enable compression now if requested - the initial handshake is uncompressed in the legacy protocol!
- _useCompression = socket()->property("UseCompression").toBool();
- if (_useCompression)
- qDebug() << "Using compression for peer:" << qPrintable(socket()->peerAddress().toString());
- }
-
-}
-
-
quint16 DataStreamPeer::supportedFeatures()
{
return 0;
quint16 DataStreamPeer::supportedFeatures()
{
return 0;
emit transferProgress(_blockSize, _blockSize);
emit transferProgress(_blockSize, _blockSize);
- if (_useCompression) {
- QByteArray rawItem;
- _stream >> rawItem;
-
- int nbytes = rawItem.size();
- if (nbytes <= 4) {
- const char *data = rawItem.constData();
- if (nbytes < 4 || (data[0] != 0 || data[1] != 0 || data[2] != 0 || data[3] != 0)) {
- close("Peer sent corrupted compressed data!");
- return false;
- }
- }
-
- rawItem = qUncompress(rawItem);
-
- QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
- itemStream.setVersion(QDataStream::Qt_4_2);
- itemStream >> item;
- }
- else {
- _stream >> item;
- }
-
if (!item.isValid()) {
close("Peer sent corrupt data: unable to load QVariant!");
return false;
if (!item.isValid()) {
close("Peer sent corrupt data: unable to load QVariant!");
return false;
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_2);
QDataStream out(&block, QIODevice::WriteOnly);
out.setVersion(QDataStream::Qt_4_2);
- if (_useCompression) {
- QByteArray rawItem;
- QDataStream itemStream(&rawItem, QIODevice::WriteOnly);
- itemStream.setVersion(QDataStream::Qt_4_2);
- itemStream << item;
-
- rawItem = qCompress(rawItem);
-
- out << rawItem;
- }
- else {
- out << item;
- }
_stream << block; // also writes the length as part of the serialization format
}
_stream << block; // also writes the length as part of the serialization format
}
}
if (msgType == "ClientInit") {
}
if (msgType == "ClientInit") {
-#ifndef QT_NO_COMPRESS
- // FIXME only in compat mode
- if (m["UseCompression"].toBool()) {
- socket()->setProperty("UseCompression", true);
- }
-#endif
handle(RegisterClient(m["ClientVersion"].toString(), false)); // UseSsl obsolete
}
handle(RegisterClient(m["ClientVersion"].toString(), false)); // UseSsl obsolete
}
}
else if (msgType == "ClientInitAck") {
}
else if (msgType == "ClientInitAck") {
-#ifndef QT_NO_COMPRESS
- if (m["SupportsCompression"].toBool())
- socket()->setProperty("UseCompression", true);
-#endif
handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QDateTime())); // SupportsSsl and coreStartTime obsolete
}
handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QDateTime())); // SupportsSsl and coreStartTime obsolete
}
static bool acceptsFeatures(quint16 peerFeatures);
quint16 enabledFeatures() const;
static bool acceptsFeatures(quint16 peerFeatures);
quint16 enabledFeatures() const;
- void setSignalProxy(SignalProxy *proxy);
-
void dispatch(const Protocol::RegisterClient &msg);
void dispatch(const Protocol::ClientDenied &msg);
void dispatch(const Protocol::ClientRegistered &msg);
void dispatch(const Protocol::RegisterClient &msg);
void dispatch(const Protocol::ClientDenied &msg);
void dispatch(const Protocol::ClientRegistered &msg);
QDataStream _stream;
quint32 _blockSize;
QDataStream _stream;
quint32 _blockSize;