From 265e0f3da6df688a01d37a0ff4e23b6f9a9cb398 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 28 May 2015 16:44:34 -0700 Subject: [PATCH] remove NetworkPeer dtor debug, fix ICE socket --- libraries/networking/src/LimitedNodeList.cpp | 2 +- libraries/networking/src/NetworkPeer.cpp | 4 ---- libraries/networking/src/NetworkPeer.h | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp index c02eff4b75..61d844c1be 100644 --- a/libraries/networking/src/LimitedNodeList.cpp +++ b/libraries/networking/src/LimitedNodeList.cpp @@ -840,7 +840,7 @@ void LimitedNodeList::sendPacketToIceServer(PacketType packetType, const HifiSoc << uuidStringWithoutCurlyBraces(peerID); } - writeUnverifiedDatagram(iceRequestByteArray, HifiSockAddr("127.0.0.1", ICE_SERVER_DEFAULT_PORT)); + writeUnverifiedDatagram(iceRequestByteArray, iceServerSockAddr); } void LimitedNodeList::putLocalPortIntoSharedMemory(const QString key, QObject* parent, quint16 localPort) { diff --git a/libraries/networking/src/NetworkPeer.cpp b/libraries/networking/src/NetworkPeer.cpp index 83e5e72a87..dfa4066dd2 100644 --- a/libraries/networking/src/NetworkPeer.cpp +++ b/libraries/networking/src/NetworkPeer.cpp @@ -49,10 +49,6 @@ NetworkPeer::NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, co } -NetworkPeer::~NetworkPeer() { - qDebug() << "Removing network peer with ID" << _uuid; -} - void NetworkPeer::setPublicSocket(const HifiSockAddr& publicSocket) { if (publicSocket != _publicSocket) { if (_activeSocket == &_publicSocket) { diff --git a/libraries/networking/src/NetworkPeer.h b/libraries/networking/src/NetworkPeer.h index 8cbb6cbe24..d2802a1308 100644 --- a/libraries/networking/src/NetworkPeer.h +++ b/libraries/networking/src/NetworkPeer.h @@ -31,8 +31,6 @@ public: NetworkPeer(QObject* parent = 0); NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket, QObject* parent = 0); - ~NetworkPeer(); - bool isNull() const { return _uuid.isNull(); } bool hasSockets() const { return !_localSocket.isNull() && !_publicSocket.isNull(); }