added random packet drops; ready to test

assignment-client/src/octree/OctreeSendThread.cpp

@@ -181,7 +181,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
 
             // actually send it
             OctreeServer::didCallWriteDatagram(this);
-            NodeList::getInstance()->writeDatagram((char*) statsMessage, statsMessageLength, _node);
+NodeList::getInstance()->writeDatagram2(nodeData->getSequenceNumber(), (char*) statsMessage, statsMessageLength, _node);
             packetSent = true;
         } else {
             // not enough room in the packet, send two packets
@@ -215,8 +215,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
             packetsSent++;
 
             OctreeServer::didCallWriteDatagram(this);
-            NodeList::getInstance()->writeDatagram((char*) nodeData->getPacket(), nodeData->getPacketLength(), _node);
+NodeList::getInstance()->writeDatagram2(nodeData->getSequenceNumber(), (char*)nodeData->getPacket(), nodeData->getPacketLength(), _node);
-
             packetSent = true;
 
             thisWastedBytes = MAX_PACKET_SIZE - nodeData->getPacketLength();
@@ -245,7 +244,7 @@ int OctreeSendThread::handlePacketSend(OctreeQueryNode* nodeData, int& trueBytes
         if (nodeData->isPacketWaiting() && !nodeData->isShuttingDown()) {
             // just send the voxel packet
             OctreeServer::didCallWriteDatagram(this);
-            NodeList::getInstance()->writeDatagram((char*) nodeData->getPacket(), nodeData->getPacketLength(), _node);
+NodeList::getInstance()->writeDatagram2(nodeData->getSequenceNumber(), (char*)nodeData->getPacket(), nodeData->getPacketLength(), _node);
             packetSent = true;
 
             int thisWastedBytes = MAX_PACKET_SIZE - nodeData->getPacketLength();

interface/src/Application.cpp

@@ -2097,7 +2097,7 @@ void Application::updateMyAvatar(float deltaTime) {
 {
     quint64 now = usecTimestampNow();
     quint64 sinceLastNack = now - _lastNackTime;
-    const quint64 TOO_LONG_SINCE_LAST_NACK = 100 * MSECS_PER_SECOND;
+    const quint64 TOO_LONG_SINCE_LAST_NACK = 250 * MSECS_PER_SECOND;
     if (sinceLastNack > TOO_LONG_SINCE_LAST_NACK) {
         _lastNackTime = now;
         sendNack();
@@ -2108,6 +2108,8 @@ void Application::updateMyAvatar(float deltaTime) {
 
 void Application::sendNack() {
 
+printf("\n\t sendNack()...\n");
+
     char packet[MAX_PACKET_SIZE];
     NodeList* nodeList = NodeList::getInstance();
 
@@ -2142,11 +2144,14 @@ void Application::sendNack() {
             dataAt += sizeof(uint16_t);
 
             // pack sequence numbers
+printf("\t\t packed %d seq #s:", numSequenceNumbers);
             for (int i = 0; i < numSequenceNumbers; i++) {
                 OCTREE_PACKET_SEQUENCE* sequenceNumberAt = (OCTREE_PACKET_SEQUENCE*)dataAt;
                 *sequenceNumberAt = stats.getNextSequenceNumberToNack();
                 dataAt += sizeof(OCTREE_PACKET_SEQUENCE);
+printf(" %d,", *sequenceNumberAt);
             }
+printf("\n");
 
             _octreeSceneStatsLock.unlock();
 

libraries/networking/src/LimitedNodeList.cpp

@@ -271,6 +271,23 @@ qint64 LimitedNodeList::writeDatagram(const char* data, qint64 size, const Share
     return writeDatagram(QByteArray(data, size), destinationNode, overridenSockAddr);
 }
 
+qint64 LimitedNodeList::writeDatagram2(int seq, const char* data, qint64 size, const SharedNodePointer& destinationNode,
+                                const HifiSockAddr& overridenSockAddr) {
+
+    qint64 ret;
+    
+    if (randFloat() < 0.8f) {
+        ret = writeDatagram(QByteArray(data, size), destinationNode, overridenSockAddr);
+    }
+    else {
+        printf("\t\t\t dropped packet seq = %d!!!\n", seq);
+    }
+
+
+    return ret;
+}
+
+
 qint64 LimitedNodeList::writeUnverifiedDatagram(const char* data, qint64 size, const SharedNodePointer& destinationNode,
                                const HifiSockAddr& overridenSockAddr) {
     return writeUnverifiedDatagram(QByteArray(data, size), destinationNode, overridenSockAddr);

libraries/networking/src/LimitedNodeList.h

@@ -72,6 +72,9 @@ public:
     qint64 writeDatagram(const char* data, qint64 size, const SharedNodePointer& destinationNode,
                          const HifiSockAddr& overridenSockAddr = HifiSockAddr());
 
+qint64 writeDatagram2(int seq, const char* data, qint64 size, const SharedNodePointer& destinationNode,
+    const HifiSockAddr& overridenSockAddr = HifiSockAddr());
+
     qint64 writeUnverifiedDatagram(const char* data, qint64 size, const SharedNodePointer& destinationNode,
                          const HifiSockAddr& overridenSockAddr = HifiSockAddr());
 

libraries/octree/src/OctreeSceneStats.cpp

@@ -159,7 +159,7 @@ void OctreeSceneStats::copyFromOther(const OctreeSceneStats& other) {
     _incomingPossibleDuplicate = other._incomingPossibleDuplicate;
     
     _missingSequenceNumbers = other._missingSequenceNumbers;
-_missingSequenceNumbersToNack = other._missingSequenceNumbersToNack;
+_sequenceNumbersToNack = other._sequenceNumbersToNack;
 }