/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
***************************************************************************/
#include <QtEndian>
-
+#include <QDataStream>
#include <QHostAddress>
#include <QTcpSocket>
#include "datastreampeer.h"
-#include "quassel.h"
using namespace Protocol;
-DataStreamPeer::DataStreamPeer(::AuthHandler *authHandler, QTcpSocket *socket, quint16 features, QObject *parent)
- : RemotePeer(authHandler, socket, parent),
- _blockSize(0)
+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);
}
}
-// Note that we're already preparing for readSocketData() moving into RemotePeer, thus the slightly
-// cumbersome type and stream handling here.
-void DataStreamPeer::onSocketDataAvailable()
-{
- // 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<QVariant>
- 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(list);
- else
- handlePackedFunc(list);
- }
-}
-
-
-bool DataStreamPeer::readSocketData(QByteArray &data)
+void DataStreamPeer::processMessage(const QByteArray &msg)
{
- if (_blockSize == 0) {
- if (socket()->bytesAvailable() < 4)
- return false;
- // 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<quint32>(_blockSize) + 4; // ... but of course we have to add its size to the total size of the block
- }
-
- 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 >> data;
- _blockSize = 0;
-
- if (_stream.status() != QDataStream::Ok) {
+ 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 false;
- }
-
- return true;
-}
-
-
-void DataStreamPeer::writeSocketData(const QVariantList &list)
-{
- if (!socket()->isOpen()) {
- qWarning() << Q_FUNC_INFO << "Can't write to a closed socket!";
return;
}
- QByteArray data;
- QDataStream msgStream(&data, QIODevice::WriteOnly);
- msgStream.setVersion(QDataStream::Qt_4_2);
- msgStream << list;
-
- _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!");
+ // if no sigproxy is set, we're in handshake mode
+ if (!signalProxy())
+ handleHandshakeMessage(list);
+ else
+ handlePackedFunc(list);
}
-void DataStreamPeer::writeSocketData(const QVariantMap &handshakeMsg)
+void DataStreamPeer::writeMessage(const QVariantMap &handshakeMsg)
{
QVariantList list;
QVariantMap::const_iterator it = handshakeMsg.begin();
++it;
}
- writeSocketData(list);
+ writeMessage(list);
}
+void DataStreamPeer::writeMessage(const QVariantList &sigProxyMsg)
+{
+ QByteArray data;
+ QDataStream msgStream(&data, QIODevice::WriteOnly);
+ msgStream.setVersion(QDataStream::Qt_4_2);
+ msgStream << sigProxyMsg;
+
+ writeMessage(data);
+}
+
/*** Handshake messages ***/
}
if (msgType == "ClientInit") {
- handle(RegisterClient(m["ClientVersion"].toString(), false)); // UseSsl obsolete
+ handle(RegisterClient(m["ClientVersion"].toString(), m["ClientDate"].toString(), false)); // UseSsl obsolete
}
else if (msgType == "ClientInitReject") {
}
else if (msgType == "ClientInitAck") {
- handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, QDateTime())); // SupportsSsl and coreStartTime obsolete
+ handle(ClientRegistered(m["CoreFeatures"].toUInt(), m["Configured"].toBool(), m["StorageBackends"].toList(), false, m["Authenticators"].toList())); // SupportsSsl obsolete
}
else if (msgType == "CoreSetupData") {
QVariantMap map = m["SetupData"].toMap();
- handle(SetupData(map["AdminUser"].toString(), map["AdminPasswd"].toString(), map["Backend"].toString(), map["ConnectionProperties"].toMap()));
+ handle(SetupData(map["AdminUser"].toString(), map["AdminPasswd"].toString(), map["Backend"].toString(), map["ConnectionProperties"].toMap(), map["Authenticator"].toString(), map["AuthProperties"].toMap()));
}
else if (msgType == "CoreSetupReject") {
QVariantMap m;
m["MsgType"] = "ClientInit";
m["ClientVersion"] = msg.clientVersion;
- m["ClientDate"] = Quassel::buildInfo().buildDate;
+ m["ClientDate"] = msg.buildDate;
- writeSocketData(m);
+ writeMessage(m);
}
m["MsgType"] = "ClientInitReject";
m["Error"] = msg.errorString;
- writeSocketData(m);
+ writeMessage(m);
}
m["MsgType"] = "ClientInitAck";
m["CoreFeatures"] = msg.coreFeatures;
m["StorageBackends"] = msg.backendInfo;
+ m["Authenticators"] = msg.authenticatorInfo;
m["LoginEnabled"] = m["Configured"] = msg.coreConfigured;
- writeSocketData(m);
+ writeMessage(m);
}
map["Backend"] = msg.backend;
map["ConnectionProperties"] = msg.setupData;
+ // Auth backend properties.
+ map["Authenticator"] = msg.authenticator;
+ map["AuthProperties"] = msg.authSetupData;
+
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);
}
void DataStreamPeer::dispatchPackedFunc(const QVariantList &packedFunc)
{
- writeSocketData(packedFunc);
+ writeMessage(packedFunc);
}
projects / quassel.git / blobdiff