Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 11:45:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2565 from birarda/master

Browse source 
revert hack to NodeList post dojo demo
This commit is contained in:
Stephen Birarda 2014-03-28 08:47:10 -07:00
commit 9651123fde
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/shared/src/NodeList.cpp
View file

@ -294,10 +294,6 @@ void NodeList::processNodeData(const HifiSockAddr& senderSockAddr, const QByteAr
matchingNode->setLastHeardMicrostamp(usecTimestampNow());
QByteArray replyPacket = constructPingReplyPacket(packet);
writeDatagram(replyPacket, matchingNode, senderSockAddr);
// HACK for hacker dojo network demo
matchingNode->setPublicSocket(senderSockAddr);
matchingNode->activatePublicSocket();
}
break;
@ -833,13 +829,13 @@ SharedNodePointer NodeList::updateSocketsForNode(const QUuid& uuid,
// check if we need to change this node's public or local sockets
if (publicSocket != matchingNode->getPublicSocket()) {
// matchingNode->setPublicSocket(publicSocket);
// qDebug() << "Public socket change for node" << *matchingNode;
matchingNode->setPublicSocket(publicSocket);
qDebug() << "Public socket change for node" << *matchingNode;
}
if (localSocket != matchingNode->getLocalSocket()) {
// matchingNode->setLocalSocket(localSocket);
// qDebug() << "Local socket change for node" << *matchingNode;
matchingNode->setLocalSocket(localSocket);
qDebug() << "Local socket change for node" << *matchingNode;
}
}