#include "datastreampeer.h"
#include "quassel.h"
-/* version.inc is no longer used for this */
-const uint protocolVersion = 10;
-const uint coreNeedsProtocol = protocolVersion;
-const uint clientNeedsProtocol = protocolVersion;
-
using namespace Protocol;
DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent)
: RemotePeer(authHandler, socket, parent),
- _blockSize(0),
- _useCompression(false)
+ _blockSize(0)
{
Q_UNUSED(features);
}
-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;
emit transferProgress(_blockSize, _blockSize);
+ _stream >> item;
_blockSize = 0;
- 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;
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;
- }
+ out << item;
_stream << block; // also writes the length as part of the serialization format
}
}
if (msgType == "ClientInit") {
- // FIXME only in compat mode
- uint ver = m["ProtocolVersion"].toUInt();
- if (ver < coreNeedsProtocol) {
- emit protocolVersionMismatch((int)ver, (int)coreNeedsProtocol);
- return;
- }
-
-#ifndef QT_NO_COMPRESS
- // FIXME only in compat mode
- if (m["UseCompression"].toBool()) {
- socket()->setProperty("UseCompression", true);
- }
-#endif
- handle(RegisterClient(m["ClientVersion"].toString(), m["UseSsl"].toBool()));
+ handle(RegisterClient(m["ClientVersion"].toString(), false)); // UseSsl obsolete
}
else if (msgType == "ClientInitReject") {
}
else if (msgType == "ClientInitAck") {
- // FIXME only in compat mode
- uint ver = m["ProtocolVersion"].toUInt(); // actually an UInt
- if (ver < clientNeedsProtocol) {
- emit protocolVersionMismatch((int)ver, (int)clientNeedsProtocol);
- return;
- }
-#ifndef QT_NO_COMPRESS
- if (m["SupportsCompression"].toBool())
- socket()->setProperty("UseCompression", true);
-#endif
-
- handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), m["SupportSsl"].toBool(), QDateTime()));
+ handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QDateTime())); // SupportsSsl and coreStartTime obsolete
}
else if (msgType == "CoreSetupData") {
m["ClientVersion"] = msg.clientVersion;
m["ClientDate"] = Quassel::buildInfo().buildDate;
- // FIXME only in compat mode
- m["ProtocolVersion"] = protocolVersion;
- m["UseSsl"] = msg.sslSupported;
-#ifndef QT_NO_COMPRESS
- m["UseCompression"] = true;
-#else
- m["UseCompression"] = false;
-#endif
-
writeSocketData(m);
}
m["MsgType"] = "ClientInitAck";
m["CoreFeatures"] = msg.coreFeatures;
m["StorageBackends"] = msg.backendInfo;
-
- // FIXME only in compat mode
- m["ProtocolVersion"] = protocolVersion;
- m["SupportSsl"] = msg.sslSupported;
- m["SupportsCompression"] = socket()->property("UseCompression").toBool(); // this property gets already set in the ClientInit handler
-
- // This is only used for old v10 clients (pre-0.5)
- int uptime = msg.coreStartTime.secsTo(QDateTime::currentDateTime().toUTC());
- int updays = uptime / 86400; uptime %= 86400;
- int uphours = uptime / 3600; uptime %= 3600;
- int upmins = uptime / 60;
- m["CoreInfo"] = tr("<b>Quassel Core Version %1</b><br>"
- "Built: %2<br>"
- "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
- .arg(Quassel::buildInfo().buildDate)
- .arg(updays).arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(msg.coreStartTime.toString(Qt::TextDate));
-
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
writeSocketData(m);
return;
}
QByteArray className = params.takeFirst().toByteArray();
- QString objectName = params.takeFirst().toString();
+ QString objectName = QString::fromUtf8(params.takeFirst().toByteArray());
QByteArray slotName = params.takeFirst().toByteArray();
handle(Protocol::SyncMessage(className, objectName, slotName, params));
break;
return;
}
QByteArray className = params[0].toByteArray();
- QString objectName = params[1].toString();
+ QString objectName = QString::fromUtf8(params[1].toByteArray());
handle(Protocol::InitRequest(className, objectName));
break;
}
return;
}
QByteArray className = params[0].toByteArray();
- QString objectName = params[1].toString();
+ QString objectName = QString::fromUtf8(params[1].toByteArray());
QVariantMap initData = params[2].toMap();
handle(Protocol::InitData(className, objectName, initData));
break;
qWarning() << Q_FUNC_INFO << "Received invalid HeartBeat:" << params;
return;
}
- // The legacy protocol would only send a QTime, no QDateTime
- // so we assume it's sent today, which works in exactly the same cases as it did in the old implementation
- QDateTime dateTime = QDateTime::currentDateTime().toUTC();
- dateTime.setTime(params[0].toTime());
- handle(Protocol::HeartBeat(dateTime));
+ // Note: QDateTime instead of QTime as in the legacy protocol!
+ handle(Protocol::HeartBeat(params[0].toDateTime()));
break;
}
case HeartBeatReply: {
qWarning() << Q_FUNC_INFO << "Received invalid HeartBeat:" << params;
return;
}
- // The legacy protocol would only send a QTime, no QDateTime
- // so we assume it's sent today, which works in exactly the same cases as it did in the old implementation
- QDateTime dateTime = QDateTime::currentDateTime().toUTC();
- dateTime.setTime(params[0].toTime());
- handle(Protocol::HeartBeatReply(dateTime));
+ // Note: QDateTime instead of QTime as in the legacy protocol!
+ handle(Protocol::HeartBeatReply(params[0].toDateTime()));
break;
}
void DataStreamPeer::dispatch(const Protocol::SyncMessage &msg)
{
- dispatchPackedFunc(QVariantList() << (qint16)Sync << msg.className << msg.objectName << msg.slotName << msg.params);
+ dispatchPackedFunc(QVariantList() << (qint16)Sync << msg.className << msg.objectName.toUtf8() << msg.slotName << msg.params);
}
void DataStreamPeer::dispatch(const Protocol::InitRequest &msg)
{
- dispatchPackedFunc(QVariantList() << (qint16)InitRequest << msg.className << msg.objectName);
+ dispatchPackedFunc(QVariantList() << (qint16)InitRequest << msg.className << msg.objectName.toUtf8());
}
void DataStreamPeer::dispatch(const Protocol::InitData &msg)
{
- dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName << msg.initData);
+ dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName.toUtf8() << msg.initData);
}
void DataStreamPeer::dispatch(const Protocol::HeartBeat &msg)
{
- dispatchPackedFunc(QVariantList() << (qint16)HeartBeat << msg.timestamp.time());
+ dispatchPackedFunc(QVariantList() << (qint16)HeartBeat << msg.timestamp);
}
void DataStreamPeer::dispatch(const Protocol::HeartBeatReply &msg)
{
- dispatchPackedFunc(QVariantList() << (qint16)HeartBeatReply << msg.timestamp.time());
+ dispatchPackedFunc(QVariantList() << (qint16)HeartBeatReply << msg.timestamp);
}