diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index 46b631df52..88559578c6 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -118,12 +118,12 @@ public: bool packetVersionAndHashMatch(const QByteArray& packet); - QByteArray byteArrayWithPopulatedHeader(PacketType packetType) - { return byteArrayWithUUIDPopulatedHeader(packetType, _sessionUUID); } - int populatePacketHeader(QByteArray& packet, PacketType packetType) - { return populatePacketHeaderWithUUID(packet, packetType, _sessionUUID); } - int populatePacketHeader(char* packet, PacketType packetType) - { return populatePacketHeaderWithUUID(packet, packetType, _sessionUUID); } + // QByteArray byteArrayWithPopulatedHeader(PacketType packetType) + // { return byteArrayWithUUIDPopulatedHeader(packetType, _sessionUUID); } + // int populatePacketHeader(QByteArray& packet, PacketType packetType) + // { return populatePacketHeaderWithUUID(packet, packetType, _sessionUUID); } + // int populatePacketHeader(char* packet, PacketType packetType) + // { return populatePacketHeaderWithUUID(packet, packetType, _sessionUUID); } qint64 readDatagram(QByteArray& incomingPacket, QHostAddress* address, quint16 * port); diff --git a/libraries/networking/src/PacketHeaders.h b/libraries/networking/src/PacketHeaders.h index 4ac7167c83..ec1ae8b052 100644 --- a/libraries/networking/src/PacketHeaders.h +++ b/libraries/networking/src/PacketHeaders.h @@ -126,18 +126,18 @@ int sequenceNumberOffsetForPacketType(PacketType::Value packetType); QByteArray hashFromPacketHeader(const QByteArray& packet); QByteArray hashForPacketAndConnectionUUID(const QByteArray& packet, const QUuid& connectionUUID); -// NOTE: The following four methods accept a PacketType which defaults to PacketTypeUnknown. +// NOTE: The following four methods accept a PacketType which defaults to PacketType::Unknown. // If the caller has already looked at the packet type and can provide it then the methods below won't have to look it up. -PacketSequenceNumber sequenceNumberFromHeader(const QByteArray& packet, PacketType::Value packetType = PacketTypeUnknown); +PacketSequenceNumber sequenceNumberFromHeader(const QByteArray& packet, PacketType::Value packetType = PacketType::Unknown); -void replaceHashInPacket(QByteArray& packet, const QUuid& connectionUUID, PacketType::Value packetType = PacketTypeUnknown); +void replaceHashInPacket(QByteArray& packet, const QUuid& connectionUUID, PacketType::Value packetType = PacketType::Unknown); void replaceSequenceNumberInPacket(QByteArray& packet, PacketSequenceNumber sequenceNumber, - PacketType::Value packetType = PacketTypeUnknown); + PacketType::Value packetType = PacketType::Unknown); void replaceHashAndSequenceNumberInPacket(QByteArray& packet, const QUuid& connectionUUID, PacketSequenceNumber sequenceNumber, - PacketType::Value packetType = PacketTypeUnknown); + PacketType::Value packetType = PacketType::Unknown); int arithmeticCodingValueFromBuffer(const char* checkValue); int numBytesArithmeticCodingFromBuffer(const char* checkValue);