/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2014 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "quassel.h"
/* version.inc is no longer used for this */
-const int protocolVersion = 10;
-const int coreNeedsProtocol = protocolVersion;
-const int clientNeedsProtocol = protocolVersion;
+const uint protocolVersion = 10;
+const uint coreNeedsProtocol = protocolVersion;
+const uint clientNeedsProtocol = protocolVersion;
using namespace Protocol;
LegacyPeer::LegacyPeer(::AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
- : RemotePeer(authHandler, socket, parent),
- _blockSize(0),
+ : RemotePeer(authHandler, socket, Compressor::NoCompression, parent),
_useCompression(false)
{
- _stream.setDevice(socket);
- _stream.setVersion(QDataStream::Qt_4_2);
- connect(socket, SIGNAL(readyRead()), SLOT(socketDataAvailable()));
}
RemotePeer::setSignalProxy(proxy);
// FIXME only in compat mode
- socket()->flush();
if (proxy) {
// enable compression now if requested - the initial handshake is uncompressed in the legacy protocol!
_useCompression = socket()->property("UseCompression").toBool();
}
-void LegacyPeer::socketDataAvailable()
+void LegacyPeer::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);
- }
-}
-
-
-bool LegacyPeer::readSocketData(QVariant &item)
-{
- 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;
+ QDataStream stream(msg);
+ stream.setVersion(QDataStream::Qt_4_2);
+ QVariant item;
if (_useCompression) {
QByteArray rawItem;
- _stream >> 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;
+ return;
}
}
itemStream >> item;
}
else {
- _stream >> item;
+ stream >> item;
}
- if (!item.isValid()) {
+ if (stream.status() != QDataStream::Ok || !item.isValid()) {
close("Peer sent corrupt data: unable to load QVariant!");
- return false;
+ return;
}
- return true;
+ // if no sigproxy is set, we're in handshake mode and let the data be handled elsewhere
+ if (!signalProxy())
+ handleHandshakeMessage(item);
+ else
+ handlePackedFunc(item);
}
-void LegacyPeer::writeSocketData(const QVariant &item)
+void LegacyPeer::writeMessage(const QVariant &item)
{
- 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);
out << item;
}
- _stream << block; // also writes the length as part of the serialization format
+ writeMessage(block);
}
if (msgType == "ClientInit") {
// FIXME only in compat mode
- int ver = m["ProtocolVersion"].toInt();
+ uint ver = m["ProtocolVersion"].toUInt();
if (ver < coreNeedsProtocol) {
- emit protocolVersionMismatch(ver, coreNeedsProtocol);
+ emit protocolVersionMismatch((int)ver, (int)coreNeedsProtocol);
return;
}
else if (msgType == "ClientInitAck") {
// FIXME only in compat mode
- int ver = m["ProtocolVersion"].toInt();
+ uint ver = m["ProtocolVersion"].toUInt(); // actually an UInt
if (ver < clientNeedsProtocol) {
- emit protocolVersionMismatch(ver, clientNeedsProtocol);
+ emit protocolVersionMismatch((int)ver, (int)clientNeedsProtocol);
return;
}
#ifndef QT_NO_COMPRESS
m["UseCompression"] = false;
#endif
- writeSocketData(m);
+ writeMessage(m);
}
m["MsgType"] = "ClientInitReject";
m["Error"] = msg.errorString;
- writeSocketData(m);
+ writeMessage(m);
}
// FIXME only in compat mode
m["ProtocolVersion"] = protocolVersion;
m["SupportSsl"] = msg.sslSupported;
- m["SupportsCompression"] = socket()->property("UseCompression"); // this property gets already set in the ClientInit handler
+ 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());
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
- writeSocketData(m);
- socket()->flush(); // ensure that the write cache is flushed before we switch to ssl
+ 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);
}
QByteArray className = params[0].toByteArray();
QString objectName = params[1].toString();
QVariantMap initData = params[2].toMap();
+
+ // we need to special-case IrcUsersAndChannels here, since the format changed
+ if (className == "Network")
+ fromLegacyIrcUsersAndChannels(initData);
handle(Protocol::InitData(className, objectName, initData));
break;
}
void LegacyPeer::dispatch(const Protocol::InitData &msg)
{
- dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName << msg.initData);
+ // We need to special-case IrcUsersAndChannels, as the format changed
+ if (msg.className == "Network") {
+ QVariantMap initData = msg.initData;
+ toLegacyIrcUsersAndChannels(initData);
+ dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName << initData);
+ }
+ else
+ dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName << msg.initData);
}
void LegacyPeer::dispatchPackedFunc(const QVariantList &packedFunc)
{
- writeSocketData(QVariant(packedFunc));
+ writeMessage(QVariant(packedFunc));
+}
+
+
+// Handle the changed format for Network's initData
+// cf. Network::initIrcUsersAndChannels()
+void LegacyPeer::fromLegacyIrcUsersAndChannels(QVariantMap &initData)
+{
+ const QVariantMap &legacyMap = initData["IrcUsersAndChannels"].toMap();
+ QVariantMap newMap;
+
+ QHash<QString, QVariantList> users;
+ foreach(const QVariant &v, legacyMap["users"].toMap().values()) {
+ const QVariantMap &map = v.toMap();
+ foreach(const QString &key, map.keys())
+ users[key] << map[key];
+ }
+ QVariantMap userMap;
+ foreach(const QString &key, users.keys())
+ userMap[key] = users[key];
+ newMap["Users"] = userMap;
+
+ QHash<QString, QVariantList> channels;
+ foreach(const QVariant &v, legacyMap["channels"].toMap().values()) {
+ const QVariantMap &map = v.toMap();
+ foreach(const QString &key, map.keys())
+ channels[key] << map[key];
+ }
+ QVariantMap channelMap;
+ foreach(const QString &key, channels.keys())
+ channelMap[key] = channels[key];
+ newMap["Channels"] = channelMap;
+
+ initData["IrcUsersAndChannels"] = newMap;
+}
+
+
+void LegacyPeer::toLegacyIrcUsersAndChannels(QVariantMap &initData)
+{
+ const QVariantMap &usersAndChannels = initData["IrcUsersAndChannels"].toMap();
+ QVariantMap legacyMap;
+
+ // toMap() and toList() are cheap, so no need to copy to a hash
+
+ QVariantMap userMap;
+ const QVariantMap &users = usersAndChannels["Users"].toMap();
+
+ int size = users["nick"].toList().size(); // we know this key exists
+ for(int i = 0; i < size; i++) {
+ QVariantMap map;
+ foreach(const QString &key, users.keys())
+ map[key] = users[key].toList().at(i);
+ QString hostmask = QString("%1!%2@%3").arg(map["nick"].toString(), map["user"].toString(), map["host"].toString());
+ userMap[hostmask.toLower()] = map;
+ }
+ legacyMap["users"] = userMap;
+
+ QVariantMap channelMap;
+ const QVariantMap &channels = usersAndChannels["Channels"].toMap();
+
+ size = channels["name"].toList().size();
+ for(int i = 0; i < size; i++) {
+ QVariantMap map;
+ foreach(const QString &key, channels.keys())
+ map[key] = channels[key].toList().at(i);
+ channelMap[map["name"].toString().toLower()] = map;
+ }
+ legacyMap["channels"] = channelMap;
+
+ initData["IrcUsersAndChannels"] = legacyMap;
}
projects / quassel.git / blobdiff