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

remove NetworkPeer dtor debug, fix ICE socket

Browse source
This commit is contained in:
Stephen Birarda 2015-05-28 16:44:34 -07:00
parent 493a9da43e
commit 265e0f3da6
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -840,7 +840,7 @@ void LimitedNodeList::sendPacketToIceServer(PacketType packetType, const HifiSoc
<< uuidStringWithoutCurlyBraces(peerID); << 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) { void LimitedNodeList::putLocalPortIntoSharedMemory(const QString key, QObject* parent, quint16 localPort) {

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

@ -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) { void NetworkPeer::setPublicSocket(const HifiSockAddr& publicSocket) {
if (publicSocket != _publicSocket) { if (publicSocket != _publicSocket) {
if (_activeSocket == &_publicSocket) { if (_activeSocket == &_publicSocket) {

2
libraries/networking/src/NetworkPeer.h
View file

@ -31,8 +31,6 @@ public:
NetworkPeer(QObject* parent = 0); NetworkPeer(QObject* parent = 0);
NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket, QObject* parent = 0); NetworkPeer(const QUuid& uuid, const HifiSockAddr& publicSocket, const HifiSockAddr& localSocket, QObject* parent = 0);
~NetworkPeer();
bool isNull() const { return _uuid.isNull(); } bool isNull() const { return _uuid.isNull(); }
bool hasSockets() const { return !_localSocket.isNull() && !_publicSocket.isNull(); } bool hasSockets() const { return !_localSocket.isNull() && !_publicSocket.isNull(); }