Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 00:56:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

repairs for moved packet handling in AssetServer

Browse source
This commit is contained in:
Stephen Birarda 2016-03-08 10:21:29 -08:00
parent bf8a2bc9e5
commit a3533b0b7d
2 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
assignment-client/src/assets/AssetServer.cpp
View file

@ -186,15 +186,15 @@ void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> me
switch (operationType) {
case AssetMappingOperationType::Get: {
handleGetMappingOperation(*message, senderNode, std::move(replyPacket));
handleGetMappingOperation(*message, senderNode, *replyPacket);
break;
}
case AssetMappingOperationType::Set: {
handleSetMappingOperation(*message, senderNode, std::move(replyPacket));
handleSetMappingOperation(*message, senderNode, *replyPacket);
break;
}
case AssetMappingOperationType::Delete: {
handleDeleteMappingOperation(*message, senderNode, std::move(replyPacket));
handleDeleteMappingOperation(*message, senderNode, *replyPacket);
break;
}
}
@ -203,51 +203,48 @@ void AssetServer::handleAssetMappingOperation(QSharedPointer<ReceivedMessage> me
nodeList->sendPacket(std::move(replyPacket), *senderNode);
}
void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode,
std::unique_ptr<NLPacket> replyPacket) {
void AssetServer::handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacket& replyPacket) {
QString assetPath = message.readString();
auto it = _fileMapping.find(assetPath);
if (it != _fileMapping.end()) {
auto assetHash = it->toString();
qDebug() << "Found mapping for: " << assetPath << "=>" << assetHash;
replyPacket->writePrimitive(AssetServerError::NoError);
replyPacket->write(QByteArray::fromHex(assetHash.toLocal8Bit()));
replyPacket.writePrimitive(AssetServerError::NoError);
replyPacket.write(QByteArray::fromHex(assetHash.toLocal8Bit()));
}
else {
qDebug() << "Mapping not found for: " << assetPath;
replyPacket->writePrimitive(AssetServerError::AssetNotFound);
replyPacket.writePrimitive(AssetServerError::AssetNotFound);
}
}
void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode,
std::unique_ptr<NLPacket> replyPacket) {
void AssetServer::handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacket& replyPacket) {
if (senderNode->getCanRez()) {
QString assetPath = message.readString();
auto assetHash = message.read(SHA256_HASH_LENGTH).toHex();
if (setMapping(assetPath, assetHash)) {
replyPacket->writePrimitive(AssetServerError::NoError);
replyPacket.writePrimitive(AssetServerError::NoError);
} else {
replyPacket->writePrimitive(AssetServerError::MappingOperationFailed);
replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
}
} else {
replyPacket->writePrimitive(AssetServerError::PermissionDenied);
replyPacket.writePrimitive(AssetServerError::PermissionDenied);
}
}
void AssetServer::handleDeleteMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode,
std::unique_ptr<NLPacket> replyPacket) {
void AssetServer::handleDeleteMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacket& replyPacket) {
if (senderNode->getCanRez()) {
QString assetPath = message.readString();
if (deleteMapping(assetPath)) {
replyPacket->writePrimitive(AssetServerError::NoError);
replyPacket.writePrimitive(AssetServerError::NoError);
} else {
replyPacket->writePrimitive(AssetServerError::MappingOperationFailed);
replyPacket.writePrimitive(AssetServerError::MappingOperationFailed);
}
} else {
replyPacket->writePrimitive(AssetServerError::PermissionDenied);
replyPacket.writePrimitive(AssetServerError::PermissionDenied);
}
}

7
assignment-client/src/assets/AssetServer.h
View file

@ -41,10 +41,9 @@ private slots:
private:
using Mapping = QVariantHash;
void handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, std::unique_ptr<NLPacket> replyPacket);
void handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, std::unique_ptr<NLPacket> replyPacket);
void handleDeleteMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode,
std::unique_ptr<NLPacket> replyPacket);
void handleGetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacket& replyPacket);
void handleSetMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacket& replyPacket);
void handleDeleteMappingOperation(ReceivedMessage& message, SharedNodePointer senderNode, NLPacket& replyPacket);
// Mapping file operations must be called from main assignment thread only
void loadMappingFromFile();