From a320308eaf7a8b1a9f94a962c2200e7a2e65c859 Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Tue, 31 Jul 2018 13:54:22 -0700
Subject: [PATCH] Fix sequence number encoding issue

Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
---
 .../src/entities/EntityTreeSendThread.cpp              |  7 +++----
 interface/src/Application.cpp                          |  1 +
 interface/src/octree/OctreePacketProcessor.cpp         |  4 ++--
 libraries/networking/src/udt/PacketHeaders.cpp         |  2 +-
 libraries/networking/src/udt/PacketHeaders.h           |  2 +-
 tools/dissectors/1-hfudt.lua                           | 10 +++++-----
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/assignment-client/src/entities/EntityTreeSendThread.cpp b/assignment-client/src/entities/EntityTreeSendThread.cpp
index 2e777ae0f1..7e4ccc88cd 100644
--- a/assignment-client/src/entities/EntityTreeSendThread.cpp
+++ b/assignment-client/src/entities/EntityTreeSendThread.cpp
@@ -160,12 +160,11 @@ bool EntityTreeSendThread::traverseTreeAndSendContents(SharedNodePointer node, O
     if (sendComplete && nodeData->wantReportInitialCompletion() && _traversal.finished()) {
         // Dealt with all nearby entities.
         nodeData->setReportInitialCompletion(false);
-        resetState();
 
         // Send EntityQueryInitialResultsComplete reliable packet ...
-        auto initialCompletion = NLPacket::create(PacketType::EntityQueryInitialResultsComplete, -1, true);
-        QDataStream initialCompletionStream(initialCompletion.get());
-        initialCompletionStream << OCTREE_PACKET_SEQUENCE(nodeData->getSequenceNumber() - 1U);
+        auto initialCompletion = NLPacket::create(PacketType::EntityQueryInitialResultsComplete,
+            sizeof(OCTREE_PACKET_SEQUENCE), true);
+        initialCompletion->writePrimitive(OCTREE_PACKET_SEQUENCE(nodeData->getSequenceNumber() - 1U));
         DependencyManager::get<NodeList>()->sendPacket(std::move(initialCompletion), *node.data());
     }
 
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bbb8dc8161..3969e7617e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -5483,6 +5483,7 @@ void Application::update(float deltaTime) {
             // we've received a new full-scene octree stats packet, or it's been long enough to try again anyway
             _lastPhysicsCheckTime = now;
             _fullSceneCounterAtLastPhysicsCheck = _fullSceneReceivedCounter;
+            _lastQueriedViews.clear();  // Force new view.
 
             // process octree stats packets are sent in between full sends of a scene (this isn't currently true).
             // We keep physics disabled until we've received a full scene and everything near the avatar in that
diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp
index 62dcd056e9..76f62bcc4e 100644
--- a/interface/src/octree/OctreePacketProcessor.cpp
+++ b/interface/src/octree/OctreePacketProcessor.cpp
@@ -135,7 +135,7 @@ void OctreePacketProcessor::resetCompletionSequenceNumber() {
 namespace {
     template<typename T> bool lessThanWraparound(int a, int b) {
         constexpr int MAX_T_VALUE = std::numeric_limits<T>::max();
-        if (b < a) {
+        if (b <= a) {
             b += MAX_T_VALUE;
         }
         return (b - a) < (MAX_T_VALUE / 2);
@@ -146,5 +146,5 @@ bool OctreePacketProcessor::octreeSequenceIsComplete(int sequenceNumber) const {
     Locker lock(_completionMutex);
     // If we've received the flagged seq # and the current one is >= it.
     return _completionSequenceNumberValid &&
-        !lessThanWraparound<OCTREE_PACKET_SEQUENCE>(_completionSequenceNumber, sequenceNumber);
+        !lessThanWraparound<OCTREE_PACKET_SEQUENCE>(sequenceNumber, _completionSequenceNumber);
 }
diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp
index bb9666ee37..13ffcb5120 100644
--- a/libraries/networking/src/udt/PacketHeaders.cpp
+++ b/libraries/networking/src/udt/PacketHeaders.cpp
@@ -95,7 +95,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketType::AvatarIdentityRequest:
             return 22;
         default:
-            return 22;
+            return 21;
     }
 }
 
diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h
index 7cba3baaf0..073f3f7c42 100644
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@@ -126,13 +126,13 @@ public:
         EntityScriptCallMethod,
         ChallengeOwnershipRequest,
         ChallengeOwnershipReply,
-        EntityQueryInitialResultsComplete,
 
         OctreeDataFileRequest,
         OctreeDataFileReply,
         OctreeDataPersist,
 
         EntityClone,
+        EntityQueryInitialResultsComplete,
 
         NUM_PACKET_TYPE
     };
diff --git a/tools/dissectors/1-hfudt.lua b/tools/dissectors/1-hfudt.lua
index 9bed892885..26494bb515 100644
--- a/tools/dissectors/1-hfudt.lua
+++ b/tools/dissectors/1-hfudt.lua
@@ -156,11 +156,11 @@ local packet_types = {
   [92] = "EntityScriptCallMethod",
   [93] = "ChallengeOwnershipRequest",
   [94] = "ChallengeOwnershipReply",
-  [95] = "EntityQueryInitialResultsComplete",
-  [96] = "OctreeDataFileRequest",
-  [97] = "OctreeDataFileReply",
-  [98] = "OctreeDataPersist",
-  [99] = "EntityClone"
+  [95] = "OctreeDataFileRequest",
+  [96] = "OctreeDataFileReply",
+  [97] = "OctreeDataPersist",
+  [98] = "EntityClone",
+  [99] = "EntityQueryInitialResultsComplete"
 }
 
 local unsourced_packet_types = {