Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 01:14:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

repairs to permission error for asset-server upload

Browse source
This commit is contained in:
Stephen Birarda 2015-08-27 12:13:20 -07:00
parent c212ef5734
commit 16eee10cab
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,6 +140,13 @@ void AssetServer::handleAssetGet(QSharedPointer<NLPacket> packet, SharedNodePoin
void AssetServer::handleAssetUpload(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode) { void AssetServer::handleAssetUpload(QSharedPointer<NLPacketList> packetList, SharedNodePointer senderNode) {
auto data = packetList->getMessage();
QBuffer buffer { &data };
buffer.open(QIODevice::ReadOnly);
MessageID messageID;
buffer.read(reinterpret_cast<char*>(&messageID), sizeof(messageID));
if (!senderNode->getCanRez()) { if (!senderNode->getCanRez()) {
// this is a node the domain told us is not allowed to rez entities // this is a node the domain told us is not allowed to rez entities
// for now this also means it isn't allowed to add assets // for now this also means it isn't allowed to add assets
@ -147,10 +154,8 @@ void AssetServer::handleAssetUpload(QSharedPointer<NLPacketList> packetList, Sha
auto permissionErrorPacket = NLPacket::create(PacketType::AssetUploadReply, sizeof(MessageID) + sizeof(AssetServerError)); auto permissionErrorPacket = NLPacket::create(PacketType::AssetUploadReply, sizeof(MessageID) + sizeof(AssetServerError));
MessageID defaultMessageID; // write the message ID and a permission denied error
permissionErrorPacket->writePrimitive(messageID);
// write the default message ID and permission denied error
permissionErrorPacket->writePrimitive(defaultMessageID);
permissionErrorPacket->writePrimitive(AssetServerError::PERMISSION_DENIED); permissionErrorPacket->writePrimitive(AssetServerError::PERMISSION_DENIED);
// send off the packet // send off the packet
@ -161,13 +166,6 @@ void AssetServer::handleAssetUpload(QSharedPointer<NLPacketList> packetList, Sha
return; return;
} }
auto data = packetList->getMessage();
QBuffer buffer { &data };
buffer.open(QIODevice::ReadOnly);
MessageID messageID;
buffer.read(reinterpret_cast<char*>(&messageID), sizeof(messageID));
uint8_t extensionLength; uint8_t extensionLength;
buffer.read(reinterpret_cast<char*>(&extensionLength), sizeof(extensionLength)); buffer.read(reinterpret_cast<char*>(&extensionLength), sizeof(extensionLength));

2
interface/src/Menu.h
View file

@ -288,7 +288,7 @@ namespace MenuOption {
const QString ToolWindow = "Tool Window"; const QString ToolWindow = "Tool Window";
const QString TransmitterDrive = "Transmitter Drive"; const QString TransmitterDrive = "Transmitter Drive";
const QString TurnWithHead = "Turn using Head"; const QString TurnWithHead = "Turn using Head";
const QString UploadAsset = "Upload File to Local Asset Server"; const QString UploadAsset = "Upload File to Asset Server";
const QString UseAudioForMouth = "Use Audio for Mouth"; const QString UseAudioForMouth = "Use Audio for Mouth";
const QString UseCamera = "Use Camera"; const QString UseCamera = "Use Camera";
const QString VelocityFilter = "Velocity Filter"; const QString VelocityFilter = "Velocity Filter";

4
libraries/networking/src/udt/Connection.cpp
View file

@ -655,6 +655,7 @@ void Connection::processTimeoutNAK(std::unique_ptr<ControlPacket> controlPacket)
} }
void Connection::resetReceiveState() { void Connection::resetReceiveState() {
// reset all SequenceNumber member variables back to default // reset all SequenceNumber member variables back to default
SequenceNumber defaultSequenceNumber; SequenceNumber defaultSequenceNumber;
@ -665,6 +666,9 @@ void Connection::resetReceiveState() {
_lastSentACK = defaultSequenceNumber; _lastSentACK = defaultSequenceNumber;
// clear the sent ACKs
_sentACKs.clear();
// clear the loss list and _lastNAKTime // clear the loss list and _lastNAKTime
_lossList.clear(); _lossList.clear();
_lastNAKTime = high_resolution_clock::time_point(); _lastNAKTime = high_resolution_clock::time_point();