From b665f38c1f868e9eab9ca13d99b10ec2234b2f3a Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 8 Jul 2016 15:15:25 -0700 Subject: [PATCH] Don't process DomainList packets from 2 DS case 1037 --- libraries/networking/src/NodeList.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index fd1442d639..9678a0e2c6 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -513,9 +513,16 @@ void NodeList::processDomainServerConnectionTokenPacket(QSharedPointer message) { if (_domainHandler.getSockAddr().isNull()) { + qWarning() << "IGNORING DomainList packet while not connect to a Domain Server"; // refuse to process this packet if we aren't currently connected to the DS return; } + auto domainUuid = _domainHandler.getUUID(); + auto messageSourceUuid = message->getSourceID(); + if (!domainUuid.isNull() && domainUuid != messageSourceUuid) { + qWarning() << "IGNORING DomainList packet from" << messageSourceUuid << "while connected to" << domainUuid; + return; + } // this is a packet from the domain server, reset the count of un-replied check-ins _numNoReplyDomainCheckIns = 0;