From eb5fdd7214f0b9e831d277b2dbb30dbdefdddfd4 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 16 Jul 2015 15:57:19 -0700 Subject: [PATCH] clear unused types and push version to 10 --- .../networking/src/udt/PacketHeaders.cpp | 41 +------------------ libraries/networking/src/udt/PacketHeaders.h | 6 --- 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/libraries/networking/src/udt/PacketHeaders.cpp b/libraries/networking/src/udt/PacketHeaders.cpp index 9a39b6f5eb..06a231202b 100644 --- a/libraries/networking/src/udt/PacketHeaders.cpp +++ b/libraries/networking/src/udt/PacketHeaders.cpp @@ -64,50 +64,12 @@ int packArithmeticallyCodedValue(int value, char* destination) { PacketVersion versionForPacketType(PacketType::Value packetType) { switch (packetType) { - case MicrophoneAudioNoEcho: - case MicrophoneAudioWithEcho: - return 3; - case SilentAudioFrame: - return 5; - case MixedAudio: - return 2; - case InjectAudio: - return 2; - case AvatarData: - return 7; - case AvatarIdentity: - return 2; - case EnvironmentData: - return 3; - case DomainList: - case DomainListRequest: - return 6; - case DomainConnectRequest: - return 2; - case CreateAssignment: - case RequestAssignment: - return 3; - case OctreeStats: - return 2; - case OctreeDataNack: - return 2; - case StopNode: - return 2; case EntityAdd: case EntityEdit: case EntityData: return VERSION_ENTITIES_NEW_PROTOCOL_LAYER; - case EntityEditNack: - return 2; - case EntityErase: - return 3; - case AudioStreamStats: - return 2; - case ICEServerHeartbeat: - case ICEServerQuery: - return 2; default: - return 1; + return 10; } } @@ -150,7 +112,6 @@ QString nameForPacketType(PacketType::Value packetType) { PACKET_TYPE_NAME_LOOKUP(StopNode); PACKET_TYPE_NAME_LOOKUP(AudioEnvironment); PACKET_TYPE_NAME_LOOKUP(EntityEditNack); - PACKET_TYPE_NAME_LOOKUP(SignedTransactionPayment); PACKET_TYPE_NAME_LOOKUP(ICEServerHeartbeat); PACKET_TYPE_NAME_LOOKUP(DomainServerAddedNode); PACKET_TYPE_NAME_LOOKUP(ICEServerQuery); diff --git a/libraries/networking/src/udt/PacketHeaders.h b/libraries/networking/src/udt/PacketHeaders.h index 5f63a2c840..7a2b28742b 100644 --- a/libraries/networking/src/udt/PacketHeaders.h +++ b/libraries/networking/src/udt/PacketHeaders.h @@ -48,7 +48,6 @@ namespace PacketType { DomainConnectionDenied, MuteEnvironment, AudioStreamStats, - UNUSED, // 20 DomainServerPathQuery, DomainServerPathResponse, DomainServerAddedNode, @@ -58,11 +57,7 @@ namespace PacketType { Jurisdiction, JurisdictionRequest, AssignmentClientStatus, - UNUSED_7, // 30 - UNUSED_8, - UNUSED_9, NoisyMute, - UNUSED_10, AvatarIdentity, // 35 AvatarBillboard, DomainConnectRequest, @@ -77,7 +72,6 @@ namespace PacketType { StopNode, AudioEnvironment, EntityEditNack, - SignedTransactionPayment, ICEServerHeartbeat, // 50 ICEPing, ICEPingReply