Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 10:58:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only debug if define set

Browse source
This commit is contained in:
Atlante45 2016-02-22 15:38:09 -08:00
parent 97aebaf52a
commit 4c18a50473
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/networking/src/udt/Packet.cpp
View file

@ -96,6 +96,7 @@ Packet::Packet(std::unique_ptr<char[]> data, qint64 size, const HifiSockAddr& se
adjustPayloadStartAndCapacity(Packet::localHeaderSize(_isPartOfMessage), _payloadSize > 0); adjustPayloadStartAndCapacity(Packet::localHeaderSize(_isPartOfMessage), _payloadSize > 0);
if (getObfuscationLevel() != Packet::NoObfuscation) { if (getObfuscationLevel() != Packet::NoObfuscation) {
#ifdef UDT_CONNECTION_DEBUG
QString debugString = "Unobfuscating packet %1 with level %2"; QString debugString = "Unobfuscating packet %1 with level %2";
debugString = debugString.arg(QString::number((uint32_t)getSequenceNumber()), debugString = debugString.arg(QString::number((uint32_t)getSequenceNumber()),
QString::number(getObfuscationLevel())); QString::number(getObfuscationLevel()));
@ -109,6 +110,7 @@ Packet::Packet(std::unique_ptr<char[]> data, qint64 size, const HifiSockAddr& se
static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("^Unobfuscating packet .*"); static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("^Unobfuscating packet .*");
qDebug() << qPrintable(debugString); qDebug() << qPrintable(debugString);
#endif
obfuscate(NoObfuscation); // Undo obfuscation obfuscate(NoObfuscation); // Undo obfuscation
} }
@ -138,7 +140,7 @@ Packet& Packet::operator=(Packet&& other) {
return *this; return *this;
} }
void Packet::writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePartNumber messagePartNumber) const { void Packet::writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePartNumber messagePartNumber) {
_isPartOfMessage = true; _isPartOfMessage = true;
_messageNumber = messageNumber; _messageNumber = messageNumber;
_packetPosition = position; _packetPosition = position;

2
libraries/networking/src/udt/Packet.h
View file

@ -90,7 +90,7 @@ public:
PacketPosition getPacketPosition() const { return _packetPosition; } PacketPosition getPacketPosition() const { return _packetPosition; }
MessagePartNumber getMessagePartNumber() const { return _messagePartNumber; } MessagePartNumber getMessagePartNumber() const { return _messagePartNumber; }
void writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePartNumber messagePartNumber) const; void writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePartNumber messagePartNumber);
void writeSequenceNumber(SequenceNumber sequenceNumber) const; void writeSequenceNumber(SequenceNumber sequenceNumber) const;
void obfuscate(ObfuscationLevel level); void obfuscate(ObfuscationLevel level);

3
libraries/networking/src/udt/SendQueue.cpp
View file

@ -365,6 +365,7 @@ bool SendQueue::maybeResendPacket() {
Packet::ObfuscationLevel level = (Packet::ObfuscationLevel)(entry.first < 2 ? 0 : (entry.first - 2) % 4); Packet::ObfuscationLevel level = (Packet::ObfuscationLevel)(entry.first < 2 ? 0 : (entry.first - 2) % 4);
if (level != Packet::NoObfuscation) { if (level != Packet::NoObfuscation) {
#ifdef UDT_CONNECTION_DEBUG
QString debugString = "Obfuscating packet %1 with level %2"; QString debugString = "Obfuscating packet %1 with level %2";
debugString = debugString.arg(QString::number((uint32_t)resendPacket.getSequenceNumber()), debugString = debugString.arg(QString::number((uint32_t)resendPacket.getSequenceNumber()),
QString::number(level)); QString::number(level));
@ -376,7 +377,7 @@ bool SendQueue::maybeResendPacket() {
} }
static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("^Obfuscating packet .*"); static QString repeatedMessage = LogHandler::getInstance().addRepeatedMessageRegex("^Obfuscating packet .*");
qCritical() << qPrintable(debugString); qCritical() << qPrintable(debugString);
#endif
// Create copy of the packet // Create copy of the packet
auto packet = Packet::createCopy(resendPacket); auto packet = Packet::createCopy(resendPacket);

2
libraries/networking/src/udt/Socket.h
View file

@ -25,7 +25,7 @@
#include "CongestionControl.h" #include "CongestionControl.h"
#include "Connection.h" #include "Connection.h"
#define UDT_CONNECTION_DEBUG //#define UDT_CONNECTION_DEBUG
class UDTTest; class UDTTest;