From 0627099667378534ca182f3874e4a2e6df70fe79 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Tue, 1 May 2018 14:33:48 -0700 Subject: [PATCH] In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source Makes check more robust in case domain server itself reaches this point, since LimitedNodeList::getDomainLocalID() debug-asserts. --- libraries/networking/src/LimitedNodeList.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 31500be682..af26a2ea72 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -314,9 +314,9 @@ bool LimitedNodeList::packetSourceAndHashMatchAndTrackBandwidth(const udt::Packe QUuid sourceID = sourceNode ? sourceNode->getUUID() : QUuid(); if (!sourceNode && - sourceLocalID == getDomainLocalID() && packet.getSenderSockAddr() == getDomainSockAddr() && - PacketTypeEnum::getDomainSourcedPackets().contains(headerType)) { + PacketTypeEnum::getDomainSourcedPackets().contains(headerType) && + sourceLocalID == getDomainLocalID()) { // This is a packet sourced by the domain server emit dataReceived(NodeType::Unassigned, packet.getPayloadSize());