From 6b28523cb540b3091165db13fb6350b5ddb88f0a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 21 Mar 2016 16:29:18 -0700 Subject: [PATCH 1/2] don't release the OPP processed packet --- interface/src/octree/OctreePacketProcessor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/octree/OctreePacketProcessor.cpp b/interface/src/octree/OctreePacketProcessor.cpp index 5e1a7213b5..0254157b17 100644 --- a/interface/src/octree/OctreePacketProcessor.cpp +++ b/interface/src/octree/OctreePacketProcessor.cpp @@ -56,7 +56,7 @@ void OctreePacketProcessor::processPacket(QSharedPointer messag memcpy(buffer.get(), message->getRawMessage() + statsMessageLength, piggybackBytes); auto newPacket = NLPacket::fromReceivedPacket(std::move(buffer), piggybackBytes, message->getSenderSockAddr()); - message = QSharedPointer::create(*newPacket.release()); + message = QSharedPointer::create(*newPacket); } else { // Note... stats packets don't have sequence numbers, so we don't want to send those to trackIncomingVoxelPacket() return; // bail since no piggyback data From 20c923db322e351020442a5259519fc364aeb10d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 21 Mar 2016 17:26:25 -0700 Subject: [PATCH 2/2] remove leaking unused method from NLPacketList --- libraries/networking/src/NLPacketList.cpp | 7 ------- libraries/networking/src/NLPacketList.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/libraries/networking/src/NLPacketList.cpp b/libraries/networking/src/NLPacketList.cpp index c6bea33d86..3b52ff5140 100644 --- a/libraries/networking/src/NLPacketList.cpp +++ b/libraries/networking/src/NLPacketList.cpp @@ -22,13 +22,6 @@ std::unique_ptr NLPacketList::create(PacketType packetType, QByteA return nlPacketList; } -std::unique_ptr NLPacketList::fromPacketList(std::unique_ptr packetList) { - auto nlPacketList = std::unique_ptr(new NLPacketList(std::move(*packetList.release()))); - nlPacketList->open(ReadOnly); - return nlPacketList; -} - - NLPacketList::NLPacketList(PacketType packetType, QByteArray extendedHeader, bool isReliable, bool isOrdered) : PacketList(packetType, extendedHeader, isReliable, isOrdered) { diff --git a/libraries/networking/src/NLPacketList.h b/libraries/networking/src/NLPacketList.h index 250d15dbb9..01a017f371 100644 --- a/libraries/networking/src/NLPacketList.h +++ b/libraries/networking/src/NLPacketList.h @@ -21,8 +21,6 @@ public: static std::unique_ptr create(PacketType packetType, QByteArray extendedHeader = QByteArray(), bool isReliable = false, bool isOrdered = false); - static std::unique_ptr fromPacketList(std::unique_ptr); - PacketVersion getVersion() const { return _packetVersion; } const QUuid& getSourceID() const { return _sourceID; }