* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <QtEndian>
+#include <QDataStream>
#include <QHostAddress>
#include <QTcpSocket>
#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)
+DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, Compressor::CompressionLevel level, QObject *parent)
+ : RemotePeer(authHandler, socket, level, parent)
{
Q_UNUSED(features);
-
- _stream.setDevice(socket);
- _stream.setVersion(QDataStream::Qt_4_2);
-}
-
-
-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());
- }
-
}
}
-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);
-
- _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;
+ 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);
-
- 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;
- }
+ QByteArray data;
+ QDataStream msgStream(&data, QIODevice::WriteOnly);
+ msgStream.setVersion(QDataStream::Qt_4_2);
+ msgStream << sigProxyMsg;
- _stream << block; // also writes the length as part of the serialization format
+ writeMessage(data);
}
* 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()) {
}
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(), m["ClientDate"].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") {
QVariantMap m;
m["MsgType"] = "ClientInit";
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["ClientDate"] = msg.buildDate;
+
+ writeMessage(m);
}
m["MsgType"] = "ClientInitReject";
m["Error"] = msg.errorString;
- writeSocketData(m);
+ writeMessage(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);
+ writeMessage(m);
}
QVariantMap m;
m["MsgType"] = "CoreSetupData";
m["SetupData"] = map;
- writeSocketData(m);
+
+ writeMessage(m);
}
m["MsgType"] = "CoreSetupReject";
m["Error"] = msg.errorString;
- writeSocketData(m);
+ writeMessage(m);
}
QVariantMap m;
m["MsgType"] = "CoreSetupAck";
- writeSocketData(m);
+ writeMessage(m);
}
m["User"] = msg.user;
m["Password"] = msg.password;
- writeSocketData(m);
+ writeMessage(m);
}
m["MsgType"] = "ClientLoginReject";
m["Error"] = msg.errorString;
- writeSocketData(m);
+ writeMessage(m);
}
QVariantMap m;
m["MsgType"] = "ClientLoginAck";
- writeSocketData(m);
+ writeMessage(m);
}
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;
}
// TODO: make sure that this is a valid request type
- RequestType requestType = (RequestType)params.takeFirst().value<int>();
+ RequestType requestType = (RequestType)params.takeFirst().value<qint16>();
switch (requestType) {
case Sync: {
if (params.count() < 3) {
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;
}
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;
}
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);
+ 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);
}
projects / quassel.git / blobdiff