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

fix ::get<NodeList> in DS code, make processSTUNResponse a slot

Browse source
This commit is contained in:
Stephen Birarda 2015-07-14 16:36:05 -07:00
parent c6ffda12f9
commit b1650c0d8c
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -14,5 +14,5 @@
#include "NodeList.h" #include "NodeList.h"
PacketListener::~PacketListener() { 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) { if (methodIndex < 0) {
qDebug() << "PacketReceiver::registerListener expected a method with one of the following signatures:" 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); Q_ASSERT(methodIndex >= 0);
@ -174,7 +174,7 @@ void PacketReceiver::processDatagrams() {
//PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), //PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
//"PacketReceiver::processDatagrams()"); //"PacketReceiver::processDatagrams()");
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<LimitedNodeList>();
while (nodeList->getNodeSocket().hasPendingDatagrams()) { while (nodeList->getNodeSocket().hasPendingDatagrams()) {
// setup a buffer to read the packet into // setup a buffer to read the packet into