From cee173400614fa5d82c5c85178c052e1f9a03ca6 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 15 Jul 2015 11:48:30 -0700 Subject: [PATCH] Remove helper function --- libraries/networking/src/LimitedNodeList.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 090c3bdd8b..70c3bb3704 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -214,19 +214,14 @@ bool LimitedNodeList::packetSourceAndHashMatch(const NLPacket& packet, SharedNod return false; } -// NLPacket helper for filling the header -void writePacketheader(const NLPacket& packet, const QUuid& sessionUUID = QUuid(), const QUuid& connectionSecret = QUuid()) { +qint64 LimitedNodeList::writeDatagram(const NLPacket& packet, const HifiSockAddr& destinationSockAddr, + const QUuid& connectionSecret) { if (!NON_SOURCED_PACKETS.contains(packet.getType())) { - const_cast(packet).writeSourceID(sessionUUID); + const_cast(packet).writeSourceID(getSessionUUID()); } if (!connectionSecret.isNull() && !NON_VERIFIED_PACKETS.contains(packet.getType())) { const_cast(packet).writeVerificationHash(packet.payloadHashWithConnectionUUID(connectionSecret)); } -} - -qint64 LimitedNodeList::writeDatagram(const NLPacket& packet, const HifiSockAddr& destinationSockAddr, - const QUuid& connectionSecret) { - writePacketheader(packet, getSessionUUID(), connectionSecret); return writeDatagram({packet.getData(), static_cast(packet.getSizeWithHeader())}, destinationSockAddr); }