mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 13:28:16 +02:00
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
This commit is contained in:
Atlante45
commit
cb64b0353e
2 changed files with 0 additions and 289 deletions
|
|
@ -3952,9 +3952,6 @@ int Application::processOctreeStats(NLPacket& packet, SharedNodePointer sendingN
|
||||||
qCDebug(interfaceapp, "stats from new %s server... [%f, %f, %f, %f]",
|
qCDebug(interfaceapp, "stats from new %s server... [%f, %f, %f, %f]",
|
||||||
qPrintable(serverType),
|
qPrintable(serverType),
|
||||||
(double)rootDetails.x, (double)rootDetails.y, (double)rootDetails.z, (double)rootDetails.s);
|
(double)rootDetails.x, (double)rootDetails.y, (double)rootDetails.z, (double)rootDetails.s);
|
||||||
} else {
|
|
||||||
jurisdiction->unlock();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
jurisdiction->unlock();
|
jurisdiction->unlock();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,286 +0,0 @@
|
||||||
//
|
|
||||||
// PacketHeaders.cpp
|
|
||||||
// libraries/networking/src
|
|
||||||
//
|
|
||||||
// Created by Stephen Birarda on 6/28/13.
|
|
||||||
// Copyright 2013 High Fidelity, Inc.
|
|
||||||
//
|
|
||||||
// Distributed under the Apache License, Version 2.0.
|
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
||||||
//
|
|
||||||
|
|
||||||
#include "PacketHeaders.h"
|
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
#include <QtCore/QDebug>
|
|
||||||
|
|
||||||
int arithmeticCodingValueFromBuffer(const char* checkValue) {
|
|
||||||
if (((uchar) *checkValue) < 255) {
|
|
||||||
return *checkValue;
|
|
||||||
} else {
|
|
||||||
return 255 + arithmeticCodingValueFromBuffer(checkValue + 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int numBytesArithmeticCodingFromBuffer(const char* checkValue) {
|
|
||||||
if (((uchar) *checkValue) < 255) {
|
|
||||||
return 1;
|
|
||||||
} else {
|
|
||||||
return 1 + numBytesArithmeticCodingFromBuffer(checkValue + 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int packArithmeticallyCodedValue(int value, char* destination) {
|
|
||||||
if (value < 255) {
|
|
||||||
// less than 255, just pack our value
|
|
||||||
destination[0] = (uchar) value;
|
|
||||||
return 1;
|
|
||||||
} else {
|
|
||||||
// pack 255 and then recursively pack on
|
|
||||||
((unsigned char*)destination)[0] = 255;
|
|
||||||
return 1 + packArithmeticallyCodedValue(value - 255, destination + 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
PacketVersion versionForPacketType(PacketType packetType) {
|
|
||||||
switch (packetType) {
|
|
||||||
case PacketTypeMicrophoneAudioNoEcho:
|
|
||||||
case PacketTypeMicrophoneAudioWithEcho:
|
|
||||||
return 2;
|
|
||||||
case PacketTypeSilentAudioFrame:
|
|
||||||
return 4;
|
|
||||||
case PacketTypeMixedAudio:
|
|
||||||
return 1;
|
|
||||||
case PacketTypeInjectAudio:
|
|
||||||
return 1;
|
|
||||||
case PacketTypeAvatarData:
|
|
||||||
return 7;
|
|
||||||
case PacketTypeAvatarIdentity:
|
|
||||||
return 1;
|
|
||||||
case PacketTypeEnvironmentData:
|
|
||||||
return 2;
|
|
||||||
case PacketTypeDomainList:
|
|
||||||
case PacketTypeDomainListRequest:
|
|
||||||
return 5;
|
|
||||||
case PacketTypeCreateAssignment:
|
|
||||||
case PacketTypeRequestAssignment:
|
|
||||||
return 2;
|
|
||||||
case PacketTypeOctreeStats:
|
|
||||||
return 1;
|
|
||||||
case PacketTypeStopNode:
|
|
||||||
return 1;
|
|
||||||
case PacketTypeEntityAdd:
|
|
||||||
case PacketTypeEntityEdit:
|
|
||||||
case PacketTypeEntityData:
|
|
||||||
return VERSION_ENTITIES_HAVE_SIMULATION_OWNER_AND_ACTIONS_OVER_WIRE;
|
|
||||||
case PacketTypeEntityErase:
|
|
||||||
return 2;
|
|
||||||
case PacketTypeAudioStreamStats:
|
|
||||||
return 1;
|
|
||||||
case PacketTypeIceServerHeartbeat:
|
|
||||||
case PacketTypeIceServerQuery:
|
|
||||||
return 1;
|
|
||||||
default:
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#define PACKET_TYPE_NAME_LOOKUP(x) case x: return QString(#x);
|
|
||||||
|
|
||||||
QString nameForPacketType(PacketType packetType) {
|
|
||||||
switch (packetType) {
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeUnknown);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeStunResponse);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeDomainList);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypePing);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypePingReply);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeKillAvatar);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeAvatarData);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeInjectAudio);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeMixedAudio);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeMicrophoneAudioNoEcho);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeMicrophoneAudioWithEcho);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeBulkAvatarData);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeSilentAudioFrame);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeEnvironmentData);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeDomainListRequest);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeRequestAssignment);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeCreateAssignment);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeDomainConnectionDenied);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeMuteEnvironment);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeAudioStreamStats);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeDataServerConfirm);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeOctreeStats);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeJurisdiction);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeJurisdictionRequest);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeAvatarIdentity);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeAvatarBillboard);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeDomainConnectRequest);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeDomainServerRequireDTLS);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeNodeJsonStats);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityQuery);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityData);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityErase);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeOctreeDataNack);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeStopNode);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeAudioEnvironment);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityEditNack);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeSignedTransactionPayment);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeIceServerHeartbeat);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeDomainServerAddedNode);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeIceServerQuery);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeIceServerPeerInformation);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeUnverifiedPing);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeUnverifiedPingReply);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityAdd);
|
|
||||||
PACKET_TYPE_NAME_LOOKUP(PacketTypeEntityEdit);
|
|
||||||
default:
|
|
||||||
return QString("Type: ") + QString::number((int)packetType);
|
|
||||||
}
|
|
||||||
return QString("unexpected");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
QByteArray byteArrayWithUUIDPopulatedHeader(PacketType packetType, const QUuid& connectionUUID) {
|
|
||||||
QByteArray freshByteArray(MAX_PACKET_HEADER_BYTES, 0);
|
|
||||||
freshByteArray.resize(populatePacketHeaderWithUUID(freshByteArray, packetType, connectionUUID));
|
|
||||||
return freshByteArray;
|
|
||||||
}
|
|
||||||
|
|
||||||
int populatePacketHeaderWithUUID(QByteArray& packet, PacketType packetType, const QUuid& connectionUUID) {
|
|
||||||
if (packet.size() < numBytesForPacketHeaderGivenPacketType(packetType)) {
|
|
||||||
packet.resize(numBytesForPacketHeaderGivenPacketType(packetType));
|
|
||||||
}
|
|
||||||
|
|
||||||
return populatePacketHeaderWithUUID(packet.data(), packetType, connectionUUID);
|
|
||||||
}
|
|
||||||
|
|
||||||
int populatePacketHeaderWithUUID(char* packet, PacketType packetType, const QUuid& connectionUUID) {
|
|
||||||
int numTypeBytes = packArithmeticallyCodedValue(packetType, packet);
|
|
||||||
packet[numTypeBytes] = versionForPacketType(packetType);
|
|
||||||
|
|
||||||
char* position = packet + numTypeBytes + sizeof(PacketVersion);
|
|
||||||
|
|
||||||
QByteArray rfcUUID = connectionUUID.toRfc4122();
|
|
||||||
memcpy(position, rfcUUID.constData(), NUM_BYTES_RFC4122_UUID);
|
|
||||||
position += NUM_BYTES_RFC4122_UUID;
|
|
||||||
|
|
||||||
if (!NON_VERIFIED_PACKETS.contains(packetType)) {
|
|
||||||
// pack 16 bytes of zeros where the md5 hash will be placed once data is packed
|
|
||||||
memset(position, 0, NUM_BYTES_MD5_HASH);
|
|
||||||
position += NUM_BYTES_MD5_HASH;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SEQUENCE_NUMBERED_PACKETS.contains(packetType)) {
|
|
||||||
// Pack zeros for the number of bytes that the sequence number requires.
|
|
||||||
// The LimitedNodeList will handle packing in the sequence number when sending out the packet.
|
|
||||||
memset(position, 0, sizeof(PacketSequenceNumber));
|
|
||||||
position += sizeof(PacketSequenceNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
// return the number of bytes written for pointer pushing
|
|
||||||
return position - packet;
|
|
||||||
}
|
|
||||||
|
|
||||||
int numBytesForPacketHeader(const QByteArray& packet) {
|
|
||||||
PacketType packetType = packetTypeForPacket(packet);
|
|
||||||
return numBytesForPacketHeaderGivenPacketType(packetType);
|
|
||||||
}
|
|
||||||
|
|
||||||
int numBytesForPacketHeader(const char* packet) {
|
|
||||||
PacketType packetType = packetTypeForPacket(packet);
|
|
||||||
return numBytesForPacketHeaderGivenPacketType(packetType);
|
|
||||||
}
|
|
||||||
|
|
||||||
int numBytesForArithmeticCodedPacketType(PacketType packetType) {
|
|
||||||
return (int) ceilf((float) packetType / 255);
|
|
||||||
}
|
|
||||||
|
|
||||||
int numBytesForPacketHeaderGivenPacketType(PacketType packetType) {
|
|
||||||
return numBytesForArithmeticCodedPacketType(packetType)
|
|
||||||
+ numHashBytesForType(packetType)
|
|
||||||
+ numSequenceNumberBytesForType(packetType)
|
|
||||||
+ NUM_STATIC_HEADER_BYTES;
|
|
||||||
}
|
|
||||||
|
|
||||||
int numHashBytesForType(PacketType packetType) {
|
|
||||||
return (NON_VERIFIED_PACKETS.contains(packetType) ? 0 : NUM_BYTES_MD5_HASH);
|
|
||||||
}
|
|
||||||
|
|
||||||
int numSequenceNumberBytesForType(PacketType packetType) {
|
|
||||||
return (SEQUENCE_NUMBERED_PACKETS.contains(packetType) ? sizeof(PacketSequenceNumber) : 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
QUuid uuidFromPacketHeader(const QByteArray& packet) {
|
|
||||||
return QUuid::fromRfc4122(packet.mid(numBytesArithmeticCodingFromBuffer(packet.data()) + sizeof(PacketVersion),
|
|
||||||
NUM_BYTES_RFC4122_UUID));
|
|
||||||
}
|
|
||||||
|
|
||||||
int hashOffsetForPacketType(PacketType packetType) {
|
|
||||||
return numBytesForArithmeticCodedPacketType(packetType) + NUM_STATIC_HEADER_BYTES;
|
|
||||||
}
|
|
||||||
|
|
||||||
int sequenceNumberOffsetForPacketType(PacketType packetType) {
|
|
||||||
return numBytesForPacketHeaderGivenPacketType(packetType) - sizeof(PacketSequenceNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
QByteArray hashFromPacketHeader(const QByteArray& packet) {
|
|
||||||
return packet.mid(hashOffsetForPacketType(packetTypeForPacket(packet)), NUM_BYTES_MD5_HASH);
|
|
||||||
}
|
|
||||||
|
|
||||||
QByteArray hashForPacketAndConnectionUUID(const QByteArray& packet, const QUuid& connectionUUID) {
|
|
||||||
return QCryptographicHash::hash(packet.mid(numBytesForPacketHeader(packet)) + connectionUUID.toRfc4122(),
|
|
||||||
QCryptographicHash::Md5);
|
|
||||||
}
|
|
||||||
|
|
||||||
PacketSequenceNumber sequenceNumberFromHeader(const QByteArray& packet, PacketType packetType) {
|
|
||||||
if (packetType == PacketTypeUnknown) {
|
|
||||||
packetType = packetTypeForPacket(packet);
|
|
||||||
}
|
|
||||||
|
|
||||||
PacketSequenceNumber result = DEFAULT_SEQUENCE_NUMBER;
|
|
||||||
|
|
||||||
if (SEQUENCE_NUMBERED_PACKETS.contains(packetType)) {
|
|
||||||
memcpy(&result, packet.data() + sequenceNumberOffsetForPacketType(packetType), sizeof(PacketSequenceNumber));
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
void replaceHashInPacket(QByteArray& packet, const QUuid& connectionUUID, PacketType packetType) {
|
|
||||||
if (packetType == PacketTypeUnknown) {
|
|
||||||
packetType = packetTypeForPacket(packet);
|
|
||||||
}
|
|
||||||
|
|
||||||
packet.replace(hashOffsetForPacketType(packetType), NUM_BYTES_MD5_HASH,
|
|
||||||
hashForPacketAndConnectionUUID(packet, connectionUUID));
|
|
||||||
}
|
|
||||||
|
|
||||||
void replaceSequenceNumberInPacket(QByteArray& packet, PacketSequenceNumber sequenceNumber, PacketType packetType) {
|
|
||||||
if (packetType == PacketTypeUnknown) {
|
|
||||||
packetType = packetTypeForPacket(packet);
|
|
||||||
}
|
|
||||||
|
|
||||||
packet.replace(sequenceNumberOffsetForPacketType(packetType),
|
|
||||||
sizeof(PacketSequenceNumber), reinterpret_cast<char*>(&sequenceNumber), sizeof(PacketSequenceNumber));
|
|
||||||
}
|
|
||||||
|
|
||||||
void replaceHashAndSequenceNumberInPacket(QByteArray& packet, const QUuid& connectionUUID, PacketSequenceNumber sequenceNumber,
|
|
||||||
PacketType packetType) {
|
|
||||||
if (packetType == PacketTypeUnknown) {
|
|
||||||
packetType = packetTypeForPacket(packet);
|
|
||||||
}
|
|
||||||
|
|
||||||
replaceHashInPacket(packet, connectionUUID, packetType);
|
|
||||||
replaceSequenceNumberInPacket(packet, sequenceNumber, packetType);
|
|
||||||
}
|
|
||||||
|
|
||||||
PacketType packetTypeForPacket(const QByteArray& packet) {
|
|
||||||
return (PacketType) arithmeticCodingValueFromBuffer(packet.data());
|
|
||||||
}
|
|
||||||
|
|
||||||
PacketType packetTypeForPacket(const char* packet) {
|
|
||||||
return (PacketType) arithmeticCodingValueFromBuffer(packet);
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue