X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fprotocols%2Fdatastream%2Fdatastreampeer.cpp;h=7d9b854751d6ad93426b66463ecce9bd68898a87;hp=df87b136a40a3e9ba565ad16643224b40efe7a04;hb=249a178a775bce425a83aefd7c7c39a868ebfe98;hpb=2dca302472ee44923e164784191891711eff626a diff --git a/src/common/protocols/datastream/datastreampeer.cpp b/src/common/protocols/datastream/datastreampeer.cpp index df87b136..7d9b8547 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 @@ -27,13 +29,9 @@ using namespace Protocol; DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent) - : RemotePeer(authHandler, socket, parent), - _blockSize(0) + : RemotePeer(authHandler, socket, Compressor::BestCompression, parent) { Q_UNUSED(features); - - _stream.setDevice(socket); - _stream.setVersion(QDataStream::Qt_4_2); } @@ -56,70 +54,46 @@ quint16 DataStreamPeer::enabledFeatures() const } -void DataStreamPeer::onSocketDataAvailable() +void DataStreamPeer::processMessage(const QByteArray &msg) { - QVariant item; - while (readSocketData(item)) { - // if no sigproxy is set, we're in handshake mode and let the data be handled elsewhere - if (!signalProxy()) - handleHandshakeMessage(item); - else - handlePackedFunc(item); + QDataStream stream(msg); + 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(list); + else + handlePackedFunc(list); } -bool DataStreamPeer::readSocketData(QVariant &item) +void DataStreamPeer::writeMessage(const QVariantMap &handshakeMsg) { - if (_blockSize == 0) { - if (socket()->bytesAvailable() < 4) - return false; - _stream >> _blockSize; - } - - if (_blockSize > 1 << 22) { - close("Peer tried to send package larger than max package size!"); - return false; - } - - if (_blockSize == 0) { - close("Peer tried to send 0 byte package!"); - return false; - } - - if (socket()->bytesAvailable() < _blockSize) { - emit transferProgress(socket()->bytesAvailable(), _blockSize); - return false; - } - - emit transferProgress(_blockSize, _blockSize); - - _stream >> item; - _blockSize = 0; - - if (!item.isValid()) { - close("Peer sent corrupt data: unable to load QVariant!"); - return false; + QVariantList list; + QVariantMap::const_iterator it = handshakeMsg.begin(); + while (it != handshakeMsg.end()) { + list << it.key().toUtf8() << it.value(); + ++it; } - return true; + writeMessage(list); } -void DataStreamPeer::writeSocketData(const QVariant &item) +void DataStreamPeer::writeMessage(const QVariantList &sigProxyMsg) { - 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 << sigProxyMsg; - out << item; - - _stream << block; // also writes the length as part of the serialization format + writeMessage(data); } @@ -130,9 +104,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()) { @@ -194,7 +170,7 @@ void DataStreamPeer::dispatch(const RegisterClient &msg) { m["ClientVersion"] = msg.clientVersion; m["ClientDate"] = Quassel::buildInfo().buildDate; - writeSocketData(m); + writeMessage(m); } @@ -203,7 +179,7 @@ void DataStreamPeer::dispatch(const ClientDenied &msg) { m["MsgType"] = "ClientInitReject"; m["Error"] = msg.errorString; - writeSocketData(m); + writeMessage(m); } @@ -214,7 +190,7 @@ void DataStreamPeer::dispatch(const ClientRegistered &msg) { m["StorageBackends"] = msg.backendInfo; m["LoginEnabled"] = m["Configured"] = msg.coreConfigured; - writeSocketData(m); + writeMessage(m); } @@ -229,7 +205,8 @@ void DataStreamPeer::dispatch(const SetupData &msg) QVariantMap m; m["MsgType"] = "CoreSetupData"; m["SetupData"] = map; - writeSocketData(m); + + writeMessage(m); } @@ -239,7 +216,7 @@ void DataStreamPeer::dispatch(const SetupFailed &msg) m["MsgType"] = "CoreSetupReject"; m["Error"] = msg.errorString; - writeSocketData(m); + writeMessage(m); } @@ -250,7 +227,7 @@ void DataStreamPeer::dispatch(const SetupDone &msg) QVariantMap m; m["MsgType"] = "CoreSetupAck"; - writeSocketData(m); + writeMessage(m); } @@ -261,7 +238,7 @@ void DataStreamPeer::dispatch(const Login &msg) m["User"] = msg.user; m["Password"] = msg.password; - writeSocketData(m); + writeMessage(m); } @@ -271,7 +248,7 @@ void DataStreamPeer::dispatch(const LoginFailed &msg) m["MsgType"] = "ClientLoginReject"; m["Error"] = msg.errorString; - writeSocketData(m); + writeMessage(m); } @@ -282,7 +259,7 @@ void DataStreamPeer::dispatch(const LoginSuccess &msg) QVariantMap m; m["MsgType"] = "ClientLoginAck"; - writeSocketData(m); + writeMessage(m); } @@ -297,15 +274,15 @@ void DataStreamPeer::dispatch(const SessionState &msg) map["Identities"] = msg.identities; m["SessionState"] = map; - writeSocketData(m); + writeMessage(m); } /*** 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; @@ -313,7 +290,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) { @@ -321,7 +298,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; @@ -341,18 +318,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; } @@ -361,11 +340,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: { @@ -373,11 +349,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; } @@ -387,7 +360,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); } @@ -399,29 +372,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)); + writeMessage(packedFunc); }