DataStreamPeer: Use UTF-8 QByteArrays instead of QString for message headers

[quassel.git] / src / common / protocols / datastream / datastreampeer.cpp

diff --git a/src/common/protocols/datastream/datastreampeer.cpp b/src/common/protocols/datastream/datastreampeer.cpp
index 83037b0..acd0bc4 100644 (file)
--- a/src/common/protocols/datastream/datastreampeer.cpp
+++ b/src/common/protocols/datastream/datastreampeer.cpp
@@ -28,8 +28,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 +37,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;
@@ -110,31 +94,9 @@ bool DataStreamPeer::readSocketData(QVariant &item)
 
     emit transferProgress(_blockSize, _blockSize);
 
+    _stream >> item;
     _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;
@@ -155,19 +117,7 @@ void DataStreamPeer::writeSocketData(const QVariant &item)
     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;
-    }
+    out << item;
 
     _stream << block;  // also writes the length as part of the serialization format
 }
@@ -191,12 +141,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 +149,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
     }
 
@@ -381,7 +321,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,7 +341,7 @@ 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;
         }
@@ -411,7 +351,7 @@ void DataStreamPeer::handlePackedFunc(const QVariant &packedFunc)
                 return;
             }
             QByteArray className = params[0].toByteArray();
-            QString objectName = params[1].toString();
+            QString objectName = QString::fromUtf8(params[1].toByteArray());
             QVariantMap initData = params[2].toMap();
             handle(Protocol::InitData(className, objectName, initData));
             break;
@@ -447,7 +387,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,13 +399,13 @@ 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);
+    dispatchPackedFunc(QVariantList() << (qint16)InitData << msg.className << msg.objectName.toUtf8() << msg.initData);
 }