From 44c99ef89ad9f834fbb5907179e298b1d358286f Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 15 Jul 2015 10:44:51 -0700 Subject: [PATCH] Replace bytesAvailable with bytesLefToRead --- .../src/octree/OctreeInboundPacketProcessor.cpp | 6 +++--- domain-server/src/DomainServer.cpp | 4 ++-- libraries/avatars/src/AvatarHashMap.cpp | 4 ++-- libraries/entities/src/EntityTree.cpp | 2 +- libraries/networking/src/udt/Packet.cpp | 2 +- libraries/networking/src/udt/Packet.h | 3 ++- libraries/octree/src/JurisdictionMap.cpp | 4 ++-- libraries/octree/src/OctreeRenderer.cpp | 10 +++++----- libraries/render-utils/src/Environment.cpp | 4 ++-- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp index 2b31b2f2a2..0cb6eae9ed 100644 --- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp +++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp @@ -136,18 +136,18 @@ void OctreeInboundPacketProcessor::processPacket(QSharedPointer packet if (debugProcessPacket) { qDebug() << " atByte (in payload)=" << packet->pos(); qDebug() << " payload size=" << packet->getSizeUsed(); - if (!packet->bytesAvailable()) { + if (!packet->bytesLeftToRead()) { qDebug() << " ----- UNEXPECTED ---- got a packet without any edit details!!!! --------"; } } const unsigned char* editData = nullptr; - while (packet->bytesAvailable() > 0) { + while (packet->bytesLeftToRead() > 0) { editData = reinterpret_cast(packet->getPayload() + packet->pos()); - int maxSize = packet->bytesAvailable(); + int maxSize = packet->bytesLeftToRead(); if (debugProcessPacket) { qDebug() << " --- inside while loop ---"; diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 1824446fca..625f50d432 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -2190,7 +2190,7 @@ void DomainServer::processPathQueryPacket(QSharedPointer packet) { quint16 numPathBytes; packet->readPrimitive(&numPathBytes); - if (numPathBytes <= packet->bytesAvailable()) { + if (numPathBytes <= packet->bytesLeftToRead()) { // the number of path bytes makes sense for the sent packet - pull out the path QString pathQuery = QString::fromUtf8(packet->getPayload() + packet->pos(), numPathBytes); @@ -2223,7 +2223,7 @@ void DomainServer::processPathQueryPacket(QSharedPointer packet) { // are we going to be able to fit this response viewpoint in a packet? if (numPathBytes + numViewpointBytes + sizeof(numViewpointBytes) + sizeof(numPathBytes) - < (unsigned long) pathResponsePacket->bytesAvailable()) { + < (unsigned long) pathResponsePacket->bytesLeftToRead()) { // append the number of bytes this path is pathResponsePacket->writePrimitive(numPathBytes); diff --git a/libraries/avatars/src/AvatarHashMap.cpp b/libraries/avatars/src/AvatarHashMap.cpp index ac8982f8e8..ebabb1115b 100644 --- a/libraries/avatars/src/AvatarHashMap.cpp +++ b/libraries/avatars/src/AvatarHashMap.cpp @@ -56,7 +56,7 @@ void AvatarHashMap::processAvatarDataPacket(QSharedPointer packet, Sha // enumerate over all of the avatars in this packet // only add them if mixerWeakPointer points to something (meaning that mixer is still around) - while (packet->bytesAvailable()) { + while (packet->bytesLeftToRead()) { QUuid sessionUUID = QUuid::fromRfc4122(packet->read(NUM_BYTES_RFC4122_UUID)); if (sessionUUID != _lastOwnerSessionUUID) { @@ -121,7 +121,7 @@ void AvatarHashMap::processAvatarBillboardPacket(QSharedPointer packet avatar = addAvatar(sessionUUID, sendingNode); } - QByteArray billboard = packet->read(packet->bytesAvailable()); + QByteArray billboard = packet->read(packet->bytesLeftToRead()); if (avatar->getBillboard() != billboard) { avatar->setBillboard(billboard); } diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index cb4011c799..61bbde6f1a 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -867,7 +867,7 @@ int EntityTree::processEraseMessage(NLPacket& packet, const SharedNodePointer& s for (size_t i = 0; i < numberOfIDs; i++) { - if (NUM_BYTES_RFC4122_UUID > packet.bytesAvailable()) { + if (NUM_BYTES_RFC4122_UUID > packet.bytesLeftToRead()) { qCDebug(entities) << "EntityTree::processEraseMessage().... bailing because not enough bytes in buffer"; break; // bail to prevent buffer overflow } diff --git a/libraries/networking/src/udt/Packet.cpp b/libraries/networking/src/udt/Packet.cpp index 975c137f27..ac98ba9340 100644 --- a/libraries/networking/src/udt/Packet.cpp +++ b/libraries/networking/src/udt/Packet.cpp @@ -215,7 +215,7 @@ qint64 Packet::writeData(const char* data, qint64 maxSize) { qint64 Packet::readData(char* dest, qint64 maxSize) { // we're either reading what is left from the current position or what was asked to be read - qint64 numBytesToRead = std::min(bytesAvailable(), maxSize); + qint64 numBytesToRead = std::min(bytesLeftToRead(), maxSize); if (numBytesToRead > 0) { int currentPosition = pos(); diff --git a/libraries/networking/src/udt/Packet.h b/libraries/networking/src/udt/Packet.h index 1e18dde117..c7933606be 100644 --- a/libraries/networking/src/udt/Packet.h +++ b/libraries/networking/src/udt/Packet.h @@ -53,7 +53,8 @@ public: qint64 getSizeUsed() const { return _sizeUsed; } void setSizeUsed(qint64 sizeUsed) { _sizeUsed = sizeUsed; } - qint64 bytesAvailableForWrite() const { return _capacity - _sizeUsed; } + void bytesLeftToRead() const { return _capacity - pos(); } + qint64 bytesAvailableForWrite() const { return _capacity - pos(); } HifiSockAddr& getSenderSockAddr() { return _senderSockAddr; } const HifiSockAddr& getSenderSockAddr() const { return _senderSockAddr; } diff --git a/libraries/octree/src/JurisdictionMap.cpp b/libraries/octree/src/JurisdictionMap.cpp index 45cc1edef7..35806eb8a7 100644 --- a/libraries/octree/src/JurisdictionMap.cpp +++ b/libraries/octree/src/JurisdictionMap.cpp @@ -322,7 +322,7 @@ int JurisdictionMap::unpackFromPacket(NLPacket& packet) { int bytes = 0; packet.readPrimitive(&bytes); - if (bytes > 0 && bytes <= packet.bytesAvailable()) { + if (bytes > 0 && bytes <= packet.bytesLeftToRead()) { _rootOctalCode = new unsigned char[bytes]; packet.read(reinterpret_cast(_rootOctalCode), bytes); @@ -334,7 +334,7 @@ int JurisdictionMap::unpackFromPacket(NLPacket& packet) { int bytes = 0; packet.readPrimitive(&bytes); - if (bytes <= packet.bytesAvailable()) { + if (bytes <= packet.bytesLeftToRead()) { unsigned char* endNodeCode = new unsigned char[bytes]; packet.read(reinterpret_cast(endNodeCode), bytes); diff --git a/libraries/octree/src/OctreeRenderer.cpp b/libraries/octree/src/OctreeRenderer.cpp index 9f4cd0d1a1..db3ace67ce 100644 --- a/libraries/octree/src/OctreeRenderer.cpp +++ b/libraries/octree/src/OctreeRenderer.cpp @@ -90,7 +90,7 @@ void OctreeRenderer::processDatagram(NLPacket& packet, SharedNodePointer sourceN qCDebug(octree, "OctreeRenderer::processDatagram() ... Got Packet Section" " color:%s compressed:%s sequence: %u flight:%d usec size:%lld data:%lld", debug::valueOf(packetIsColored), debug::valueOf(packetIsCompressed), - sequence, flightTime, packet.getSizeWithHeader(), packet.bytesAvailable()); + sequence, flightTime, packet.getSizeWithHeader(), packet.bytesLeftToRead()); } _packetsInLastWindow++; @@ -108,16 +108,16 @@ void OctreeRenderer::processDatagram(NLPacket& packet, SharedNodePointer sourceN bool error = false; - while (packet.bytesAvailable() > 0 && !error) { + while (packet.bytesLeftToRead() > 0 && !error) { if (packetIsCompressed) { - if (packet.bytesAvailable() > (qint64) sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE)) { + if (packet.bytesLeftToRead() > (qint64) sizeof(OCTREE_PACKET_INTERNAL_SECTION_SIZE)) { packet.readPrimitive(§ionLength); } else { sectionLength = 0; error = true; } } else { - sectionLength = packet.bytesAvailable(); + sectionLength = packet.bytesLeftToRead(); } if (sectionLength) { @@ -139,7 +139,7 @@ void OctreeRenderer::processDatagram(NLPacket& packet, SharedNodePointer sourceN " color:%s compressed:%s sequence: %u flight:%d usec size:%lld data:%lld" " subsection:%d sectionLength:%d uncompressed:%d", debug::valueOf(packetIsColored), debug::valueOf(packetIsCompressed), - sequence, flightTime, packet.getSizeWithHeader(), packet.bytesAvailable(), subsection, sectionLength, + sequence, flightTime, packet.getSizeWithHeader(), packet.bytesLeftToRead(), subsection, sectionLength, packetData.getUncompressedSize()); } diff --git a/libraries/render-utils/src/Environment.cpp b/libraries/render-utils/src/Environment.cpp index 1c878cf4c6..7b33ac1698 100644 --- a/libraries/render-utils/src/Environment.cpp +++ b/libraries/render-utils/src/Environment.cpp @@ -205,9 +205,9 @@ int Environment::processPacket(NLPacket& packet) { EnvironmentData newData; - while (packet.bytesAvailable() > 0) { + while (packet.bytesLeftToRead() > 0) { int dataLength = newData.parseData(reinterpret_cast(packet.getPayload() + packet.pos()), - packet.bytesAvailable()); + packet.bytesLeftToRead()); packet.seek(packet.pos() + dataLength); // update the mapping by address/ID