Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 09:08:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Atlante45 2015-07-15 13:50:52 -07:00
commit b677f8de28
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/networking/src/NodeList.cpp
View file

@ -160,6 +160,7 @@ void NodeList::timePingReply(QSharedPointer<NLPacket> packet, const SharedNodePo
} }
void NodeList::processPingPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode) { void NodeList::processPingPacket(QSharedPointer<NLPacket> packet, SharedNodePointer sendingNode) {
// send back a reply // send back a reply
auto replyPacket = constructPingReplyPacket(*packet); auto replyPacket = constructPingReplyPacket(*packet);
const HifiSockAddr& senderSockAddr = packet->getSenderSockAddr(); const HifiSockAddr& senderSockAddr = packet->getSenderSockAddr();

4
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -20,9 +20,7 @@ using namespace PacketType;
const QSet<PacketType::Value> NON_VERIFIED_PACKETS = QSet<PacketType::Value>() const QSet<PacketType::Value> NON_VERIFIED_PACKETS = QSet<PacketType::Value>()
<< NodeJsonStats << EntityQuery << NodeJsonStats << EntityQuery
<< OctreeDataNack << EntityEditNack << OctreeDataNack << EntityEditNack
<< DomainListRequest << DomainListRequest << StopNode;
<< Ping
<< PingReply << StopNode;
const QSet<PacketType::Value> SEQUENCE_NUMBERED_PACKETS = QSet<PacketType::Value>() << AvatarData; const QSet<PacketType::Value> SEQUENCE_NUMBERED_PACKETS = QSet<PacketType::Value>() << AvatarData;