From b4b7b7ea34aeaf98a07bc8a98a0cab6f52484048 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 13 Jul 2016 13:41:45 -0700 Subject: [PATCH] Update all asset server responses to be reliable --- assignment-client/src/assets/AssetServer.cpp | 5 +++-- assignment-client/src/assets/UploadAssetTask.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/assignment-client/src/assets/AssetServer.cpp b/assignment-client/src/assets/AssetServer.cpp index 7f43b86328..905cc6fd30 100644 --- a/assignment-client/src/assets/AssetServer.cpp +++ b/assignment-client/src/assets/AssetServer.cpp @@ -298,7 +298,8 @@ void AssetServer::handleAssetGetInfo(QSharedPointer message, Sh message->readPrimitive(&messageID); assetHash = message->readWithoutCopy(SHA256_HASH_LENGTH); - auto replyPacket = NLPacket::create(PacketType::AssetGetInfoReply); + auto size = qint64(sizeof(MessageID) + SHA256_HASH_LENGTH + sizeof(AssetServerError) + sizeof(qint64)); + auto replyPacket = NLPacket::create(PacketType::AssetGetInfoReply, size, true); QByteArray hexHash = assetHash.toHex(); @@ -347,7 +348,7 @@ void AssetServer::handleAssetUpload(QSharedPointer message, Sha // for now this also means it isn't allowed to add assets // so return a packet with error that indicates that - auto permissionErrorPacket = NLPacket::create(PacketType::AssetUploadReply, sizeof(MessageID) + sizeof(AssetServerError)); + auto permissionErrorPacket = NLPacket::create(PacketType::AssetUploadReply, sizeof(MessageID) + sizeof(AssetServerError), true); MessageID messageID; message->readPrimitive(&messageID); diff --git a/assignment-client/src/assets/UploadAssetTask.cpp b/assignment-client/src/assets/UploadAssetTask.cpp index 5ca9b5bbf1..e09619a3cc 100644 --- a/assignment-client/src/assets/UploadAssetTask.cpp +++ b/assignment-client/src/assets/UploadAssetTask.cpp @@ -43,7 +43,7 @@ void UploadAssetTask::run() { qDebug() << "UploadAssetTask reading a file of " << fileSize << "bytes from" << uuidStringWithoutCurlyBraces(_senderNode->getUUID()); - auto replyPacket = NLPacket::create(PacketType::AssetUploadReply); + auto replyPacket = NLPacket::create(PacketType::AssetUploadReply, -1, true); replyPacket->writePrimitive(messageID); if (fileSize > MAX_UPLOAD_SIZE) {