Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 09:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

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

Browse source
This commit is contained in:
Atlante45 2015-07-14 16:45:01 -07:00
commit f0a2e921b7
3 changed files with 4 additions and 5 deletions

3
libraries/networking/src/LimitedNodeList.h
View file

@ -160,8 +160,6 @@ public:
std::unique_ptr<NLPacket> constructICEPingPacket(PingType_t pingType, const QUuid& iceID);
std::unique_ptr<NLPacket> constructICEPingReplyPacket(NLPacket& pingPacket, const QUuid& iceID);
virtual bool processSTUNResponse(QSharedPointer<NLPacket> packet);
void sendHeartbeatToIceServer(const HifiSockAddr& iceServerSockAddr);
void sendPeerQueryToIceServer(const HifiSockAddr& iceServerSockAddr, const QUuid& clientID, const QUuid& peerID);
@ -227,6 +225,7 @@ public slots:
void startSTUNPublicSocketUpdate();
virtual void sendSTUNRequest();
bool processSTUNResponse(QSharedPointer<NLPacket> packet);
void killNodeWithUUID(const QUuid& nodeUUID);

2
libraries/networking/src/PacketListener.cpp
View file

@ -14,5 +14,5 @@
#include "NodeList.h"
PacketListener::~PacketListener() {
DependencyManager::get<NodeList>()->getPacketReceiver().unregisterListener(this);
DependencyManager::get<LimitedNodeList>()->getPacketReceiver().unregisterListener(this);
}

4
libraries/networking/src/PacketReceiver.cpp
View file

@ -97,7 +97,7 @@ QMetaMethod PacketReceiver::matchingMethodForListener(PacketType::Value type, QO
if (methodIndex < 0) {
qDebug() << "PacketReceiver::registerListener expected a method with one of the following signatures:"
<< possibleSignatures << "- but such a method was not found.";
<< possibleSignatures.toList() << "- but such a method was not found.";
}
Q_ASSERT(methodIndex >= 0);
@ -174,7 +174,7 @@ void PacketReceiver::processDatagrams() {
//PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
//"PacketReceiver::processDatagrams()");
auto nodeList = DependencyManager::get<NodeList>();
auto nodeList = DependencyManager::get<LimitedNodeList>();
while (nodeList->getNodeSocket().hasPendingDatagrams()) {
// setup a buffer to read the packet into