From 57b27a7bb756a661fa3b207383810c551dac8de3 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Tue, 25 Jul 2017 20:17:20 -0700
Subject: [PATCH] change packet type to be sourced, change from packet list to
 single packet

---
 assignment-client/src/octree/OctreeServer.cpp | 19 ++++++++-----------
 interface/src/Application.cpp                 |  8 ++++----
 interface/src/Application.h                   |  2 --
 .../networking/src/udt/PacketHeaders.cpp      |  3 +--
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp
index 8a1e245f0e..d6a0cc7b92 100644
--- a/assignment-client/src/octree/OctreeServer.cpp
+++ b/assignment-client/src/octree/OctreeServer.cpp
@@ -928,7 +928,7 @@ void OctreeServer::handleJurisdictionRequestPacket(QSharedPointer<ReceivedMessag
 
 void OctreeServer::handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> message) {
     if (!_isFinished && !_isShuttingDown) {
-        // these messages are only allowed to come from the domain server or authenticated users, so make sure that is the case
+        // these messages are only allowed to come from the domain server, so make sure that is the case
         auto nodeList = DependencyManager::get<NodeList>();
         if (message->getSenderSockAddr() == nodeList->getDomainHandler().getSockAddr()) {
             // it's far cleaner to load up the new content upon server startup
@@ -965,8 +965,7 @@ void OctreeServer::handleOctreeFileReplacement(QSharedPointer<ReceivedMessage> m
                     } else {
                         qWarning() << "Could not write replacement octree data to file - refusing to process";
                     }
-                }
-                else {
+                } else {
                     qDebug() << "Received replacement octree file that is invalid - refusing to process";
                 }
             } else {
@@ -984,6 +983,7 @@ void OctreeServer::handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMes
     if (!_isFinished && !_isShuttingDown) {
         // This call comes from Interface, so we skip our domain server check
         // but confirm that we have permissions to replace content sets
+        if (DependencyManager::get<NodeList>()->getThisNodeCanReplaceContent()) {
             if (!_persistAbsoluteFilePath.isEmpty()) {
                 // Convert message data into our URL
                 QString url(message->getMessage());
@@ -1020,23 +1020,20 @@ void OctreeServer::handleOctreeFileReplacementFromURL(QSharedPointer<ReceivedMes
                                 // process it when it comes back up
                                 qInfo() << "Wrote octree replacement file to" << replacementFilePath << "- stopping server";
                                 setFinished(true);
-                            }
-                            else {
+                            } else {
                                 qWarning() << "Could not write replacement octree data to file - refusing to process";
                             }
-                        }
-                        else {
+                        } else {
                             qDebug() << "Received replacement octree file that is invalid - refusing to process";
                         }
-                    }
-                    else {
+                    } else {
                         qDebug() << "Error downloading JSON from specified file";
                     }
                 });
-            }
-            else {
+            } else {
                 qDebug() << "Cannot perform octree file replacement since current persist file path is not yet known";
             }
+        }
     }
 }
 
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3c701a1bc7..912be83b24 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -255,7 +255,7 @@ static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
 
 static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
 
-const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions{
+const QHash<QString, Application::AcceptURLMethod> Application::_acceptedExtensions {
     { SVO_EXTENSION, &Application::importSVOFromURL },
     { SVO_JSON_EXTENSION, &Application::importSVOFromURL },
     { AVA_JSON_EXTENSION, &Application::askToWearAvatarAttachmentUrl },
@@ -6070,9 +6070,9 @@ bool Application::askToReplaceDomainContent(const QString& url) {
             limitedNodeList->eachMatchingNode([](const SharedNodePointer& node) {
                 return node->getType() == NodeType::EntityServer && node->getActiveSocket();
             }, [&_url, limitedNodeList](const SharedNodePointer& octreeNode) {
-                auto octreeFilePacketList = NLPacketList::create(PacketType::OctreeFileReplacementFromUrl, QByteArray(), true, true);
-                octreeFilePacketList->write(_url); 
-                limitedNodeList->sendPacketList(std::move(octreeFilePacketList), *octreeNode);
+                auto octreeFilePacket = NLPacket::create(PacketType::OctreeFileReplacementFromUrl, _url.size(), true);
+                octreeFilePacket->write(_url); 
+                limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
                 return true;
             });
         }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index a8467b5b1e..913fbebb15 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -311,8 +311,6 @@ signals:
     void uploadRequest(QString path);
     void receivedHifiSchemeURL(const QString& url);
 
-    void requestDomainContentReplacement(const QString& url);
-
 public slots:
     QVector<EntityItemID> pasteEntities(float x, float y, float z);
     bool exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs, const glm::vec3* givenOffset = nullptr);
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index 2cacf682f8..240697d890 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -42,8 +42,7 @@ const QSet<PacketType> NON_SOURCED_PACKETS = QSet<PacketType>()
     << PacketType::DomainServerRemovedNode << PacketType::UsernameFromIDReply << PacketType::OctreeFileReplacement
     << PacketType::ReplicatedMicrophoneAudioNoEcho << PacketType::ReplicatedMicrophoneAudioWithEcho
     << PacketType::ReplicatedInjectAudio << PacketType::ReplicatedSilentAudioFrame
-    << PacketType::ReplicatedAvatarIdentity << PacketType::ReplicatedKillAvatar << PacketType::ReplicatedBulkAvatarData
-    << PacketType::OctreeFileReplacementFromUrl;
+    << PacketType::ReplicatedAvatarIdentity << PacketType::ReplicatedKillAvatar << PacketType::ReplicatedBulkAvatarData;
 
 const QHash<PacketType, PacketType> REPLICATED_PACKET_MAPPING {
     { PacketType::MicrophoneAudioNoEcho, PacketType::ReplicatedMicrophoneAudioNoEcho },