From cc6b0adb7d1263fe5eb84d3b16919655ea6f9288 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 Sep 2015 14:13:36 -0400
Subject: [PATCH] guard insert/get in SentPacketHistory

---
 libraries/networking/src/SentPacketHistory.cpp | 6 ++++--
 libraries/networking/src/SentPacketHistory.h   | 7 +++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/libraries/networking/src/SentPacketHistory.cpp b/libraries/networking/src/SentPacketHistory.cpp
index c6eec8eb63..d0fcecd171 100644
--- a/libraries/networking/src/SentPacketHistory.cpp
+++ b/libraries/networking/src/SentPacketHistory.cpp
@@ -35,10 +35,11 @@ void SentPacketHistory::packetSent(uint16_t sequenceNumber, const NLPacket& pack
     }
     _newestSequenceNumber = sequenceNumber;
 
+    QWriteLocker locker(&_packetsLock);
     _sentPackets.insert(NLPacket::createCopy(packet));
 }
 
-const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) const {
+const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) {
 
     const int UINT16_RANGE = std::numeric_limits<uint16_t>::max() + 1;
 
@@ -48,6 +49,7 @@ const NLPacket* SentPacketHistory::getPacket(uint16_t sequenceNumber) const {
     if (seqDiff < 0) {
         seqDiff += UINT16_RANGE;
     }
-
+    
+    QReadLocker locker(&_packetsLock);
     return _sentPackets.get(seqDiff)->get();
 }
diff --git a/libraries/networking/src/SentPacketHistory.h b/libraries/networking/src/SentPacketHistory.h
index 1808e0020b..78b6914c2d 100644
--- a/libraries/networking/src/SentPacketHistory.h
+++ b/libraries/networking/src/SentPacketHistory.h
@@ -12,7 +12,9 @@
 #define hifi_SentPacketHistory_h
 
 #include <stdint.h>
-#include <qbytearray.h>
+
+#include <QtCore/QByteArray>
+#include <QtCore/QReadWriteLock>
 
 #include "NLPacket.h"
 #include "RingBufferHistory.h"
@@ -26,9 +28,10 @@ public:
     SentPacketHistory(int size = MAX_REASONABLE_SEQUENCE_GAP);
 
     void packetSent(uint16_t sequenceNumber, const NLPacket& packet);
-    const NLPacket* getPacket(uint16_t sequenceNumber) const;
+    const NLPacket* getPacket(uint16_t sequenceNumber);
 
 private:
+    QReadWriteLock _packetsLock { QReadWriteLock::Recursive };
     RingBufferHistory<std::unique_ptr<NLPacket>> _sentPackets;    // circular buffer
 
     uint16_t _newestSequenceNumber;