From 36a0ef50d4b681875775614c58457b6a9180ccf9 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Aug 2015 16:21:17 -0700
Subject: [PATCH] add assert for BasePacket write, fix time in Connection

---
 libraries/networking/src/udt/BasePacket.cpp | 6 +++---
 libraries/networking/src/udt/Connection.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/networking/src/udt/BasePacket.cpp b/libraries/networking/src/udt/BasePacket.cpp
index 80564143d4..2bfa2b6805 100644
--- a/libraries/networking/src/udt/BasePacket.cpp
+++ b/libraries/networking/src/udt/BasePacket.cpp
@@ -156,13 +156,13 @@ bool BasePacket::reset() {
 }
 
 qint64 BasePacket::writeData(const char* data, qint64 maxSize) {
+   
+    Q_ASSERT_X(maxSize <= bytesAvailableForWrite(), "BasePacket::writeData", "not enough space for write");
     
     // make sure we have the space required to write this block
     if (maxSize <= bytesAvailableForWrite()) {
         qint64 currentPos = pos();
-        
-        Q_ASSERT(currentPos < _payloadCapacity);
-        
+
         // good to go - write the data
         memcpy(_payloadStart + currentPos, data, maxSize);
         
diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp
index dab6c5b934..082de32204 100644
--- a/libraries/networking/src/udt/Connection.cpp
+++ b/libraries/networking/src/udt/Connection.cpp
@@ -283,10 +283,10 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
         _receiveWindow.onProbePair1Arrival();
     } else if (((uint32_t) sequenceNumber & 0xF) == 1) {
         _receiveWindow.onProbePair2Arrival();
-    } else {
-        _receiveWindow.onPacketArrival();
     }
     
+    _receiveWindow.onPacketArrival();
+    
     // If this is not the next sequence number, report loss
     if (sequenceNumber > _lastReceivedSequenceNumber + 1) {
         if (_lastReceivedSequenceNumber + 1 == sequenceNumber - 1) {