Merge pull request #2562 from birarda/dojo-network

NodeList hack for hacker dojo network
This commit is contained in:
Stephen Birarda 2014-03-27 17:42:22 -07:00
commit f8ee8044ca

View file

@ -294,6 +294,10 @@ 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;
@ -829,13 +833,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;
}
}