From d4a239731c54bf78cf6edbc9d195135b39878eaf Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 4 Jan 2018 12:59:22 -0800 Subject: [PATCH 1/2] Add Unused packet type back for ICE servers --- libraries/networking/src/udt/PacketHeaders.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index e23cdad7d3..76388dbeea 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -56,6 +56,8 @@ public: ICEServerPeerInformation, ICEServerQuery, OctreeStats, + UNUSED_PACKET_TYPE_1, + UNUSED_PACKET_TYPE_2, AssignmentClientStatus, NoisyMute, AvatarIdentity, From 294a7ca3c660a1dd8189fab9ef1b8f253cd026e1 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 4 Jan 2018 13:15:01 -0800 Subject: [PATCH 2/2] Make sure the protocol signature still changes --- libraries/networking/src/udt/PacketHeaders.cpp | 2 +- libraries/networking/src/udt/PacketHeaders.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp index 0a75e8c31b..44f86baf40 100644 --- a/libraries/networking/src/udt/PacketHeaders.cpp +++ b/libraries/networking/src/udt/PacketHeaders.cpp @@ -33,7 +33,7 @@ PacketVersion versionForPacketType(PacketType packetType) { return static_cast(EntityVersion::OwnershipChallengeFix); case PacketType::EntityQuery: - return static_cast(EntityQueryPacketVersion::ConnectionIdentifier); + return static_cast(EntityQueryPacketVersion::RemovedJurisdictions); case PacketType::AvatarIdentity: case PacketType::AvatarData: case PacketType::BulkAvatarData: diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index 76388dbeea..b2f22e2a1f 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -212,7 +212,8 @@ enum class EntityScriptCallMethodVersion : PacketVersion { enum class EntityQueryPacketVersion: PacketVersion { JSONFilter = 18, JSONFilterWithFamilyTree = 19, - ConnectionIdentifier = 20 + ConnectionIdentifier = 20, + RemovedJurisdictions = 21 }; enum class AssetServerPacketVersion: PacketVersion {