Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'atp' of https://github.com/birarda/hifi into protocol

Browse source
This commit is contained in:
Atlante45 2015-07-15 14:00:21 -07:00
commit 057afa980e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/networking/src/LimitedNodeList.cpp
View file

@ -227,7 +227,8 @@ qint64 LimitedNodeList::writePacket(const NLPacket& packet, const HifiSockAddr&
&& !NON_VERIFIED_PACKETS.contains(packet.getType())) {
const_cast<NLPacket&>(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<NLPacket> 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();