X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fprotocols%2Fdatastream%2Fdatastreampeer.cpp;h=86fbf53a42ae728ad45807d1e291bf03a9ca9502;hp=83037b037aeff0080922b05c3917d770b14e9fbc;hb=d1d1e6ef1d2073d629bf54fd8e0d31f647f9cb88;hpb=cb18c445c17c32f0318332adf02b8b793260c010 diff --git a/src/common/protocols/datastream/datastreampeer.cpp b/src/common/protocols/datastream/datastreampeer.cpp index 83037b03..86fbf53a 100644 --- a/src/common/protocols/datastream/datastreampeer.cpp +++ b/src/common/protocols/datastream/datastreampeer.cpp @@ -18,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include + #include #include @@ -28,8 +30,7 @@ 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); @@ -38,21 +39,6 @@ DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, q } -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; @@ -72,25 +58,43 @@ quint16 DataStreamPeer::enabledFeatures() const } +// Note that we're already preparing for readSocketData() moving into RemotePeer, thus the slightly +// cumbersome type and stream handling here. void DataStreamPeer::onSocketDataAvailable() { - QVariant item; - while (readSocketData(item)) { - // if no sigproxy is set, we're in handshake mode and let the data be handled elsewhere + // don't try to read more data if we're already closing + if (socket()->state() != QAbstractSocket::ConnectedState) + return; + + QByteArray data; + while (readSocketData(data)) { + // data contains always a serialized QVector + QDataStream stream(data); + stream.setVersion(QDataStream::Qt_4_2); + QVariantList list; + stream >> list; + if (stream.status() != QDataStream::Ok) { + close("Peer sent corrupt data, closing down!"); + return; + } + + // if no sigproxy is set, we're in handshake mode if (!signalProxy()) - handleHandshakeMessage(item); + handleHandshakeMessage(list); else - handlePackedFunc(item); + handlePackedFunc(list); } } -bool DataStreamPeer::readSocketData(QVariant &item) +bool DataStreamPeer::readSocketData(QByteArray &data) { if (_blockSize == 0) { if (socket()->bytesAvailable() < 4) return false; - _stream >> _blockSize; + // the block size is part of QByteArray's serialization format, so we don't actually read it now... + socket()->peek((char*)&_blockSize, 4); + _blockSize = qFromBigEndian(_blockSize) + 4; // ... but of course we have to add its size to the total size of the block } if (_blockSize > 1 << 22) { @@ -110,33 +114,11 @@ bool DataStreamPeer::readSocketData(QVariant &item) emit transferProgress(_blockSize, _blockSize); + _stream >> data; _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!"); + if (_stream.status() != QDataStream::Ok) { + close("Peer sent corrupt data, closing down!"); return false; } @@ -144,35 +126,38 @@ bool DataStreamPeer::readSocketData(QVariant &item) } -void DataStreamPeer::writeSocketData(const QVariant &item) +void DataStreamPeer::writeSocketData(const QVariantList &list) { if (!socket()->isOpen()) { qWarning() << Q_FUNC_INFO << "Can't write to a closed socket!"; return; } - QByteArray block; - QDataStream out(&block, QIODevice::WriteOnly); - out.setVersion(QDataStream::Qt_4_2); + QByteArray data; + QDataStream msgStream(&data, QIODevice::WriteOnly); + msgStream.setVersion(QDataStream::Qt_4_2); + msgStream << list; - if (_useCompression) { - QByteArray rawItem; - QDataStream itemStream(&rawItem, QIODevice::WriteOnly); - itemStream.setVersion(QDataStream::Qt_4_2); - itemStream << item; + _stream << data; // also writes the block size as part of the serialization format + if (_stream.status() != QDataStream::Ok) + close("Could not serialize data for peer!"); +} - rawItem = qCompress(rawItem); - out << rawItem; - } - else { - out << item; +void DataStreamPeer::writeSocketData(const QVariantMap &handshakeMsg) +{ + QVariantList list; + QVariantMap::const_iterator it = handshakeMsg.begin(); + while (it != handshakeMsg.end()) { + list << it.key().toUtf8() << it.value(); + ++it; } - _stream << block; // also writes the length as part of the serialization format + writeSocketData(list); } + /*** Handshake messages ***/ /* These messages are transmitted during handshake phase, which in case of the legacy protocol means they have @@ -180,9 +165,11 @@ void DataStreamPeer::writeSocketData(const QVariant &item) * Also, the legacy handshake does not fully match the redesigned one, so we'll have to do various mappings here. */ -void DataStreamPeer::handleHandshakeMessage(const QVariant &msg) +void DataStreamPeer::handleHandshakeMessage(const QVariantList &mapData) { - QVariantMap m = msg.toMap(); + QVariantMap m; + for (int i = 0; i < mapData.count()/2; ++i) + m[QString::fromUtf8(mapData[2*i].toByteArray())] = mapData[2*i+1]; QString msgType = m["MsgType"].toString(); if (msgType.isEmpty()) { @@ -191,12 +178,6 @@ void DataStreamPeer::handleHandshakeMessage(const QVariant &msg) } 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 } @@ -205,10 +186,6 @@ void DataStreamPeer::handleHandshakeMessage(const QVariant &msg) } 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 } @@ -363,9 +340,9 @@ void DataStreamPeer::dispatch(const SessionState &msg) /*** Standard messages ***/ -void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) +void DataStreamPeer::handlePackedFunc(const QVariantList &packedFunc) { - QVariantList params(packedFunc.toList()); + QVariantList params(packedFunc); if (params.isEmpty()) { qWarning() << Q_FUNC_INFO << "Received incompatible data:" << packedFunc; @@ -373,7 +350,7 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) } // TODO: make sure that this is a valid request type - RequestType requestType = (RequestType)params.takeFirst().value(); + RequestType requestType = (RequestType)params.takeFirst().value(); switch (requestType) { case Sync: { if (params.count() < 3) { @@ -381,7 +358,7 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) 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; @@ -401,18 +378,20 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) return; } QByteArray className = params[0].toByteArray(); - QString objectName = params[1].toString(); + QString objectName = QString::fromUtf8(params[1].toByteArray()); handle(Protocol::InitRequest(className, objectName)); break; } case InitData: { - if (params.count() != 3) { + if (params.count() < 2) { qWarning() << Q_FUNC_INFO << "Received invalid InitData:" << params; return; } - QByteArray className = params[0].toByteArray(); - QString objectName = params[1].toString(); - QVariantMap initData = params[2].toMap(); + QByteArray className = params.takeFirst().toByteArray(); + QString objectName = QString::fromUtf8(params.takeFirst().toByteArray()); + QVariantMap initData; + for (int i = 0; i < params.count()/2; ++i) + initData[QString::fromUtf8(params[2*i].toByteArray())] = params[2*i+1]; handle(Protocol::InitData(className, objectName, initData)); break; } @@ -421,11 +400,8 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) 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: { @@ -433,11 +409,8 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) 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; } @@ -447,7 +420,7 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc) 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); } @@ -459,29 +432,35 @@ void DataStreamPeer::dispatch(const Protocol::RpcCall &msg) 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); + QVariantList initData; + QVariantMap::const_iterator it = msg.initData.begin(); + while (it != msg.initData.end()) { + initData << it.key().toUtf8() << it.value(); + ++it; + } + dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName.toUtf8() << 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); } void DataStreamPeer::dispatchPackedFunc(const QVariantList &packedFunc) { - writeSocketData(QVariant(packedFunc)); + writeSocketData(packedFunc); }