From b1650c0d8cc29d80d0ef515aba4f5051f8b5c73f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 14 Jul 2015 16:36:05 -0700 Subject: [PATCH] fix ::get in DS code, make processSTUNResponse a slot --- libraries/networking/src/LimitedNodeList.h | 3 +-- libraries/networking/src/PacketListener.cpp | 2 +- libraries/networking/src/PacketReceiver.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h index 4812a706df..465e592a9e 100644 --- a/libraries/networking/src/LimitedNodeList.h +++ b/libraries/networking/src/LimitedNodeList.h @@ -162,8 +162,6 @@ public: std::unique_ptr constructICEPingPacket(PingType_t pingType, const QUuid& iceID); std::unique_ptr constructICEPingReplyPacket(NLPacket& pingPacket, const QUuid& iceID); - virtual bool processSTUNResponse(QSharedPointer packet); - void sendHeartbeatToIceServer(const HifiSockAddr& iceServerSockAddr); void sendPeerQueryToIceServer(const HifiSockAddr& iceServerSockAddr, const QUuid& clientID, const QUuid& peerID); @@ -229,6 +227,7 @@ public slots: void startSTUNPublicSocketUpdate(); virtual void sendSTUNRequest(); + bool processSTUNResponse(QSharedPointer packet); void killNodeWithUUID(const QUuid& nodeUUID); diff --git a/libraries/networking/src/PacketListener.cpp b/libraries/networking/src/PacketListener.cpp index a3d628c05b..3036afc7cb 100644 --- a/libraries/networking/src/PacketListener.cpp +++ b/libraries/networking/src/PacketListener.cpp @@ -14,5 +14,5 @@ #include "NodeList.h" PacketListener::~PacketListener() { - DependencyManager::get()->getPacketReceiver().unregisterListener(this); + DependencyManager::get()->getPacketReceiver().unregisterListener(this); } diff --git a/libraries/networking/src/PacketReceiver.cpp b/libraries/networking/src/PacketReceiver.cpp index e1ed8ce8ef..354c04d659 100644 --- a/libraries/networking/src/PacketReceiver.cpp +++ b/libraries/networking/src/PacketReceiver.cpp @@ -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(); + auto nodeList = DependencyManager::get(); while (nodeList->getNodeSocket().hasPendingDatagrams()) { // setup a buffer to read the packet into