From d505527e5a810218e23445c221d40e277964950b Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 17 Jul 2015 15:38:36 -0700 Subject: [PATCH] Remove setExtendedheader call --- domain-server/src/DomainServer.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index bd7f476fff..4aee260a20 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -965,26 +965,24 @@ int DomainServer::parseNodeData(QDataStream& packetStream, NodeType_t& nodeType, void DomainServer::sendDomainListToNode(const SharedNodePointer& node, const HifiSockAddr &senderSockAddr, const NodeSet& nodeInterestSet) { - auto limitedNodeList = DependencyManager::get(); - - NLPacketList domainListPackets(PacketType::DomainList); - - // always send the node their own UUID back - QDataStream domainListStream(&domainListPackets); - const int NUM_DOMAIN_LIST_EXTENDED_HEADER_BYTES = NUM_BYTES_RFC4122_UUID + NUM_BYTES_RFC4122_UUID + 2; - + // setup the extended header for the domain list packets // this data is at the beginning of each of the domain list packets QByteArray extendedHeader(NUM_DOMAIN_LIST_EXTENDED_HEADER_BYTES, 0); QDataStream extendedHeaderStream(&extendedHeader, QIODevice::WriteOnly); - + extendedHeaderStream << limitedNodeList->getSessionUUID(); extendedHeaderStream << node->getUUID(); extendedHeaderStream << (quint8) node->getCanAdjustLocks(); extendedHeaderStream << (quint8) node->getCanRez(); + + auto limitedNodeList = DependencyManager::get(); - domainListPackets.setExtendedHeader(extendedHeader); + NLPacketList domainListPackets(PacketType::DomainList, extendedHeader); + + // always send the node their own UUID back + QDataStream domainListStream(&domainListPackets); DomainServerNodeData* nodeData = reinterpret_cast(node->getLinkedData());