From 57b69d150103ddc27487a72034f01d0a7babc1c4 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 7 Jul 2015 15:43:21 -0700 Subject: [PATCH 1/2] Add PacketList::getNumPackets --- libraries/networking/src/PacketList.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/networking/src/PacketList.h b/libraries/networking/src/PacketList.h index 1b0905a1c8..010f595938 100644 --- a/libraries/networking/src/PacketList.h +++ b/libraries/networking/src/PacketList.h @@ -23,6 +23,8 @@ public: void startSegment() { _segmentStartIndex = currentPacket->payload().pos(); } void endSegment() { _segmentStartIndex = -1; } + int getNumPackets() const { return _packets.size() + (_currentPacket ? 1 : 0); } + void closeCurrentPacket(); void setExtendedHeader(const QByteArray& extendedHeader) { _extendedHeader = extendedHeader; } From b502239cca115fe0e464077144176d0e29505881 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 7 Jul 2015 15:44:03 -0700 Subject: [PATCH 2/2] Disable isOrdered = true in PacketList --- libraries/networking/src/PacketList.cpp | 4 ++-- libraries/networking/src/PacketList.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/PacketList.cpp b/libraries/networking/src/PacketList.cpp index 31b793cc76..bb044d6ae7 100644 --- a/libraries/networking/src/PacketList.cpp +++ b/libraries/networking/src/PacketList.cpp @@ -11,9 +11,9 @@ #include "PacketList.h" -PacketList::PacketList(PacketType::Value packetType, bool isOrdered) : +PacketList::PacketList(PacketType::Value packetType) : _packetType(packetType), - _isOrdered(isOrdered) + _isOrdered(false) { } diff --git a/libraries/networking/src/PacketList.h b/libraries/networking/src/PacketList.h index 010f595938..ae94273953 100644 --- a/libraries/networking/src/PacketList.h +++ b/libraries/networking/src/PacketList.h @@ -16,7 +16,7 @@ template class PacketList : public QIODevice { public: - PacketList(PacketType::Value packetType, bool isOrdered = false); + PacketList(PacketType::Value packetType); virtual bool isSequential() const { return true; }