From 027d131b2adf05a33dffb67e44515673d26e0927 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 14 Jul 2015 14:40:39 -0700 Subject: [PATCH] Move sequence number updating to PacketReceiver --- libraries/networking/src/LimitedNodeList.cpp | 6 ------ libraries/networking/src/PacketReceiver.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index a91076d6ca..0b76de6304 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -234,12 +234,6 @@ PacketSequenceNumber LimitedNodeList::getNextSequenceNumberForPacket(const QUuid int LimitedNodeList::updateNodeWithDataFromPacket(QSharedPointer packet, SharedNodePointer sendingNode) { QMutexLocker locker(&sendingNode->getMutex()); - // if this was a sequence numbered packet we should store the last seq number for - // a packet of this type for this node - if (SEQUENCE_NUMBERED_PACKETS.contains(packet->getType())) { - sendingNode->setLastSequenceNumberForPacketType(packet->readSequenceNumber(), packet->getType()); - } - NodeData* linkedData = sendingNode->getLinkedData(); if (!linkedData && linkedDataCreateCallback) { linkedDataCreateCallback(sendingNode.data()); diff --git a/libraries/networking/src/PacketReceiver.cpp b/libraries/networking/src/PacketReceiver.cpp index 7d40ba9187..f7e369ee17 100644 --- a/libraries/networking/src/PacketReceiver.cpp +++ b/libraries/networking/src/PacketReceiver.cpp @@ -194,6 +194,12 @@ void PacketReceiver::processDatagrams() { emit dataReceived(NodeType::Unassigned, packet->getSizeWithHeader()); } + // if this was a sequence numbered packet we should store the last seq number for + // a packet of this type for this node + if (SEQUENCE_NUMBERED_PACKETS.contains(packet->getType())) { + matchingNode->setLastSequenceNumberForPacketType(packet->readSequenceNumber(), packet->getType()); + } + bool success = false; if (matchingNode) {