From 6c06d4c49efa9f1f91448786e3ac0291e7b46012 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 Jul 2015 13:59:58 -0700 Subject: [PATCH] use fromRawData for writeDatagram, correct type for PingReply --- libraries/networking/src/LimitedNodeList.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index 34ac2c7b20..9fe0648a4b 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -227,7 +227,8 @@ qint64 LimitedNodeList::writePacket(const NLPacket& packet, const HifiSockAddr& && !NON_VERIFIED_PACKETS.contains(packet.getType())) { const_cast(packet).writeVerificationHash(packet.payloadHashWithConnectionUUID(connectionSecret)); } - return writeDatagram({ packet.getData(), (int)packet.getDataSize() }, destinationSockAddr); + + return writeDatagram(QByteArray::fromRawData(packet.getData(), packet.getDataSize()), destinationSockAddr); } qint64 LimitedNodeList::writeDatagram(const QByteArray& datagram, const HifiSockAddr& destinationSockAddr) { @@ -456,7 +457,7 @@ std::unique_ptr LimitedNodeList::constructPingReplyPacket(NLPacket& pi int packetSize = sizeof(PingType_t) + sizeof(quint64) + sizeof(quint64); - auto replyPacket = NLPacket::create(PacketType::Ping, packetSize); + auto replyPacket = NLPacket::create(PacketType::PingReply, packetSize); QDataStream packetStream(replyPacket.get()); packetStream << typeFromOriginalPing << timeFromOriginalPing << usecTimestampNow();